mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-08 21:28:45 +00:00
gst/qtdemux/qtdemux.c: Never treat video streams as an audio stream.
Original commit message from CVS: Patch by: j^ <j at bootlab dot org> * gst/qtdemux/qtdemux.c: (qtdemux_parse_trak), (qtdemux_video_caps): Never treat video streams as an audio stream. Add qtdrw mime type. Fixes #339041
This commit is contained in:
parent
ed58a212ff
commit
95175ab920
1 changed files with 7 additions and 2 deletions
|
@ -3013,10 +3013,10 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
|
||||||
|
|
||||||
GST_LOG ("track type: %" GST_FOURCC_FORMAT,
|
GST_LOG ("track type: %" GST_FOURCC_FORMAT,
|
||||||
GST_FOURCC_ARGS (QTDEMUX_FOURCC_GET (hdlr->data + 12)));
|
GST_FOURCC_ARGS (QTDEMUX_FOURCC_GET (hdlr->data + 12)));
|
||||||
GST_LOG ("track subtype: %" GST_FOURCC_FORMAT,
|
|
||||||
GST_FOURCC_ARGS (QTDEMUX_FOURCC_GET (hdlr->data + 16)));
|
|
||||||
|
|
||||||
stream->subtype = QTDEMUX_FOURCC_GET (hdlr->data + 16);
|
stream->subtype = QTDEMUX_FOURCC_GET (hdlr->data + 16);
|
||||||
|
GST_LOG ("track subtype: %" GST_FOURCC_FORMAT,
|
||||||
|
GST_FOURCC_ARGS (stream->subtype));
|
||||||
|
|
||||||
minf = qtdemux_tree_get_child_by_type (mdia, FOURCC_minf);
|
minf = qtdemux_tree_get_child_by_type (mdia, FOURCC_minf);
|
||||||
g_assert (minf);
|
g_assert (minf);
|
||||||
|
@ -3030,6 +3030,8 @@ qtdemux_parse_trak (GstQTDemux * qtdemux, GNode * trak)
|
||||||
if (stream->subtype == FOURCC_vide) {
|
if (stream->subtype == FOURCC_vide) {
|
||||||
guint32 fourcc;
|
guint32 fourcc;
|
||||||
|
|
||||||
|
stream->sampled = TRUE;
|
||||||
|
|
||||||
offset = 16;
|
offset = 16;
|
||||||
GST_LOG ("st type: %" GST_FOURCC_FORMAT,
|
GST_LOG ("st type: %" GST_FOURCC_FORMAT,
|
||||||
GST_FOURCC_ARGS (QTDEMUX_FOURCC_GET (stsd->data + offset + 4)));
|
GST_FOURCC_ARGS (QTDEMUX_FOURCC_GET (stsd->data + offset + 4)));
|
||||||
|
@ -3929,6 +3931,9 @@ qtdemux_video_caps (GstQTDemux * qtdemux, guint32 fourcc,
|
||||||
case GST_MAKE_FOURCC ('c', 'v', 'i', 'd'):
|
case GST_MAKE_FOURCC ('c', 'v', 'i', 'd'):
|
||||||
_codec ("Cinepak");
|
_codec ("Cinepak");
|
||||||
return gst_caps_from_string ("video/x-cinepak");
|
return gst_caps_from_string ("video/x-cinepak");
|
||||||
|
case GST_MAKE_FOURCC ('q', 'd', 'r', 'w'):
|
||||||
|
_codec ("Apple QuickDraw");
|
||||||
|
return gst_caps_from_string ("video/x-qdrw");
|
||||||
case GST_MAKE_FOURCC ('r', 'p', 'z', 'a'):
|
case GST_MAKE_FOURCC ('r', 'p', 'z', 'a'):
|
||||||
_codec ("Apple video");
|
_codec ("Apple video");
|
||||||
return gst_caps_from_string ("video/x-apple-video");
|
return gst_caps_from_string ("video/x-apple-video");
|
||||||
|
|
Loading…
Reference in a new issue