Mercurial > libavcodec.hg
changeset 6082:f17aad297a38 libavcodec
use bps instead of kbps for bitrate
| author | jbr |
|---|---|
| date | Fri, 28 Dec 2007 05:32:12 +0000 |
| parents | 64d36d15b3bb |
| children | 77d27412c35d |
| files | ac3enc.c |
| diffstat | 1 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ac3enc.c Fri Dec 28 03:12:24 2007 +0000 +++ b/ac3enc.c Fri Dec 28 05:32:12 2007 +0000 @@ -669,9 +669,8 @@ s->bitstream_mode = 0; /* complete main audio service */ /* bitrate & frame size */ - bitrate /= 1000; for(i=0;i<19;i++) { - if ((ff_ac3_bitrate_tab[i] >> s->sr_shift) == bitrate) + if ((ff_ac3_bitrate_tab[i] >> s->sr_shift)*1000 == bitrate) break; } if (i == 19) @@ -1240,11 +1239,11 @@ } /* adjust for fractional frame sizes */ - while(s->bits_written >= s->bit_rate*1000 && s->samples_written >= s->sample_rate) { - s->bits_written -= s->bit_rate*1000; + while(s->bits_written >= s->bit_rate && s->samples_written >= s->sample_rate) { + s->bits_written -= s->bit_rate; s->samples_written -= s->sample_rate; } - s->frame_size = s->frame_size_min + (s->bits_written * s->sample_rate < s->samples_written * s->bit_rate*1000); + s->frame_size = s->frame_size_min + (s->bits_written * s->sample_rate < s->samples_written * s->bit_rate); s->bits_written += s->frame_size * 16; s->samples_written += AC3_FRAME_SIZE;