summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2012-01-10 11:04:56 +0100
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2012-01-10 11:06:53 +0100
commit3d43013d4ffbcaf48fc3db9b6cc31544d69470ef (patch)
tree977aa35dc1ed7c41592b1e6476785913ff11685c
parenta0be7eef020fb724387ecd03701cc87c1aa671f7 (diff)
ffdec: Give the (E)AC3/DTS decoders a rank of marginal
Even if they don't downmix to stereo, they're still working correctly. The only advantage of dtsdec/a52dec is that they downmix to stereo (using the special downmixing matrices) if downstream prefers stereo but in every other case they should be equivalent.
-rw-r--r--ext/ffmpeg/gstffmpegdec.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index a0f609a..db02a69 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -1832,7 +1832,7 @@ gst_ffmpegdec_video_frame (GstFFMpegDec * ffmpegdec,
GstStructure *s = gst_caps_get_structure (GST_BUFFER_CAPS (buffer), 0);
gboolean interlaced;
gboolean found = gst_structure_get_boolean (s, "interlaced", &interlaced);
- if (!found || (!!interlaced != !!ffmpegdec->format.video.interlaced)) {
+ if (!found || (! !interlaced != ! !ffmpegdec->format.video.interlaced)) {
GST_DEBUG_OBJECT (ffmpegdec,
"Buffer interlacing does not match pad, updating");
buffer = gst_buffer_make_metadata_writable (buffer);
@@ -3056,14 +3056,6 @@ gst_ffmpegdec_register (GstPlugin * plugin)
case CODEC_ID_MP3:
rank = GST_RANK_NONE;
break;
- /* TEMPORARILY DISABLING AC3/EAC3/DTS for 0.10.12 release
- * due to downmixing failure.
- * See Bug #608892 for more details */
- case CODEC_ID_EAC3:
- case CODEC_ID_AC3:
- case CODEC_ID_DTS:
- rank = GST_RANK_NONE;
- break;
default:
rank = GST_RANK_MARGINAL;
break;