diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-10 10:08:05 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-01-10 11:30:00 +0100 |
| commit | b9ff7da938cbe4759bca08621c4c5ffc7599383b (patch) | |
| tree | b8c28530c41cf63e23a4e38e202f87670fb6c227 | |
| parent | c7168efb6575dc5468b29360ceb17996e539575b (diff) | |
ffmpeg: Channel layouts are now set for DTS and (E)AC3 by libav
| -rw-r--r-- | ext/ffmpeg/gstffmpegcodecmap.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c index f3381dd..2b06b2b 100644 --- a/ext/ffmpeg/gstffmpegcodecmap.c +++ b/ext/ffmpeg/gstffmpegcodecmap.c @@ -340,25 +340,6 @@ gst_ff_aud_caps_new (AVCodecContext * context, enum CodecID codec_id, GstAudioChannelPosition *pos; guint64 channel_layout = context->channel_layout; - if (channel_layout == 0) { - const guint64 default_channel_set[] = { - 0, 0, CH_LAYOUT_SURROUND, CH_LAYOUT_QUAD, CH_LAYOUT_5POINT0, - CH_LAYOUT_5POINT1, 0, CH_LAYOUT_7POINT1 - }; - - switch (codec_id) { - case CODEC_ID_EAC3: - case CODEC_ID_AC3: - case CODEC_ID_DTS: - if (context->channels > 0 - && context->channels < G_N_ELEMENTS (default_channel_set)) - channel_layout = default_channel_set[context->channels - 1]; - break; - default: - break; - } - } - caps = gst_caps_new_simple (mimetype, "rate", G_TYPE_INT, context->sample_rate, "channels", G_TYPE_INT, context->channels, NULL); |