generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ac3enc: choose the closest bit rate to the one requested instead of failing

Browse Source
This commit is contained in:
Justin Ruggles 2012-02-22 21:26:09 -05:00
parent 78e9852a2e
commit 6aeea1dfb2
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/ac3enc.c
View File

@ -2189,15 +2189,20 @@ static av_cold int validate_options(AC3EncodeContext *s)
wpf--; wpf--;
s->frame_size_min = 2 * wpf; s->frame_size_min = 2 * wpf;
} else { } else {
int best_br = 0, best_code = 0, best_diff = INT_MAX;
for (i = 0; i < 19; i++) { for (i = 0; i < 19; i++) {
if ((ff_ac3_bitrate_tab[i] >> s->bit_alloc.sr_shift)*1000 == avctx->bit_rate) int br = (ff_ac3_bitrate_tab[i] >> s->bit_alloc.sr_shift) * 1000;
int diff = abs(br - avctx->bit_rate);
if (diff < best_diff) {
best_br = br;
best_code = i;
best_diff = diff;
}
if (!best_diff)
break; break;
} }
if (i == 19) { avctx->bit_rate = best_br;
av_log(avctx, AV_LOG_ERROR, "invalid bit rate\n"); s->frame_size_code = best_code << 1;
return AVERROR(EINVAL);
}
s->frame_size_code = i << 1;
s->frame_size_min = 2 * ff_ac3_frame_size_tab[s->frame_size_code][s->bit_alloc.sr_code]; s->frame_size_min = 2 * ff_ac3_frame_size_tab[s->frame_size_code][s->bit_alloc.sr_code];
s->num_blks_code = 0x3; s->num_blks_code = 0x3;
s->num_blocks = 6; s->num_blocks = 6;