RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

binkaudio: simplify frame_len_bits and frame_len calculation 

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
This commit is contained in:
Peter Ross 2011-02-20 12:24:48 +11:00 committed by Ronald S. Bultje
parent a304def1dc
commit 8a8c283edd
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/binkaudio.c
View File

@ -81,7 +81,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
} else { } else {
frame_len_bits = 11; frame_len_bits = 11;
} }
s->frame_len = 1 << frame_len_bits;
if (avctx->channels > MAX_CHANNELS) { if (avctx->channels > MAX_CHANNELS) {
av_log(avctx, AV_LOG_ERROR, "too many channels: %d\n", avctx->channels); av_log(avctx, AV_LOG_ERROR, "too many channels: %d\n", avctx->channels);
@ -91,14 +90,13 @@ static av_cold int decode_init(AVCodecContext *avctx)
if (avctx->codec->id == CODEC_ID_BINKAUDIO_RDFT) { if (avctx->codec->id == CODEC_ID_BINKAUDIO_RDFT) {
// audio is already interleaved for the RDFT format variant // audio is already interleaved for the RDFT format variant
sample_rate *= avctx->channels; sample_rate *= avctx->channels;
s->frame_len *= avctx->channels;
s->channels = 1; s->channels = 1;
if (avctx->channels == 2) frame_len_bits += av_log2(avctx->channels);
frame_len_bits++;
} else { } else {
s->channels = avctx->channels; s->channels = avctx->channels;
} }
s->frame_len = 1 << frame_len_bits;
s->overlap_len = s->frame_len / 16; s->overlap_len = s->frame_len / 16;
s->block_size = (s->frame_len - s->overlap_len) * s->channels; s->block_size = (s->frame_len - s->overlap_len) * s->channels;
sample_rate_half = (sample_rate + 1) / 2; sample_rate_half = (sample_rate + 1) / 2;