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

Preventing negative bit allocation

Browse source
This commit is contained in:
Jean-Marc Valin 2010-12-14 13:39:30 -05:00
parent 6cbfbc383a
commit dcacb73c33
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
libcelt/rate.c
View file

@ -207,8 +207,14 @@ static inline int interp_bits2pulses(const CELTMode *m, int start, int end,
} }
for (i=0;i<*skip;i++) for (i=0;i<*skip;i++)
{ {
psum = psum - bits[codedBands-1] + ((C+1)<<BITRES); if (bits[codedBands-1] >= C<<BITRES)
bits[codedBands-1] = C<<BITRES; {
psum = psum - bits[codedBands-1] + ((C+1)<<BITRES);
bits[codedBands-1] = C<<BITRES;
} else {
psum = psum - bits[codedBands-1];
bits[codedBands-1] = 0;
}
codedBands--; codedBands--;
} }
/* Allocate the remaining bits */ /* Allocate the remaining bits */
@ -262,8 +268,10 @@ static inline int interp_bits2pulses(const CELTMode *m, int start, int end,
/* For N=1, all bits go to fine energy except for a single sign bit */ /* For N=1, all bits go to fine energy except for a single sign bit */
if (N==1) if (N==1)
ebits[j] = (bits[j]/C >> BITRES)-1; {
ebits[j] = IMAX(0,(bits[j]/C >> BITRES)-1);
fine_priority[j] = (ebits[j]+1)*C<<BITRES >= bits[j];
}
/* Make sure not to bust */ /* Make sure not to bust */
if (C*ebits[j] > (bits[j]>>BITRES)) if (C*ebits[j] > (bits[j]>>BITRES))
ebits[j] = bits[j]/C >> BITRES; ebits[j] = bits[j]/C >> BITRES;