Update the maximum fine bits everywhere.
cf874373
raised the limit from 7 to 8 for N>1 bands in
interp_bits2pulses(), but did not raise the corresponding limits
for N=1 bands, or for [un]quant_energy_finalise().
This commit raises all of the limits to the same value, 8.
This commit is contained in:
parent
949f18010f
commit
fe40ddd999
2 changed files with 2 additions and 2 deletions
|
@ -453,7 +453,7 @@ void unquant_energy_finalise(const CELTMode *m, int start, int end, celt_ener *e
|
||||||
{
|
{
|
||||||
for (i=start;i<end && bits_left>=C ;i++)
|
for (i=start;i<end && bits_left>=C ;i++)
|
||||||
{
|
{
|
||||||
if (fine_quant[i] >= 7 || fine_priority[i]!=prio)
|
if (fine_quant[i] >= 8 || fine_priority[i]!=prio)
|
||||||
continue;
|
continue;
|
||||||
c=0;
|
c=0;
|
||||||
do {
|
do {
|
||||||
|
|
|
@ -334,7 +334,7 @@ static inline int interp_bits2pulses(const CELTMode *m, int start, int end, int
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
/* 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 */
|
||||||
ebits[j] = IMIN(IMAX(0,(bits[j] >> stereo >> BITRES)-1),7);
|
ebits[j] = IMIN(IMAX(0,(bits[j] >> stereo >> BITRES)-1),8);
|
||||||
fine_priority[j] = (ebits[j]+1)*C<<BITRES >= (bits[j]-balance);
|
fine_priority[j] = (ebits[j]+1)*C<<BITRES >= (bits[j]-balance);
|
||||||
/* N=1 bands can't take advantage of the re-balancing in
|
/* N=1 bands can't take advantage of the re-balancing in
|
||||||
quant_all_bands() because they don't have shape, only fine energy.
|
quant_all_bands() because they don't have shape, only fine energy.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue