ffmpeg: Channel layouts are now set for DTS and (E)AC3 by libav

This commit is contained in:
Sebastian Dröge 2012-01-10 10:08:05 +01:00
parent 42bc8f5ad7
commit 09efbe103f

View file

@ -328,26 +328,6 @@ gst_ff_aud_caps_new (AVCodecContext * context, enum CodecID codec_id,
gst_audio_info_init (&info);
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);