eden-emu/opus
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed-point: New PLC now enabled by default

Browse source
This commit is contained in:
Jean-Marc Valin 2010-06-17 20:25:51 -04:00
parent 7b7f07120e
commit feca095e96
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libcelt/celt.c
View file

@ -53,7 +53,7 @@
#include <stdarg.h> #include <stdarg.h>
#define LPC_ORDER 24 #define LPC_ORDER 24
/* #define NEW_PLC */ #define NEW_PLC
#if !defined(FIXED_POINT) || defined(NEW_PLC) #if !defined(FIXED_POINT) || defined(NEW_PLC)
#include "plc.c" #include "plc.c"
#endif #endif
@ -1584,16 +1584,21 @@ static void celt_decode_lost(CELTDecoder * restrict st, celt_word16 * restrict p
celt_word32 S2=0; celt_word32 S2=0;
for (i=0;i<len+overlap;i++) for (i=0;i<len+overlap;i++)
S2 += SHR32(MULT16_16(e[i],e[i]),8); S2 += SHR32(MULT16_16(e[i],e[i]),8);
/* This checks for an "explosion" in the synthesis (including NaNs) */ /* This checks for an "explosion" in the synthesis */
#ifdef FIXED_POINT
if (!(S1 > SHR32(S2,2)))
#else
/* Float test is written this way to catch NaNs at the same time */
if (!(S1 > 0.2f*S2)) if (!(S1 > 0.2f*S2))
#endif
{ {
for (i=0;i<len+overlap;i++) for (i=0;i<len+overlap;i++)
e[i] = 0; e[i] = 0;
} else if (S1 < S2) } else if (S1 < S2)
{ {
float ratio = sqrt((S1+1.)/(S2+1.)); celt_word16 ratio = celt_sqrt(frac_div32(SHR32(S1,1)+1,S2+1.));
for (i=0;i<len+overlap;i++) for (i=0;i<len+overlap;i++)
e[i] *= ratio; e[i] = MULT16_16_Q15(ratio, e[i]);
} }
} }