eden-emu/opus
15
0
Fork 0
mirror of https://github.com/xiph/opus.git synced 2025-06-06 15:30:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixes a fixed-point overflow in the new transient detector

Browse source
This commit is contained in:
Jean-Marc Valin 2012-11-03 00:13:06 -04:00
parent f2729ded66
commit 36890bc852
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
celt/celt.c
View file

@ -379,10 +379,11 @@ static inline opus_val16 SIG2WORD16(celt_sig x)
/* Forward pass to compute the post-echo threshold*/ /* Forward pass to compute the post-echo threshold*/
for (i=0;i<len;i++) for (i=0;i<len;i++)
{ {
opus_val16 x2 = SHR32(MULT16_16(tmp[2*i],tmp[2*i]) + MULT16_16(tmp[2*i+1],tmp[2*i+1]),15); opus_val16 x2 = PSHR32(MULT16_16(tmp[2*i],tmp[2*i]) + MULT16_16(tmp[2*i+1],tmp[2*i+1]),16);
mean += x2; mean += x2;
#ifdef FIXED_POINT #ifdef FIXED_POINT
tmp[i] = mem0 + SHR16(x2-mem0,4); /* FIXME: Use PSHR16() instead */
tmp[i] = mem0 + PSHR32(x2-mem0,4);
#else #else
tmp[i] = mem0 + MULT16_16_P15(QCONST16(.0625f,15),x2-mem0); tmp[i] = mem0 + MULT16_16_P15(QCONST16(.0625f,15),x2-mem0);
#endif #endif
@ -394,7 +395,8 @@ static inline opus_val16 SIG2WORD16(celt_sig x)
for (i=len-1;i>=0;i--) for (i=len-1;i>=0;i--)
{ {
#ifdef FIXED_POINT #ifdef FIXED_POINT
tmp[i] = mem0 + SHR16(tmp[i]-mem0,3); /* FIXME: Use PSHR16() instead */
tmp[i] = mem0 + PSHR32(tmp[i]-mem0,3);
#else #else
tmp[i] = mem0 + MULT16_16_P15(QCONST16(0.125f,15),tmp[i]-mem0); tmp[i] = mem0 + MULT16_16_P15(QCONST16(0.125f,15),tmp[i]-mem0);
#endif #endif
@ -415,12 +417,9 @@ static inline opus_val16 SIG2WORD16(celt_sig x)
{ {
int id; int id;
#ifdef FIXED_POINT #ifdef FIXED_POINT
if (MULT16_16(len,tmp[i]) >= SHL32(mean,1)-SHR32(mean,6)) id = IMAX(0,IMIN(127,MULT16_32_Q15(tmp[i],norm))); /* Do not round to nearest */
id = 127;
else
id = MULT16_32_Q15(tmp[i],norm); /* Do not round to nearest */
#else #else
id = IMIN(127,floor(64*norm*tmp[i])); /* Do not round to nearest */ id = IMAX(0,IMIN(127,floor(64*norm*tmp[i]))); /* Do not round to nearest */
#endif #endif
unmask += inv_table[id]; unmask += inv_table[id];
} }