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
This commit is contained in:
Youness Alaoui 2013-01-08 19:57:50 -05:00 committed by Tim-Philipp Müller
parent 6d3ff78575
commit ee3d9cbd98

View file

@ -7192,8 +7192,8 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
GST_WARNING_OBJECT (qtdemux, "unknown version %08x", version); GST_WARNING_OBJECT (qtdemux, "unknown version %08x", version);
} }
stream->caps = qtdemux_audio_caps (qtdemux, stream, fourcc, NULL, 0, stream->caps = qtdemux_audio_caps (qtdemux, stream, fourcc,
&codec); stsd_data + 32, len - 16, &codec);
switch (fourcc) { switch (fourcc) {
case FOURCC_in24: case FOURCC_in24:
@ -9805,7 +9805,7 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, QtDemuxStream * stream,
case GST_MAKE_FOURCC ('Q', 'D', 'M', '2'): case GST_MAKE_FOURCC ('Q', 'D', 'M', '2'):
_codec ("QDesign Music v.2"); _codec ("QDesign Music v.2");
/* FIXME: QDesign music version 2 (no constant) */ /* FIXME: QDesign music version 2 (no constant) */
if (data) { if (FALSE && data) {
caps = gst_caps_new_simple ("audio/x-qdm2", caps = gst_caps_new_simple ("audio/x-qdm2",
"framesize", G_TYPE_INT, QT_UINT32 (data + 52), "framesize", G_TYPE_INT, QT_UINT32 (data + 52),
"bitrate", G_TYPE_INT, QT_UINT32 (data + 40), "bitrate", G_TYPE_INT, QT_UINT32 (data + 40),