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

Unb0rked the VBR code: several units issues that made VBR completely useless

Browse source
This commit is contained in:
Jean-Marc Valin 2010-10-15 10:24:53 -04:00
parent 8200b2d16c
commit 8852563a2e
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
libcelt/celt.c
View file

@ -940,7 +940,7 @@ int celt_encode_with_ec_float(CELTEncoder * restrict st, const celt_sig * pcm, c
target=target+st->vbr_offset-(50<<BITRES)+ec_enc_tell(enc, BITRES); target=target+st->vbr_offset-(50<<BITRES)+ec_enc_tell(enc, BITRES);
/* In VBR mode the frame size must not be reduced so much that it would result in the coarse energy busting its budget */ /* In VBR mode the frame size must not be reduced so much that it would result in the coarse energy busting its budget */
target=IMIN(nbAvailableBytes,target); target=IMIN(nbAvailableBytes<<(BITRES+3),target);
/* Make the adaptation coef (alpha) higher at the beginning */ /* Make the adaptation coef (alpha) higher at the beginning */
if (st->vbr_count < 990) if (st->vbr_count < 990)
{ {
@ -951,7 +951,7 @@ int celt_encode_with_ec_float(CELTEncoder * restrict st, const celt_sig * pcm, c
alpha = QCONST16(.001f,15); alpha = QCONST16(.001f,15);
/* By how much did we "miss" the target on that frame */ /* By how much did we "miss" the target on that frame */
delta = (8<<BITRES)*(celt_int32)target - vbr_rate; delta = (celt_int32)target - vbr_rate;
/* How many bits have we used in excess of what we're allowed */ /* How many bits have we used in excess of what we're allowed */
st->vbr_reservoir += delta; st->vbr_reservoir += delta;
/*printf ("%d\n", st->vbr_reservoir);*/ /*printf ("%d\n", st->vbr_reservoir);*/
@ -970,8 +970,8 @@ int celt_encode_with_ec_float(CELTEncoder * restrict st, const celt_sig * pcm, c
target += adjust; target += adjust;
/*printf ("+%d\n", adjust);*/ /*printf ("+%d\n", adjust);*/
} }
if (target < nbAvailableBytes) if (nbAvailableBytes > target>>(BITRES+3))
nbAvailableBytes = target; nbAvailableBytes = target>>(BITRES+3);
nbCompressedBytes = nbAvailableBytes + nbFilledBytes; nbCompressedBytes = nbAvailableBytes + nbFilledBytes;
/* This moves the raw bits to take into account the new compressed size */ /* This moves the raw bits to take into account the new compressed size */