[xiph-commits] r13194 - in trunk/speex: . libspeex

[jm at svn.xiph.org]

Author: jm
Date: 2007-06-27 06:42:50 -0700 (Wed, 27 Jun 2007)
New Revision: 13194

Modified:
   trunk/speex/.gitignore
   trunk/speex/libspeex/kiss_fft.c
   trunk/speex/libspeex/nb_celp.c
   trunk/speex/libspeex/resample.c
   trunk/speex/libspeex/sb_celp.c
Log:
bit of cleaning up


Modified: trunk/speex/.gitignore
===================================================================
--- trunk/speex/.gitignore	2007-06-27 13:42:43 UTC (rev 13193)
+++ trunk/speex/.gitignore	2007-06-27 13:42:50 UTC (rev 13194)
@@ -2,6 +2,7 @@
 *.lo
 Makefile.in
 *~
+*.orig
 fixed
 float
 Speex.kdevelop.pcs
@@ -37,4 +38,4 @@
 speexdec
 src/speexenc
 stamp-*
-
+patches

Modified: trunk/speex/libspeex/kiss_fft.c
===================================================================
--- trunk/speex/libspeex/kiss_fft.c	2007-06-27 13:42:43 UTC (rev 13193)
+++ trunk/speex/libspeex/kiss_fft.c	2007-06-27 13:42:50 UTC (rev 13194)
@@ -86,7 +86,7 @@
         kiss_fft_cpx * Fout,
         const size_t fstride,
         const kiss_fft_cfg st,
-        const size_t m,
+        int m,
         int N,
         int mm
         )

Modified: trunk/speex/libspeex/nb_celp.c
===================================================================
--- trunk/speex/libspeex/nb_celp.c	2007-06-27 13:42:43 UTC (rev 13193)
+++ trunk/speex/libspeex/nb_celp.c	2007-06-27 13:42:50 UTC (rev 13194)
@@ -1321,10 +1321,7 @@
       ALLOC(lpc, st->lpcSize, spx_coef_t);
       bw_lpc(QCONST16(0.93f,15), st->interp_qlpc, lpc, st->lpcSize);
       {
-         float innov_gain=0;
-         float pgain=GAIN_SCALING_1*st->last_pitch_gain;
-         if (pgain>.6)
-            pgain=.6;
+         spx_word16_t innov_gain=0;
          /* FIXME: This was innov, not exc */
          innov_gain = compute_rms16(st->exc, st->frameSize);
          for (i=0;i<st->frameSize;i++)

Modified: trunk/speex/libspeex/resample.c
===================================================================
--- trunk/speex/libspeex/resample.c	2007-06-27 13:42:43 UTC (rev 13193)
+++ trunk/speex/libspeex/resample.c	2007-06-27 13:42:50 UTC (rev 13194)
@@ -998,7 +998,7 @@
 
 int speex_resampler_set_rate_frac(SpeexResamplerState *st, spx_uint32_t ratio_num, spx_uint32_t ratio_den, spx_uint32_t in_rate, spx_uint32_t out_rate)
 {
-   int fact;
+   spx_uint32_t fact;
    if (st->in_rate == in_rate && st->out_rate == out_rate && st->num_rate == ratio_num && st->den_rate == ratio_den)
       return RESAMPLER_ERR_SUCCESS;
    

Modified: trunk/speex/libspeex/sb_celp.c
===================================================================
--- trunk/speex/libspeex/sb_celp.c	2007-06-27 13:42:43 UTC (rev 13193)
+++ trunk/speex/libspeex/sb_celp.c	2007-06-27 13:42:50 UTC (rev 13194)
@@ -35,7 +35,6 @@
 
 #include <math.h>
 #include "sb_celp.h"
-#include "stdlib.h"
 #include "filters.h"
 #include "lpc.h"
 #include "lsp.h"
@@ -47,6 +46,10 @@
 #include "misc.h"
 #include "math_approx.h"
 
+#ifndef NULL
+#define NULL 0
+#endif
+
 /* Default size for the encoder and decoder stack (can be changed at compile time).
    This does not apply when using variable-size arrays or alloca. */
 #ifndef SB_ENC_STACK