From ee3d9cbd98d1c5e63251d87a061240b0b44eaa23 Mon Sep 17 00:00:00 2001 From: Youness Alaoui Date: Tue, 8 Jan 2013 19:57:50 -0500 Subject: [PATCH] qtdemux: pass stsd data to qtdemux_audio_caps() We will need that later for LPCM format support. Disable QDM2 parsing of stsd data which dead code before as well because data was always NULL. https://bugzilla.gnome.org/show_bug.cgi?id=663458 --- gst/isomp4/qtdemux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c index 5332993d04..7943128a16 100644 --- a/gst/isomp4/qtdemux.c +++ b/gst/isomp4/qtdemux.c @@ -7192,8 +7192,8 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak) GST_WARNING_OBJECT (qtdemux, "unknown version %08x", version); } - stream->caps = qtdemux_audio_caps (qtdemux, stream, fourcc, NULL, 0, - &codec); + stream->caps = qtdemux_audio_caps (qtdemux, stream, fourcc, + stsd_data + 32, len - 16, &codec); switch (fourcc) { case FOURCC_in24: @@ -9805,7 +9805,7 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, QtDemuxStream * stream, case GST_MAKE_FOURCC ('Q', 'D', 'M', '2'): _codec ("QDesign Music v.2"); /* FIXME: QDesign music version 2 (no constant) */ - if (data) { + if (FALSE && data) { caps = gst_caps_new_simple ("audio/x-qdm2", "framesize", G_TYPE_INT, QT_UINT32 (data + 52), "bitrate", G_TYPE_INT, QT_UINT32 (data + 40),