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

[jm at svn.xiph.org]

Author: jm
Date: 2006-06-12 05:52:05 -0700 (Mon, 12 Jun 2006)
New Revision: 11561

Modified:
   trunk/speex/libspeex/ltp.c
Log:
removed a float/fixed split in pitch_gain_search_3tap()


Modified: trunk/speex/libspeex/ltp.c
===================================================================
--- trunk/speex/libspeex/ltp.c	2006-06-11 17:56:24 UTC (rev 11560)
+++ trunk/speex/libspeex/ltp.c	2006-06-12 12:52:05 UTC (rev 11561)
@@ -456,8 +456,6 @@
       for (j=tmp1;j<tmp3;j++)
          exc[j]=MAC16_16(exc[j],SHL16(gain[2-i],7),exc2[j-pp-pitch]);
    }
-   err=0;
-#ifdef FIXED_POINT
    for (i=0;i<nsf;i++)
    {
       spx_word16_t perr2;
@@ -466,14 +464,6 @@
       new_target[i] = SUB16(target[i], EXTRACT16(PSHR32(tmp,6)));
    }
    err = inner_prod(new_target, new_target, nsf);
-#else
-   for (i=0;i<nsf;i++)
-   {
-      spx_sig_t tmp = gain[2]*x[0][i]+gain[1]*x[1][i]+gain[0]*x[2][i];
-      new_target[i] = target[i] - tmp;
-      err+=new_target[i]*new_target[i];
-   }
-#endif
 
    return err;
 }