shithub: opus

Info  •  Files  •  Log  •  Branches

Fix C90-related warnings

--- a/celt/tests/test_unit_dft.c

+++ b/celt/tests/test_unit_dft.c

@@ -144,8 +144,9 @@

 int main(int argc,char ** argv)

 {

+    int arch;

     ALLOC_STACK;

-    int arch = opus_select_arch();

+    arch = opus_select_arch();

     if (argc>1) {

         int k;

--- a/celt/tests/test_unit_entropy.c

+++ b/celt/tests/test_unit_entropy.c

@@ -104,7 +104,7 @@

   nbits=ec_tell_frac(&enc);

   ec_enc_done(&enc);

   fprintf(stderr,

-   "Encoded %0.2lf bits of entropy to %0.2lf bits (%0.3lf%% wasted).\n",

+   "Encoded %0.2f bits of entropy to %0.2f bits (%0.3f%% wasted).\n",

    entropy,ldexp(nbits,-3),100*(nbits-ldexp(entropy,3))/nbits);

   fprintf(stderr,"Packed to %li bytes.\n",(long)ec_range_bytes(&enc));

   ec_dec_init(&dec,ptr,DATA_SIZE);

@@ -129,7 +129,7 @@

   nbits2=ec_tell_frac(&dec);

   if(nbits!=nbits2){

     fprintf(stderr,

-     "Reported number of bits used was %0.2lf, should be %0.2lf.\n",

+     "Reported number of bits used was %0.2f, should be %0.2f.\n",

      ldexp(nbits2,-3),ldexp(nbits,-3));

     ret=-1;

   }

--- a/celt/tests/test_unit_mdct.c

+++ b/celt/tests/test_unit_mdct.c

@@ -184,8 +184,9 @@

 int main(int argc,char ** argv)

 {

+    int arch;

     ALLOC_STACK;

-    int arch = opus_select_arch();

+    arch = opus_select_arch();

     if (argc>1) {

         int k;

--- a/silk/tests/test_unit_LPC_inv_pred_gain.c

+++ b/silk/tests/test_unit_LPC_inv_pred_gain.c

@@ -43,6 +43,7 @@

     int i;

     int j;

     int sum_a, sum_abs_a;

+    double y[SILK_MAX_ORDER_LPC] = {0};

     sum_a = sum_abs_a = 0;

     for( j = 0; j < order; j++ ) {

         sum_a += A_Q12[ j ];

@@ -57,7 +58,6 @@

     if( sum_abs_a < 4096 ) {

         return 1;

     }

-    double y[SILK_MAX_ORDER_LPC] = {0};

     y[0] = 1;

     for( i = 0; i < 10000; i++ ) {

         double sum = 0;

--- a/silk/x86/NSQ_del_dec_sse4_1.c

+++ b/silk/x86/NSQ_del_dec_sse4_1.c

@@ -387,6 +387,7 @@

     opus_int32   q1_Q0, q1_Q10, q2_Q10, exc_Q14, LPC_exc_Q14, xq_Q14, Gain_Q10;

     opus_int32   tmp1, tmp2, sLF_AR_shp_Q14;

     opus_int32   *pred_lag_ptr, *shp_lag_ptr, *psLPC_Q14;

+    int rdo_offset;

     VARDECL( NSQ_sample_pair, psSampleState );

     NSQ_del_dec_struct *psDD;

@@ -399,7 +400,7 @@

     celt_assert( nStatesDelayedDecision > 0 );

     ALLOC( psSampleState, nStatesDelayedDecision, NSQ_sample_pair );

-    int rdo_offset = (Lambda_Q10 >> 1) - 512;

+    rdo_offset = (Lambda_Q10 >> 1) - 512;

     shp_lag_ptr  = &NSQ->sLTP_shp_Q14[ NSQ->sLTP_shp_buf_idx - lag + HARM_SHAPE_FIR_TAPS / 2 ];

     pred_lag_ptr = &sLTP_Q15[ NSQ->sLTP_buf_idx - lag + LTP_ORDER / 2 ];

--- a/silk/x86/NSQ_sse4_1.c

+++ b/silk/x86/NSQ_sse4_1.c

@@ -719,10 +719,10 @@

     /* Adjust for changing gain */

     if( Gains_Q16[ subfr ] != NSQ->prev_gain_Q16 ) {

+        __m128i xmm_gain_adj_Q16, xmm_sLTP_shp_Q14_x2x0, xmm_sLTP_shp_Q14_x3x1;

         gain_adj_Q16 =  silk_DIV32_varQ( NSQ->prev_gain_Q16, Gains_Q16[ subfr ], 16 );

         /* Scale long-term shaping state */

-        __m128i xmm_gain_adj_Q16, xmm_sLTP_shp_Q14_x2x0, xmm_sLTP_shp_Q14_x3x1;

         /* prepare gain_adj_Q16 in packed 4 32-bits */

         xmm_gain_adj_Q16 = _mm_set1_epi32(gain_adj_Q16);