[SCM] libav/experimental: enable multichannel output in dca decoder. reference: Subject: [Ffmpeg-devel] [PATCH] DTS multichannel Date: Wed, 25 Apr 2007 16:25:18 -0400

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit cc82662662f7575ffb717adb56c2f04a122eb20e
Author: Justin Ruggles <justin.ruggles at gmail.com>
Date:   Wed May 2 20:31:32 2007 +0000

    enable multichannel output in dca decoder.
    reference:
    Subject: [Ffmpeg-devel] [PATCH] DTS multichannel
    Date: Wed, 25 Apr 2007 16:25:18 -0400
    
    Originally committed as revision 8874 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index 1c040e2..5da609e 100644
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -285,7 +285,8 @@ static int dca_parse_frame_header(DCAContext * s)
     s->dialog_norm       = get_bits(&s->gb, 4);
 
     /* FIXME: channels mixing levels */
-    s->output = DCA_STEREO;
+    s->output = s->amode;
+    if(s->lfe) s->output |= DCA_LFE;
 
 #ifdef TRACE
     av_log(s->avctx, AV_LOG_DEBUG, "frame type: %i\n", s->frame_type);
@@ -1143,10 +1144,25 @@ static int dca_decode_frame(AVCodecContext * avctx,
     }
     //set AVCodec values with parsed data
     avctx->sample_rate = s->sample_rate;
-    avctx->channels = 2; //FIXME
     avctx->bit_rate = s->bit_rate;
 
-    channels = dca_channels[s->output];
+    channels = s->prim_channels + !!s->lfe;
+    if(avctx->channels == 0) {
+        avctx->channels = channels;
+    } else if(channels < avctx->channels) {
+        av_log(avctx, AV_LOG_WARNING, "DTS source channels are less than "
+               "specified: output to %d channels.\n", channels);
+        avctx->channels = channels;
+    }
+    if(avctx->channels == 2) {
+        s->output = DCA_STEREO;
+    } else if(avctx->channels != channels) {
+        av_log(avctx, AV_LOG_ERROR, "Cannot downmix DTS to %d channels.\n",
+               avctx->channels);
+        return -1;
+    }
+
+    channels = avctx->channels;
     if(*data_size < (s->sample_blocks / 8) * 256 * sizeof(int16_t) * channels)
         return -1;
     *data_size = 0;

-- 
Libav/FFmpeg packaging