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

[jm at svn.xiph.org]

Author: jm
Date: 2006-04-30 04:23:26 -0700 (Sun, 30 Apr 2006)
New Revision: 11321

Modified:
   trunk/speex/libspeex/filters.c
   trunk/speex/libspeex/nb_celp.c
Log:
cleaning up new enhancer


Modified: trunk/speex/libspeex/filters.c
===================================================================
--- trunk/speex/libspeex/filters.c	2006-04-30 10:46:44 UTC (rev 11320)
+++ trunk/speex/libspeex/filters.c	2006-04-30 11:23:26 UTC (rev 11321)
@@ -719,6 +719,7 @@
    spx_word16_t c1, c2;
    spx_word16_t g1, g2;
    spx_word16_t ngain;
+   spx_word16_t gg1, gg2;
 
 #ifdef FIXED_POINT
    VARDECL(spx_word16_t *exc2);
@@ -783,9 +784,6 @@
       pgain2 = QCONST16(1., 14);
    else
       pgain2 = DIV32_16(SHL32(DIV32(corr1, exc_mag),14),iexc1_mag);
-   //float gg1 = 1.*exc_mag/iexc0_mag;
-   //float gg2 = 1.*exc_mag/iexc1_mag;
-   spx_word16_t gg1, gg2;
    gg1 = DIV32_16(SHL32(EXTEND32(exc_mag),8), iexc0_mag);
    gg2 = DIV32_16(SHL32(EXTEND32(exc_mag),8), iexc1_mag);
    if (comb_gain>0)

Modified: trunk/speex/libspeex/nb_celp.c
===================================================================
--- trunk/speex/libspeex/nb_celp.c	2006-04-30 10:46:44 UTC (rev 11320)
+++ trunk/speex/libspeex/nb_celp.c	2006-04-30 11:23:26 UTC (rev 11321)
@@ -1706,8 +1706,8 @@
 #ifdef NEW_ENHANCER
    if (st->lpc_enh_enabled && SUBMODE(comb_gain)>0 && !st->count_lost)
    {
-      multicomb(st->exc-40, out, st->interp_qlpc, st->lpcSize, 2*st->subframeSize, pitch, pitch_gain, SUBMODE(comb_gain), stack);
-      multicomb(st->exc+40, out+80, st->interp_qlpc, st->lpcSize, 2*st->subframeSize, pitch, pitch_gain, SUBMODE(comb_gain), stack);
+      multicomb(st->exc-40, out, st->interp_qlpc, st->lpcSize, 2*st->subframeSize, best_pitch, pitch_gain, SUBMODE(comb_gain), stack);
+      multicomb(st->exc+40, out+80, st->interp_qlpc, st->lpcSize, 2*st->subframeSize, best_pitch, pitch_gain, SUBMODE(comb_gain), stack);
    } else {
       for (i=0;i<st->frameSize;i++)
          out[i]=PSHR32(st->exc[i-40],SIG_SHIFT);