Originally committed as revision 8478 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2007-03-22 05:38:00 +00:00
parent bbd16dea67
commit 319708da02
1 changed files with 4 additions and 2 deletions

View File

@ -467,6 +467,9 @@ static int bit_alloc(AC3EncodeContext *s,
int frame_bits, int csnroffst, int fsnroffst) int frame_bits, int csnroffst, int fsnroffst)
{ {
int i, ch; int i, ch;
int snroffset;
snroffset = (((csnroffst - 15) << 4) + fsnroffst) << 2;
/* compute size */ /* compute size */
for(i=0;i<NB_BLOCKS;i++) { for(i=0;i<NB_BLOCKS;i++) {
@ -476,8 +479,7 @@ static int bit_alloc(AC3EncodeContext *s,
for(ch=0;ch<s->nb_all_channels;ch++) { for(ch=0;ch<s->nb_all_channels;ch++) {
ff_ac3_bit_alloc_calc_bap(mask[i][ch], psd[i][ch], ff_ac3_bit_alloc_calc_bap(mask[i][ch], psd[i][ch],
0, s->nb_coefs[ch], 0, s->nb_coefs[ch],
(((csnroffst-15) << 4) + snroffset,
fsnroffst) << 2,
s->bit_alloc.floor, bap[i][ch]); s->bit_alloc.floor, bap[i][ch]);
frame_bits += compute_mantissa_size(s, bap[i][ch], frame_bits += compute_mantissa_size(s, bap[i][ch],
s->nb_coefs[ch]); s->nb_coefs[ch]);