mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 23:36:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtdemux: Parse uuid atoms in push mode

Browse source 
Parses uuid atoms in push mode when they are found, they might
contain xmp tags.

Also does a minor refactoring to put the global tags posting
into a single function instead of repeating it in 3 different
places.

Fixes #629839
This commit is contained in:
Thiago Santos 2010-09-20 23:17:35 -03:00
parent 9227352e31
commit 52f5e95aee
1 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
gst/qtdemux/qtdemux.c
View file

@ -1718,6 +1718,18 @@ gst_qtdemux_change_state (GstElement * element, GstStateChange transition)
return result; return result;
} }
static void
qtdemux_post_global_tags (GstQTDemux * qtdemux)
{
/* all header tags ready and parsed, push them */
GST_INFO_OBJECT (qtdemux, "posting global tags: %" GST_PTR_FORMAT,
qtdemux->tag_list);
/* post now, send event on pads later */
gst_element_post_message (GST_ELEMENT (qtdemux),
gst_message_new_tag (GST_OBJECT (qtdemux),
gst_tag_list_copy (qtdemux->tag_list)));
}
static void static void
qtdemux_parse_ftyp (GstQTDemux * qtdemux, const guint8 * buffer, gint length) qtdemux_parse_ftyp (GstQTDemux * qtdemux, const guint8 * buffer, gint length)
{ {
@ -1962,13 +1974,8 @@ gst_qtdemux_loop_state_header (GstQTDemux * qtdemux)
beach: beach:
if (ret == GST_FLOW_UNEXPECTED && qtdemux->got_moov) { if (ret == GST_FLOW_UNEXPECTED && qtdemux->got_moov) {
/* all header tags ready and parsed, push them */ /* Only post, event on pads is done after newsegment */
GST_INFO_OBJECT (qtdemux, "posting global tags: %" GST_PTR_FORMAT, qtdemux_post_global_tags (qtdemux);
qtdemux->tag_list);
/* post now, send event on pads later */
gst_element_post_message (GST_ELEMENT (qtdemux),
gst_message_new_tag (GST_OBJECT (qtdemux),
gst_tag_list_copy (qtdemux->tag_list)));
qtdemux->state = QTDEMUX_STATE_MOVIE; qtdemux->state = QTDEMUX_STATE_MOVIE;
GST_DEBUG_OBJECT (qtdemux, "switching state to STATE_MOVIE (%d)", GST_DEBUG_OBJECT (qtdemux, "switching state to STATE_MOVIE (%d)",
@ -3198,6 +3205,10 @@ gst_qtdemux_chain (GstPad * sinkpad, GstBuffer * inbuf)
/* we have the headers, start playback */ /* we have the headers, start playback */
demux->state = QTDEMUX_STATE_MOVIE; demux->state = QTDEMUX_STATE_MOVIE;
demux->neededbytes = next_entry_size (demux); demux->neededbytes = next_entry_size (demux);
/* Only post, event on pads is done after newsegment */
qtdemux_post_global_tags (demux);
} else { } else {
/* no headers yet, try to get them */ /* no headers yet, try to get them */
guint bs; guint bs;
@ -3284,6 +3295,9 @@ gst_qtdemux_chain (GstPad * sinkpad, GstBuffer * inbuf)
} else if (fourcc == FOURCC_ftyp) { } else if (fourcc == FOURCC_ftyp) {
GST_DEBUG_OBJECT (demux, "Parsing [ftyp]"); GST_DEBUG_OBJECT (demux, "Parsing [ftyp]");
qtdemux_parse_ftyp (demux, data, demux->neededbytes); qtdemux_parse_ftyp (demux, data, demux->neededbytes);
} else if (fourcc == FOURCC_uuid) {
GST_DEBUG_OBJECT (demux, "Parsing [uuid]");
qtdemux_parse_uuid (demux, data, demux->neededbytes);
} else { } else {
GST_WARNING_OBJECT (demux, GST_WARNING_OBJECT (demux,
"Unknown fourcc while parsing header : %" GST_FOURCC_FORMAT, "Unknown fourcc while parsing header : %" GST_FOURCC_FORMAT,
@ -3310,12 +3324,8 @@ gst_qtdemux_chain (GstPad * sinkpad, GstBuffer * inbuf)
demux->neededbytes = next_entry_size (demux); demux->neededbytes = next_entry_size (demux);
demux->state = QTDEMUX_STATE_MOVIE; demux->state = QTDEMUX_STATE_MOVIE;
GST_INFO_OBJECT (demux, "posting global tags: %" GST_PTR_FORMAT, /* Only post, event on pads is done after newsegment */
demux->tag_list); qtdemux_post_global_tags (demux);
/* post now, send event on pads later */
gst_element_post_message (GST_ELEMENT (demux),
gst_message_new_tag (GST_OBJECT (demux),
gst_tag_list_copy (demux->tag_list)));
} else { } else {
GST_DEBUG_OBJECT (demux, "Carrying on normally"); GST_DEBUG_OBJECT (demux, "Carrying on normally");