diff options
author | Gregory Maxwell <greg@xiph.org> | 2011-10-10 21:59:30 +0400 |
---|---|---|
committer | Gregory Maxwell <greg@xiph.org> | 2011-10-11 04:53:48 +0400 |
commit | a355d74efb9aa0b490e0b39fd587a1f996069392 (patch) | |
tree | 82975ac4f11dbac48b3936d10edcbaea9941abc0 /silk | |
parent | 3195f6cdb985b2818683a30bdd5298895694bd2d (diff) |
Move a number of files and functions which are only used by fixed point builds from silk/ to silk/fixed/.
I attempted to not break the msvc projects, but I can't test them.
Diffstat (limited to 'silk')
-rw-r--r-- | silk/fixed/apply_sine_window_FIX.c (renamed from silk/apply_sine_window.c) | 0 | ||||
-rw-r--r-- | silk/fixed/autocorr_FIX.c (renamed from silk/autocorr.c) | 0 | ||||
-rw-r--r-- | silk/fixed/burg_modified_FIX.c (renamed from silk/burg_modified.c) | 0 | ||||
-rw-r--r-- | silk/fixed/k2a_FIX.c (renamed from silk/k2a.c) | 0 | ||||
-rw-r--r-- | silk/fixed/k2a_Q16_FIX.c (renamed from silk/k2a_Q16.c) | 0 | ||||
-rw-r--r-- | silk/fixed/pitch_analysis_core_FIX.c (renamed from silk/pitch_analysis_core.c) | 0 | ||||
-rw-r--r-- | silk/fixed/schur64_FIX.c (renamed from silk/schur64.c) | 0 | ||||
-rw-r--r-- | silk/fixed/schur_FIX.c (renamed from silk/schur.c) | 0 | ||||
-rw-r--r-- | silk/fixed/silk_fixed.vcxproj | 9 | ||||
-rw-r--r-- | silk/fixed/silk_fixed.vcxproj.filters | 27 | ||||
-rw-r--r-- | silk/fixed/vector_ops_FIX.c (renamed from silk/array_maxabs.c) | 66 | ||||
-rw-r--r-- | silk/inner_prod_aligned.c | 34 | ||||
-rw-r--r-- | silk/scale_copy_vector16.c | 49 | ||||
-rw-r--r-- | silk/scale_vector.c | 46 | ||||
-rw-r--r-- | silk/silk_common.vcxproj | 11 | ||||
-rw-r--r-- | silk/silk_common.vcxproj.filters | 33 |
16 files changed, 101 insertions, 174 deletions
diff --git a/silk/apply_sine_window.c b/silk/fixed/apply_sine_window_FIX.c index 11a8545f..11a8545f 100644 --- a/silk/apply_sine_window.c +++ b/silk/fixed/apply_sine_window_FIX.c diff --git a/silk/autocorr.c b/silk/fixed/autocorr_FIX.c index 37ab66c0..37ab66c0 100644 --- a/silk/autocorr.c +++ b/silk/fixed/autocorr_FIX.c diff --git a/silk/burg_modified.c b/silk/fixed/burg_modified_FIX.c index 0bf90e51..0bf90e51 100644 --- a/silk/burg_modified.c +++ b/silk/fixed/burg_modified_FIX.c diff --git a/silk/k2a.c b/silk/fixed/k2a_FIX.c index 98c6bf29..98c6bf29 100644 --- a/silk/k2a.c +++ b/silk/fixed/k2a_FIX.c diff --git a/silk/k2a_Q16.c b/silk/fixed/k2a_Q16_FIX.c index 962e2306..962e2306 100644 --- a/silk/k2a_Q16.c +++ b/silk/fixed/k2a_Q16_FIX.c diff --git a/silk/pitch_analysis_core.c b/silk/fixed/pitch_analysis_core_FIX.c index bec5fde0..bec5fde0 100644 --- a/silk/pitch_analysis_core.c +++ b/silk/fixed/pitch_analysis_core_FIX.c diff --git a/silk/schur64.c b/silk/fixed/schur64_FIX.c index 8c9ee057..8c9ee057 100644 --- a/silk/schur64.c +++ b/silk/fixed/schur64_FIX.c diff --git a/silk/schur.c b/silk/fixed/schur_FIX.c index 86f37345..86f37345 100644 --- a/silk/schur.c +++ b/silk/fixed/schur_FIX.c diff --git a/silk/fixed/silk_fixed.vcxproj b/silk/fixed/silk_fixed.vcxproj index 9e2a6056..638fab57 100644 --- a/silk/fixed/silk_fixed.vcxproj +++ b/silk/fixed/silk_fixed.vcxproj @@ -102,6 +102,15 @@ <ClCompile Include="residual_energy_FIX.c" />
<ClCompile Include="solve_LS_FIX.c" />
<ClCompile Include="warped_autocorrelation_FIX.c" />
+ <ClCompile Include="k2a_FIX.c" />
+ <ClCompile Include="k2a_Q16_FIX.c" />
+ <ClCompile Include="apply_sine_window_FIX.c" />
+ <ClCompile Include="autocorr_FIX.c" />
+ <ClCompile Include="burg_modified_FIX.c" />
+ <ClCompile Include="pitch_analysis_core_FIX.c" />
+ <ClCompile Include="vector_ops_FIX.c" />
+ <ClCompile Include="schur_FIX.c" />
+ <ClCompile Include="schur64_FIX.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\win32\config.h" />
diff --git a/silk/fixed/silk_fixed.vcxproj.filters b/silk/fixed/silk_fixed.vcxproj.filters index c26e874b..252d975c 100644 --- a/silk/fixed/silk_fixed.vcxproj.filters +++ b/silk/fixed/silk_fixed.vcxproj.filters @@ -66,6 +66,33 @@ <ClCompile Include="warped_autocorrelation_FIX.c">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="apply_sine_window_FIX.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="k2a_FIX.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="k2a_Q16_FIX.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="burg_modified_FIX.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="autocorr_FIX.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="pitch_analysis_core_FIX.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="vector_ops_FIX.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="schur_FIX.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="schur64_FIX.c">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\win32\config.h">
diff --git a/silk/array_maxabs.c b/silk/fixed/vector_ops_FIX.c index 1194f0c4..d416c931 100644 --- a/silk/array_maxabs.c +++ b/silk/fixed/vector_ops_FIX.c @@ -31,6 +31,71 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "SigProc_FIX.h" +/* Copy and multiply a vector by a constant */ +void silk_scale_copy_vector16( + opus_int16 *data_out, + const opus_int16 *data_in, + opus_int32 gain_Q16, /* (I): gain in Q16 */ + const opus_int dataSize /* (I): length */ +) +{ + opus_int i; + opus_int32 tmp32; + + for( i = 0; i < dataSize; i++ ) { + tmp32 = silk_SMULWB( gain_Q16, data_in[ i ] ); + data_out[ i ] = (opus_int16)silk_CHECK_FIT16( tmp32 ); + } +} + +/* Multiply a vector by a constant */ +void silk_scale_vector32_Q26_lshift_18( + opus_int32 *data1, /* (I/O): Q0/Q18 */ + opus_int32 gain_Q26, /* (I): Q26 */ + opus_int dataSize /* (I): length */ +) +{ + opus_int i; + + for( i = 0; i < dataSize; i++ ) { + data1[ i ] = (opus_int32)silk_CHECK_FIT32( silk_RSHIFT64( silk_SMULL( data1[ i ], gain_Q26 ), 8 ) );/* OUTPUT: Q18*/ + } +} + +/* sum= for(i=0;i<len;i++)inVec1[i]*inVec2[i]; --- inner product */ +/* Note for ARM asm: */ +/* * inVec1 and inVec2 should be at least 2 byte aligned. (Or defined as short/int16) */ +/* * len should be positive 16bit integer. */ +/* * only when len>6, memory access can be reduced by half. */ + +opus_int32 silk_inner_prod_aligned( + const opus_int16 *const inVec1, /* I input vector 1 */ + const opus_int16 *const inVec2, /* I input vector 2 */ + const opus_int len /* I vector lengths */ +) +{ + opus_int i; + opus_int32 sum = 0; + for( i = 0; i < len; i++ ) { + sum = silk_SMLABB( sum, inVec1[ i ], inVec2[ i ] ); + } + return sum; +} + +opus_int64 silk_inner_prod16_aligned_64( + const opus_int16 *inVec1, /* I input vector 1 */ + const opus_int16 *inVec2, /* I input vector 2 */ + const opus_int len /* I vector lengths */ +) +{ + opus_int i; + opus_int64 sum = 0; + for( i = 0; i < len; i++ ) { + sum = silk_SMLALBB( sum, inVec1[ i ], inVec2[ i ] ); + } + return sum; +} + /* Function that returns the maximum absolut value of the input vector */ opus_int16 silk_int16_array_maxabs( /* O Maximum absolute value, max: 2^15-1 */ const opus_int16 *vec, /* I Input vector [len] */ @@ -61,4 +126,3 @@ opus_int16 silk_int16_array_maxabs( /* O Maximum absolute value, max } } } - diff --git a/silk/inner_prod_aligned.c b/silk/inner_prod_aligned.c index bf00a749..9c8fbff2 100644 --- a/silk/inner_prod_aligned.c +++ b/silk/inner_prod_aligned.c @@ -31,26 +31,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "SigProc_FIX.h" -/* sum= for(i=0;i<len;i++)inVec1[i]*inVec2[i]; --- inner product */ -/* Note for ARM asm: */ -/* * inVec1 and inVec2 should be at least 2 byte aligned. (Or defined as short/int16) */ -/* * len should be positive 16bit integer. */ -/* * only when len>6, memory access can be reduced by half. */ - -opus_int32 silk_inner_prod_aligned( - const opus_int16 *const inVec1, /* I input vector 1 */ - const opus_int16 *const inVec2, /* I input vector 2 */ - const opus_int len /* I vector lengths */ -) -{ - opus_int i; - opus_int32 sum = 0; - for( i = 0; i < len; i++ ) { - sum = silk_SMLABB( sum, inVec1[ i ], inVec2[ i ] ); - } - return sum; -} - opus_int32 silk_inner_prod_aligned_scale( const opus_int16 *const inVec1, /* I input vector 1 */ const opus_int16 *const inVec2, /* I input vector 2 */ @@ -65,17 +45,3 @@ opus_int32 silk_inner_prod_aligned_scale( } return sum; } - -opus_int64 silk_inner_prod16_aligned_64( - const opus_int16 *inVec1, /* I input vector 1 */ - const opus_int16 *inVec2, /* I input vector 2 */ - const opus_int len /* I vector lengths */ -) -{ - opus_int i; - opus_int64 sum = 0; - for( i = 0; i < len; i++ ) { - sum = silk_SMLALBB( sum, inVec1[ i ], inVec2[ i ] ); - } - return sum; -} diff --git a/silk/scale_copy_vector16.c b/silk/scale_copy_vector16.c deleted file mode 100644 index cb521449..00000000 --- a/silk/scale_copy_vector16.c +++ /dev/null @@ -1,49 +0,0 @@ -/*********************************************************************** -Copyright (c) 2006-2011, Skype Limited. All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, (subject to the limitations in the disclaimer below) -are permitted provided that the following conditions are met: -- Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. -- Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in the -documentation and/or other materials provided with the distribution. -- Neither the name of Skype Limited, nor the names of specific -contributors, may be used to endorse or promote products derived from -this software without specific prior written permission. -NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED -BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND -CONTRIBUTORS ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, -BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -***********************************************************************/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "SigProc_FIX.h" - -/* Copy and multiply a vector by a constant */ -void silk_scale_copy_vector16( - opus_int16 *data_out, - const opus_int16 *data_in, - opus_int32 gain_Q16, /* (I): gain in Q16 */ - const opus_int dataSize /* (I): length */ -) -{ - opus_int i; - opus_int32 tmp32; - - for( i = 0; i < dataSize; i++ ) { - tmp32 = silk_SMULWB( gain_Q16, data_in[ i ] ); - data_out[ i ] = (opus_int16)silk_CHECK_FIT16( tmp32 ); - } -} diff --git a/silk/scale_vector.c b/silk/scale_vector.c deleted file mode 100644 index 09224dec..00000000 --- a/silk/scale_vector.c +++ /dev/null @@ -1,46 +0,0 @@ -/*********************************************************************** -Copyright (c) 2006-2011, Skype Limited. All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, (subject to the limitations in the disclaimer below) -are permitted provided that the following conditions are met: -- Redistributions of source code must retain the above copyright notice, -this list of conditions and the following disclaimer. -- Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in the -documentation and/or other materials provided with the distribution. -- Neither the name of Skype Limited, nor the names of specific -contributors, may be used to endorse or promote products derived from -this software without specific prior written permission. -NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE GRANTED -BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND -CONTRIBUTORS ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, -BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -***********************************************************************/ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "SigProc_FIX.h" - -/* Multiply a vector by a constant */ -void silk_scale_vector32_Q26_lshift_18( - opus_int32 *data1, /* (I/O): Q0/Q18 */ - opus_int32 gain_Q26, /* (I): Q26 */ - opus_int dataSize /* (I): length */ -) -{ - opus_int i; - - for( i = 0; i < dataSize; i++ ) { - data1[ i ] = (opus_int32)silk_CHECK_FIT32( silk_RSHIFT64( silk_SMULL( data1[ i ], gain_Q26 ), 8 ) );/* OUTPUT: Q18*/ - } -} diff --git a/silk/silk_common.vcxproj b/silk/silk_common.vcxproj index 76bd1c12..5be5cba2 100644 --- a/silk/silk_common.vcxproj +++ b/silk/silk_common.vcxproj @@ -88,11 +88,7 @@ <ItemGroup>
<ClCompile Include="A2NLSF.c" />
<ClCompile Include="ana_filt_bank_1.c" />
- <ClCompile Include="apply_sine_window.c" />
- <ClCompile Include="array_maxabs.c" />
- <ClCompile Include="autocorr.c" />
<ClCompile Include="biquad_alt.c" />
- <ClCompile Include="burg_modified.c" />
<ClCompile Include="bwexpander.c" />
<ClCompile Include="bwexpander_32.c" />
<ClCompile Include="check_control_input.c" />
@@ -119,8 +115,6 @@ <ClCompile Include="init_encoder.c" />
<ClCompile Include="inner_prod_aligned.c" />
<ClCompile Include="interpolate.c" />
- <ClCompile Include="k2a.c" />
- <ClCompile Include="k2a_Q16.c" />
<ClCompile Include="lin2log.c" />
<ClCompile Include="log2lin.c" />
<ClCompile Include="LPC_analysis_filter.c" />
@@ -137,7 +131,6 @@ <ClCompile Include="NLSF_VQ_weights_laroia.c" />
<ClCompile Include="NSQ.c" />
<ClCompile Include="NSQ_del_dec.c" />
- <ClCompile Include="pitch_analysis_core.c" />
<ClCompile Include="pitch_est_tables.c" />
<ClCompile Include="PLC.c" />
<ClCompile Include="process_NLSFs.c" />
@@ -150,10 +143,6 @@ <ClCompile Include="resampler_private_IIR_FIR.c" />
<ClCompile Include="resampler_private_up2_HQ.c" />
<ClCompile Include="resampler_rom.c" />
- <ClCompile Include="scale_copy_vector16.c" />
- <ClCompile Include="scale_vector.c" />
- <ClCompile Include="schur.c" />
- <ClCompile Include="schur64.c" />
<ClCompile Include="shell_coder.c" />
<ClCompile Include="sigm_Q15.c" />
<ClCompile Include="sort.c" />
diff --git a/silk/silk_common.vcxproj.filters b/silk/silk_common.vcxproj.filters index 42d1f649..a2b5cb8a 100644 --- a/silk/silk_common.vcxproj.filters +++ b/silk/silk_common.vcxproj.filters @@ -24,21 +24,9 @@ <ClCompile Include="ana_filt_bank_1.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="apply_sine_window.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="array_maxabs.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="autocorr.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="biquad_alt.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="burg_modified.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="bwexpander.c">
<Filter>Source Files</Filter>
</ClCompile>
@@ -117,12 +105,6 @@ <ClCompile Include="interpolate.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="k2a.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="k2a_Q16.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="lin2log.c">
<Filter>Source Files</Filter>
</ClCompile>
@@ -171,9 +153,6 @@ <ClCompile Include="NSQ_del_dec.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="pitch_analysis_core.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="pitch_est_tables.c">
<Filter>Source Files</Filter>
</ClCompile>
@@ -210,18 +189,6 @@ <ClCompile Include="resampler_rom.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="scale_copy_vector16.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="scale_vector.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="schur.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="schur64.c">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="shell_coder.c">
<Filter>Source Files</Filter>
</ClCompile>
|