[xiph-commits] r11392 - trunk/speex/libspeex

[jm at svn.xiph.org]

Author: jm
Date: 2006-05-10 00:19:23 -0700 (Wed, 10 May 2006)
New Revision: 11392

Modified:
   trunk/speex/libspeex/filters.c
   trunk/speex/libspeex/nb_celp.c
Log:
C89 fixes


Modified: trunk/speex/libspeex/filters.c
===================================================================
--- trunk/speex/libspeex/filters.c	2006-05-10 06:09:18 UTC (rev 11391)
+++ trunk/speex/libspeex/filters.c	2006-05-10 07:19:23 UTC (rev 11392)
@@ -684,13 +684,13 @@
       for (j=0;j<7;j++)
       {
          int i1, i2;
+         spx_word32_t tmp=0;
          i1 = 3-j;
          if (i1<0)
             i1 = 0;
          i2 = 10-j;
          if (i2>7)
             i2 = 7;
-         spx_word32_t tmp=0;
          for (k=i1;k<i2;k++)
             tmp += MULT16_32_Q15(shift_filt[i][k],corr[0][j+k-3]);
          corr[i+1][j] = tmp;

Modified: trunk/speex/libspeex/nb_celp.c
===================================================================
--- trunk/speex/libspeex/nb_celp.c	2006-05-10 06:09:18 UTC (rev 11391)
+++ trunk/speex/libspeex/nb_celp.c	2006-05-10 07:19:23 UTC (rev 11392)
@@ -410,7 +410,7 @@
       }
       
       /*Compute "real" excitation*/
-      /* FIXME: Are we breaking aliasing rules? */
+      /* FIXME: Are we breaking aliasing rules here? */
       exc16_alias = (spx_word16_t*)st->exc;
       for (i=0;i<st->windowSize-st->frameSize;i++)
          exc16_alias[i] = st->winBuf[i];
@@ -436,17 +436,16 @@
       
          ol_gain=SHR(sqrt(1+ol_gain2/st->frameSize),SIG_SHIFT);
 
-      } else {
+      } else
 #endif
+      {
          spx_word16_t g = compute_rms16(exc16_alias, st->frameSize);
          if (ol_pitch>0)
             ol_gain = MULT16_16(g, MULT16_16_Q14(QCONST16(1.1,14),
                                 spx_sqrt(QCONST32(1.,28)-MULT16_32_Q15(QCONST16(.8,15),SHL32(MULT16_16(ol_pitch_coef,ol_pitch_coef),16)))));
          else
             ol_gain = SHL32(EXTEND32(g),SIG_SHIFT);
-#ifdef EPIC_48K
       }
-#endif
    }
 
 #ifdef VORBIS_PSYCHO
@@ -1372,7 +1371,7 @@
          float pgain=GAIN_SCALING_1*st->last_pitch_gain;
          if (pgain>.6)
             pgain=.6;
-         /* This was innov, not exc */
+         /* FIXME: This was innov, not exc */
 	 innov_gain = compute_rms(st->exc, st->frameSize);
          for (i=0;i<st->frameSize;i++)
             st->exc[i]=VERY_SMALL;