From 6382c57f0e4287ad8875897bce394c718259f7a3 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Thu, 18 Dec 2003 09:31:50 +0000 Subject: Sorry Dave... Add mpegversion=1 to mp3 caps everywhere so that the autoplugger uses mad and not faad for mp3 decoding... Original commit message from CVS: Sorry Dave... Add mpegversion=1 to mp3 caps everywhere so that the autoplugger uses mad and not faad for mp3 decoding. This should fix mp3 playback. --- gst/mpeg1sys/gstmpeg1systemencode.c | 4 +++- gst/qtdemux/qtdemux.c | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'gst') diff --git a/gst/mpeg1sys/gstmpeg1systemencode.c b/gst/mpeg1sys/gstmpeg1systemencode.c index 62a7d4b1..dfac9493 100644 --- a/gst/mpeg1sys/gstmpeg1systemencode.c +++ b/gst/mpeg1sys/gstmpeg1systemencode.c @@ -79,7 +79,9 @@ GST_PAD_TEMPLATE_FACTORY (audio_sink_factory, GST_CAPS_NEW ( "sink_audio", "audio/mpeg", - NULL /* well, "don't care" */ + "mpegversion", GST_PROPS_INT (1), + "layer", GST_PROPS_INT_RANGE (1, 2) + /* "don't care" about samplerate/channels */ ) ) diff --git a/gst/qtdemux/qtdemux.c b/gst/qtdemux/qtdemux.c index 5bd0898a..623f69b2 100644 --- a/gst/qtdemux/qtdemux.c +++ b/gst/qtdemux/qtdemux.c @@ -26,6 +26,8 @@ #include #include +#define g_print(x...) + #define QTDEMUX_GUINT32_GET(a) GUINT32_FROM_BE(*(guint32 *)(a)) #define QTDEMUX_GUINT16_GET(a) GUINT16_FROM_BE(*(guint16 *)(a)) #define QTDEMUX_GUINT8_GET(a) (*(guint8 *)(a)) @@ -1711,6 +1713,7 @@ static GstCaps *qtdemux_audio_caps(GstQTDemux *qtdemux, guint32 fourcc) case GST_MAKE_FOURCC('.','m','p','3'): /* MPEG layer 3, CBR & VBR (QT4.1 and later) */ return GST_CAPS_NEW("_mp3_caps","audio/mpeg", + "mpegversion", GST_PROPS_INT(1), "layer", GST_PROPS_INT(3), "rate",GST_PROPS_INT_RANGE(1,G_MAXINT), "channels",GST_PROPS_INT_RANGE(1,G_MAXINT), -- cgit v1.2.1