Skip to content
Snippets Groups Projects
Commit 08ac1e78 authored by Justin Ruggles's avatar Justin Ruggles
Browse files

use bps instead of kbps for bitrate

Originally committed as revision 11337 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 359154bc
No related branches found
No related tags found
No related merge requests found
......@@ -669,9 +669,8 @@ static int AC3_encode_init(AVCodecContext *avctx)
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 @@ static int AC3_encode_frame(AVCodecContext *avctx,
}
/* 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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment