diff options
author | Justin Ruggles <justin.ruggles@gmail.com> | 2007-05-02 20:31:32 +0000 |
---|---|---|
committer | Justin Ruggles <justin.ruggles@gmail.com> | 2007-05-02 20:31:32 +0000 |
commit | cc82662662f7575ffb717adb56c2f04a122eb20e (patch) | |
tree | ebc88b16d6bc6d93e59dd168de26a8e45a41a0e3 /libavcodec/dca.c | |
parent | c95d406d323a3a322cebfa0ee5b1bfa5633cefb7 (diff) | |
download | ffmpeg-streaming-cc82662662f7575ffb717adb56c2f04a122eb20e.zip ffmpeg-streaming-cc82662662f7575ffb717adb56c2f04a122eb20e.tar.gz |
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
Diffstat (limited to 'libavcodec/dca.c')
-rw-r--r-- | libavcodec/dca.c | 22 |
1 files changed, 19 insertions, 3 deletions
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; |