binkaudio: simplify frame_len_bits and frame_len calculation
authorPeter Ross <pross@xvid.org>
Sun, 20 Feb 2011 01:24:48 +0000 (12:24 +1100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Feb 2011 02:16:06 +0000 (03:16 +0100)
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 8a8c283edd0da5863eb729a31a94b70820400941)

libavcodec/binkaudio.c

index b601a01..116bf5b 100644 (file)
@@ -81,7 +81,6 @@ static av_cold int decode_init(AVCodecContext *avctx)
     } else {
         frame_len_bits = 11;
     }
-    s->frame_len = 1 << frame_len_bits;
 
     if (avctx->channels > MAX_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) {
         // audio is already interleaved for the RDFT format variant
         sample_rate  *= avctx->channels;
-        s->frame_len *= avctx->channels;
         s->channels = 1;
-        if (avctx->channels == 2)
-            frame_len_bits++;
+        frame_len_bits += av_log2(avctx->channels);
     } else {
         s->channels = avctx->channels;
     }
 
+    s->frame_len     = 1 << frame_len_bits;
     s->overlap_len   = s->frame_len / 16;
     s->block_size    = (s->frame_len - s->overlap_len) * s->channels;
     sample_rate_half = (sample_rate + 1) / 2;