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

[jm at svn.xiph.org]

Author: jm
Date: 2006-12-01 05:33:51 -0800 (Fri, 01 Dec 2006)
New Revision: 12161

Modified:
   trunk/speex/libspeex/jitter.c
   trunk/speex/libspeex/modes.c
   trunk/speex/libspeex/nb_celp.c
   trunk/speex/libspeex/quant_lsp.c
Log:
reviving the old EPIC_48K mode.


Modified: trunk/speex/libspeex/jitter.c
===================================================================
--- trunk/speex/libspeex/jitter.c	2006-12-01 09:01:31 UTC (rev 12160)
+++ trunk/speex/libspeex/jitter.c	2006-12-01 13:33:51 UTC (rev 12161)
@@ -442,6 +442,7 @@
          speex_warning_int("Unknown jitter_buffer_ctl request: ", request);
          return -1;
    }
+   return 0;
 }
 
 

Modified: trunk/speex/libspeex/modes.c
===================================================================
--- trunk/speex/libspeex/modes.c	2006-12-01 09:01:31 UTC (rev 12160)
+++ trunk/speex/libspeex/modes.c	2006-12-01 13:33:51 UTC (rev 12161)
@@ -608,11 +608,7 @@
    split_cb_search_shape_sign,
    split_cb_shape_sign_unquant,
    &split_cb_nb_48k,
-#ifdef FIXED_POINT
-   22938, 16384, 11796, 18022,
-#else
-   0.7, 0.5, .36, .55,
-#endif
+   QCONST16(.45,15),
    144
 };
 
@@ -622,7 +618,6 @@
    240,    /*frameSize*/
    48,     /*subframeSize*/
    10,     /*lpcSize*/
-   640,    /*bufSize*/
    17,     /*pitchStart*/
    144,    /*pitchEnd*/
    0.9,    /*gamma1*/

Modified: trunk/speex/libspeex/nb_celp.c
===================================================================
--- trunk/speex/libspeex/nb_celp.c	2006-12-01 09:01:31 UTC (rev 12160)
+++ trunk/speex/libspeex/nb_celp.c	2006-12-01 13:33:51 UTC (rev 12161)
@@ -432,7 +432,7 @@
             ol_gain2=ol2;
          ol_gain2 = sqrt(2*ol_gain2*(ol1+ol2))*1.3*(1-.5*GAIN_SCALING_1*GAIN_SCALING_1*ol_pitch_coef*ol_pitch_coef);
       
-         ol_gain=SHR(sqrt(1+ol_gain2/st->frameSize),SIG_SHIFT);
+         ol_gain=SHR32(sqrt(1+ol_gain2/st->frameSize),SIG_SHIFT);
 
       } else
 #endif
@@ -1227,7 +1227,7 @@
    VARDECL(spx_lsp_t *qlsp);
    spx_word16_t pitch_average=0;
 #ifdef EPIC_48K
-   int pitch_half[2];
+   int pitch_half[2] = {0, 0};
    int ol_pitch_id=0;
 #endif
    spx_word16_t *out = (spx_word16_t*)vout;

Modified: trunk/speex/libspeex/quant_lsp.c
===================================================================
--- trunk/speex/libspeex/quant_lsp.c	2006-12-01 09:01:31 UTC (rev 12160)
+++ trunk/speex/libspeex/quant_lsp.c	2006-12-01 13:33:51 UTC (rev 12161)
@@ -417,7 +417,7 @@
 
 #ifdef FIXED_POINT
    for (i=0;i<order;i++)
-      qlsp[i]=PSHR(qlsp[i],2);
+      qlsp[i]=PSHR16(qlsp[i],2);
 #else
    for (i=0;i<order;i++)
       qlsp[i]=qlsp[i]*0.00097655;