Move a number of files and functions which are only used by fixed point builds from...
authorGregory Maxwell <greg@xiph.org>
Mon, 10 Oct 2011 17:59:30 +0000 (13:59 -0400)
committerGregory Maxwell <greg@xiph.org>
Tue, 11 Oct 2011 00:53:48 +0000 (20:53 -0400)
I attempted to not break the msvc projects, but I can't test them.

17 files changed:
silk/fixed/apply_sine_window_FIX.c [moved from silk/apply_sine_window.c with 100% similarity]
silk/fixed/autocorr_FIX.c [moved from silk/autocorr.c with 100% similarity]
silk/fixed/burg_modified_FIX.c [moved from silk/burg_modified.c with 100% similarity]
silk/fixed/k2a_FIX.c [moved from silk/k2a.c with 100% similarity]
silk/fixed/k2a_Q16_FIX.c [moved from silk/k2a_Q16.c with 100% similarity]
silk/fixed/pitch_analysis_core_FIX.c [moved from silk/pitch_analysis_core.c with 100% similarity]
silk/fixed/schur64_FIX.c [moved from silk/schur64.c with 100% similarity]
silk/fixed/schur_FIX.c [moved from silk/schur.c with 100% similarity]
silk/fixed/silk_fixed.vcxproj
silk/fixed/silk_fixed.vcxproj.filters
silk/fixed/vector_ops_FIX.c [moved from silk/array_maxabs.c with 55% similarity]
silk/inner_prod_aligned.c
silk/scale_copy_vector16.c [deleted file]
silk/scale_vector.c [deleted file]
silk/silk_common.vcxproj
silk/silk_common.vcxproj.filters
silk_sources.mk

similarity index 100%
rename from silk/autocorr.c
rename to silk/fixed/autocorr_FIX.c
similarity index 100%
rename from silk/k2a.c
rename to silk/fixed/k2a_FIX.c
similarity index 100%
rename from silk/k2a_Q16.c
rename to silk/fixed/k2a_Q16_FIX.c
similarity index 100%
rename from silk/schur64.c
rename to silk/fixed/schur64_FIX.c
similarity index 100%
rename from silk/schur.c
rename to silk/fixed/schur_FIX.c
index 9e2a605..638fab5 100644 (file)
     <ClCompile Include="residual_energy_FIX.c" />\r
     <ClCompile Include="solve_LS_FIX.c" />\r
     <ClCompile Include="warped_autocorrelation_FIX.c" />\r
+    <ClCompile Include="k2a_FIX.c" />\r
+    <ClCompile Include="k2a_Q16_FIX.c" />\r
+    <ClCompile Include="apply_sine_window_FIX.c" />\r
+    <ClCompile Include="autocorr_FIX.c" />\r
+    <ClCompile Include="burg_modified_FIX.c" />\r
+    <ClCompile Include="pitch_analysis_core_FIX.c" />\r
+    <ClCompile Include="vector_ops_FIX.c" />\r
+    <ClCompile Include="schur_FIX.c" />\r
+    <ClCompile Include="schur64_FIX.c" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\win32\config.h" />\r
index c26e874..252d975 100644 (file)
     <ClCompile Include="warped_autocorrelation_FIX.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="apply_sine_window_FIX.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="k2a_FIX.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="k2a_Q16_FIX.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="burg_modified_FIX.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="autocorr_FIX.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="pitch_analysis_core_FIX.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="vector_ops_FIX.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="schur_FIX.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="schur64_FIX.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\win32\config.h">\r
similarity index 55%
rename from silk/array_maxabs.c
rename to silk/fixed/vector_ops_FIX.c
index 1194f0c..d416c93 100644 (file)
@@ -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
         }
     }
 }
-
index bf00a74..9c8fbff 100644 (file)
@@ -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 (file)
index cb52144..0000000
+++ /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 (file)
index 09224de..0000000
+++ /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*/
-    }
-}
index 76bd1c1..5be5cba 100644 (file)
   <ItemGroup>\r
     <ClCompile Include="A2NLSF.c" />\r
     <ClCompile Include="ana_filt_bank_1.c" />\r
-    <ClCompile Include="apply_sine_window.c" />\r
-    <ClCompile Include="array_maxabs.c" />\r
-    <ClCompile Include="autocorr.c" />\r
     <ClCompile Include="biquad_alt.c" />\r
-    <ClCompile Include="burg_modified.c" />\r
     <ClCompile Include="bwexpander.c" />\r
     <ClCompile Include="bwexpander_32.c" />\r
     <ClCompile Include="check_control_input.c" />\r
     <ClCompile Include="init_encoder.c" />\r
     <ClCompile Include="inner_prod_aligned.c" />\r
     <ClCompile Include="interpolate.c" />\r
-    <ClCompile Include="k2a.c" />\r
-    <ClCompile Include="k2a_Q16.c" />\r
     <ClCompile Include="lin2log.c" />\r
     <ClCompile Include="log2lin.c" />\r
     <ClCompile Include="LPC_analysis_filter.c" />\r
     <ClCompile Include="NLSF_VQ_weights_laroia.c" />\r
     <ClCompile Include="NSQ.c" />\r
     <ClCompile Include="NSQ_del_dec.c" />\r
-    <ClCompile Include="pitch_analysis_core.c" />\r
     <ClCompile Include="pitch_est_tables.c" />\r
     <ClCompile Include="PLC.c" />\r
     <ClCompile Include="process_NLSFs.c" />\r
     <ClCompile Include="resampler_private_IIR_FIR.c" />\r
     <ClCompile Include="resampler_private_up2_HQ.c" />\r
     <ClCompile Include="resampler_rom.c" />\r
-    <ClCompile Include="scale_copy_vector16.c" />\r
-    <ClCompile Include="scale_vector.c" />\r
-    <ClCompile Include="schur.c" />\r
-    <ClCompile Include="schur64.c" />\r
     <ClCompile Include="shell_coder.c" />\r
     <ClCompile Include="sigm_Q15.c" />\r
     <ClCompile Include="sort.c" />\r
index 42d1f64..a2b5cb8 100644 (file)
     <ClCompile Include="ana_filt_bank_1.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="apply_sine_window.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="array_maxabs.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="autocorr.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="biquad_alt.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="burg_modified.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="bwexpander.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="interpolate.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="k2a.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="k2a_Q16.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="lin2log.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="NSQ_del_dec.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="pitch_analysis_core.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="pitch_est_tables.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="resampler_rom.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="scale_copy_vector16.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="scale_vector.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="schur.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="schur64.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="shell_coder.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
index 05d9636..25a1bb4 100644 (file)
@@ -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 \