From: <rb...@fr...> - 2005-04-21 12:18:24
|
CVS Root: /cvs/gstreamer Module: gst-plugins Changes by: rbultje Date: Thu Apr 21 2005 22:18:20 EST Branch: BRANCH-GSTREAMER-0_8 Log message: * gst/qtdemux/qtdemux.c: (qtdemux_parse_trak): Set correct extradata for QDM2. Modified files: . : ChangeLog gst/qtdemux : qtdemux.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ChangeLog.diff?r1=1.1641.2.123&r2=1.1641.2.124 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst/qtdemux/qtdemux.c.diff?r1=1.80.2.7&r2=1.80.2.8 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins/ChangeLog,v retrieving revision 1.1641.2.123 retrieving revision 1.1641.2.124 diff -u -d -r1.1641.2.123 -r1.1641.2.124 --- ChangeLog 21 Apr 2005 11:10:52 -0000 1.1641.2.123 +++ ChangeLog 21 Apr 2005 12:18:07 -0000 1.1641.2.124 @@ -1,3 +1,8 @@ +2005-04-21 Ronald S. Bultje <rb...@ro...> + + * gst/qtdemux/qtdemux.c: (qtdemux_parse_trak): + Set correct extradata for QDM2. 2005-04-21 Tim-Philipp Müller <tim at centricular dot net> * gst/speed/gstspeed.c: (speed_change_state): Index: qtdemux.c RCS file: /cvs/gstreamer/gst-plugins/gst/qtdemux/qtdemux.c,v retrieving revision 1.80.2.7 retrieving revision 1.80.2.8 diff -u -d -r1.80.2.7 -r1.80.2.8 --- qtdemux.c 18 Apr 2005 13:04:59 -0000 1.80.2.7 +++ qtdemux.c 21 Apr 2005 12:18:08 -0000 1.80.2.8 @@ -2230,6 +2230,21 @@ gst_caps_set_simple (stream->caps, "codec_data", GST_TYPE_BUFFER, buffer, NULL); #endif + } else { + if (QTDEMUX_FOURCC_GET (stsd->data + 16 + 4) == GST_MAKE_FOURCC ('Q', 'D', + 'M', '2')) { + gint len = QTDEMUX_GUINT32_GET (stsd->data); + if (len > 0x4C) { + GstBuffer *buf = gst_buffer_new_and_alloc (len - 0x4C); + memcpy (GST_BUFFER_DATA (buf), + (guint8 *) stsd->data + 0x4C, len - 0x4C); + gst_caps_set_simple (stream->caps, + "codec_data", GST_TYPE_BUFFER, buf, NULL); + gst_buffer_unref (buf); + } + } } GST_INFO ("type " GST_FOURCC_FORMAT " caps %" GST_PTR_FORMAT, GST_FOURCC_ARGS (QTDEMUX_FOURCC_GET (stsd->data + 16 + 4)), |