[FFmpeg-cvslog] r11220 - trunk/libavcodec/ac3dec.c

[andoma]

Author: andoma
Date: Sat Dec 15 08:00:19 2007
New Revision: 11220

Log:
Make AC3 decoder honor avctx->request_channels



Modified:
   trunk/libavcodec/ac3dec.c

Modified: trunk/libavcodec/ac3dec.c
==============================================================================
--- trunk/libavcodec/ac3dec.c	(original)
+++ trunk/libavcodec/ac3dec.c	Sat Dec 15 08:00:19 2007
@@ -1128,23 +1128,12 @@ static int ac3_decode_frame(AVCodecConte
 
     /* channel config */
     ctx->out_channels = ctx->channels;
-    if (avctx->channels == 0) {
-        avctx->channels = ctx->out_channels;
-    } else if(ctx->out_channels < avctx->channels) {
-        av_log(avctx, AV_LOG_ERROR, "Cannot upmix AC3 from %d to %d channels.\n",
-               ctx->out_channels, avctx->channels);
-        return -1;
-    }
-    if(avctx->channels == 2) {
-        ctx->output_mode = AC3_CHMODE_STEREO;
-    } else if(avctx->channels == 1) {
-        ctx->output_mode = AC3_CHMODE_MONO;
-    } else if(avctx->channels != ctx->out_channels) {
-        av_log(avctx, AV_LOG_ERROR, "Cannot downmix AC3 from %d to %d channels.\n",
-               ctx->out_channels, avctx->channels);
-        return -1;
+    if (avctx->request_channels > 0 && avctx->request_channels <= 2 &&
+        avctx->request_channels < ctx->channels) {
+        ctx->out_channels = avctx->request_channels;
+        ctx->output_mode  = avctx->request_channels == 1 ? AC3_CHMODE_MONO : AC3_CHMODE_STEREO;
     }
-    ctx->out_channels = avctx->channels;
+    avctx->channels = ctx->out_channels;
 
     /* parse the audio blocks */
     for (blk = 0; blk < NB_BLOCKS; blk++) {