From: Youness Alaoui <youness.alaoui@collabora.co.uk>
Date: Wed, 9 Jan 2013 00:57:50 +0000 (-0500)
Subject: qtdemux: pass stsd data to qtdemux_audio_caps()
X-Git-Tag: 1.1.1~368
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee3d9cbd98d1c5e63251d87a061240b0b44eaa23;p=platform%2Fupstream%2Fgst-plugins-good.git

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
---

diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c
index 5332993..7943128 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),