diff --git a/silk/apply_sine_window.c b/silk/fixed/apply_sine_window_FIX.c
similarity index 100%
rename from silk/apply_sine_window.c
rename to silk/fixed/apply_sine_window_FIX.c
diff --git a/silk/autocorr.c b/silk/fixed/autocorr_FIX.c
similarity index 100%
rename from silk/autocorr.c
rename to silk/fixed/autocorr_FIX.c
diff --git a/silk/burg_modified.c b/silk/fixed/burg_modified_FIX.c
similarity index 100%
rename from silk/burg_modified.c
rename to silk/fixed/burg_modified_FIX.c
diff --git a/silk/k2a.c b/silk/fixed/k2a_FIX.c
similarity index 100%
rename from silk/k2a.c
rename to silk/fixed/k2a_FIX.c
diff --git a/silk/k2a_Q16.c b/silk/fixed/k2a_Q16_FIX.c
similarity index 100%
rename from silk/k2a_Q16.c
rename to silk/fixed/k2a_Q16_FIX.c
diff --git a/silk/pitch_analysis_core.c b/silk/fixed/pitch_analysis_core_FIX.c
similarity index 100%
rename from silk/pitch_analysis_core.c
rename to silk/fixed/pitch_analysis_core_FIX.c
diff --git a/silk/schur64.c b/silk/fixed/schur64_FIX.c
similarity index 100%
rename from silk/schur64.c
rename to silk/fixed/schur64_FIX.c
diff --git a/silk/schur.c b/silk/fixed/schur_FIX.c
similarity index 100%
rename from silk/schur.c
rename to silk/fixed/schur_FIX.c
diff --git a/silk/fixed/silk_fixed.vcxproj b/silk/fixed/silk_fixed.vcxproj
index 9e2a60566817486317d3c956b8e5de66a346f73b..638fab576ad3fc1993d178a00d9e95970aaff9de 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 c26e874bf2fb39ba0a5f67c7eb4b4dfc81506585..252d975c877be6c48e5ff0a0477b12e84ae0a690 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
similarity index 55%
rename from silk/array_maxabs.c
rename to silk/fixed/vector_ops_FIX.c
index 1194f0c4c17e3e437bb537df8df79cc4377b8bb5..d416c9313501c435ac2b9fb55495ef094e518c66 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 bf00a74944065119a2e89756d083457b3e24f617..9c8fbff2cfafdddbe4e986d36d70f4b1624f6910 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 cb521449c40f0529540ffe51b2bd2d18b043f4c2..0000000000000000000000000000000000000000
--- 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 09224dece60752b11a8a88a5ed74259905f4a294..0000000000000000000000000000000000000000
--- 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 76bd1c12d16b55472953c2c557bfcf7f819ec18c..5be5cba21b4b00657299942adc781f2b481a59f4 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 42d1f64965d743d2f12c49e68a4525b15e0bea4a..a2b5cb8ab84d3895fa2c7b505df38fa713a0bb3d 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>
diff --git a/silk_sources.mk b/silk_sources.mk
index 05d96364eb529092adddc0679e6f592627b21ad8..25a1bb44534db2cc415670f3b698beaee90f8cae 100644
--- a/silk_sources.mk
+++ b/silk_sources.mk
@@ -45,18 +45,12 @@ silk/init_encoder.c \
silk/control_codec.c \
silk/A2NLSF.c \
silk/ana_filt_bank_1.c \
-silk/apply_sine_window.c \
-silk/array_maxabs.c \
-silk/autocorr.c \
silk/biquad_alt.c \
-silk/burg_modified.c \
silk/bwexpander_32.c \
silk/bwexpander.c \
silk/debug.c \
silk/decode_pitch.c \
silk/inner_prod_aligned.c \
-silk/k2a.c \
-silk/k2a_Q16.c \
silk/lin2log.c \
silk/log2lin.c \
silk/LPC_analysis_filter.c \
@@ -65,7 +59,6 @@ silk/table_LSF_cos.c \
silk/NLSF2A.c \
silk/NLSF_stabilize.c \
silk/NLSF_VQ_weights_laroia.c \
-silk/pitch_analysis_core.c \
silk/pitch_est_tables.c \
silk/resampler.c \
silk/resampler_down2_3.c \
@@ -75,10 +68,6 @@ silk/resampler_private_down_FIR.c \
silk/resampler_private_IIR_FIR.c \
silk/resampler_private_up2_HQ.c \
silk/resampler_rom.c \
-silk/scale_copy_vector16.c \
-silk/scale_vector.c \
-silk/schur64.c \
-silk/schur.c \
silk/sigm_Q15.c \
silk/sort.c \
silk/sum_sqr_shift.c \
@@ -104,7 +93,16 @@ silk/fixed/regularize_correlations_FIX.c \
silk/fixed/residual_energy16_FIX.c \
silk/fixed/residual_energy_FIX.c \
silk/fixed/solve_LS_FIX.c \
-silk/fixed/warped_autocorrelation_FIX.c
+silk/fixed/warped_autocorrelation_FIX.c \
+silk/fixed/apply_sine_window_FIX.c \
+silk/fixed/autocorr_FIX.c \
+silk/fixed/burg_modified_FIX.c \
+silk/fixed/k2a_FIX.c \
+silk/fixed/k2a_Q16_FIX.c \
+silk/fixed/pitch_analysis_core_FIX.c \
+silk/fixed/vector_ops_FIX.c \
+silk/fixed/schur64_FIX.c \
+silk/fixed/schur_FIX.c
SILK_SOURCES_FLOAT = \
silk/float/apply_sine_window_FLP.c \