mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-26 10:10:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

tagdemux: also push cached events downstream when operating in pull mode

Browse source 
Otherwise, having 2 tagdemux in a row followed by an element operating in
pull mode will make the second tagdemux implictly eat the first tagdemux'
tag event(s).

Fixes (part of) #641047.
This commit is contained in:
Mark Nauwelaerts 2011-02-02 16:49:04 +01:00
parent 96a1a9dec6
commit b2389c2108
1 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
gst-libs/gst/tag/gsttagdemux.c
View file

@ -156,6 +156,7 @@ static GstStateChangeReturn gst_tag_demux_change_state (GstElement * element,
static gboolean gst_tag_demux_pad_query (GstPad * pad, GstQuery * query); static gboolean gst_tag_demux_pad_query (GstPad * pad, GstQuery * query);
static const GstQueryType *gst_tag_demux_get_query_types (GstPad * pad); static const GstQueryType *gst_tag_demux_get_query_types (GstPad * pad);
static gboolean gst_tag_demux_get_upstream_size (GstTagDemux * tagdemux); static gboolean gst_tag_demux_get_upstream_size (GstTagDemux * tagdemux);
static void gst_tag_demux_send_pending_events (GstTagDemux * tagdemux);
static void gst_tag_demux_send_tag_event (GstTagDemux * tagdemux); static void gst_tag_demux_send_tag_event (GstTagDemux * tagdemux);
static gboolean gst_tag_demux_send_new_segment (GstTagDemux * tagdemux); static gboolean gst_tag_demux_send_new_segment (GstTagDemux * tagdemux);
@ -668,8 +669,6 @@ gst_tag_demux_chain (GstPad * pad, GstBuffer * buf)
return GST_FLOW_UNEXPECTED; return GST_FLOW_UNEXPECTED;
} }
if (outbuf) { if (outbuf) {
GList *events;
if (G_UNLIKELY (demux->priv->srcpad == NULL)) { if (G_UNLIKELY (demux->priv->srcpad == NULL)) {
gst_buffer_unref (outbuf); gst_buffer_unref (outbuf);
return GST_FLOW_ERROR; return GST_FLOW_ERROR;
@ -685,17 +684,7 @@ gst_tag_demux_chain (GstPad * pad, GstBuffer * buf)
} }
/* send any pending events we cached */ /* send any pending events we cached */
GST_OBJECT_LOCK (demux); gst_tag_demux_send_pending_events (demux);
events = demux->priv->pending_events;
demux->priv->pending_events = NULL;
GST_OBJECT_UNLOCK (demux);
while (events != NULL) {
GST_DEBUG_OBJECT (demux->priv->srcpad, "sending cached %s event: %"
GST_PTR_FORMAT, GST_EVENT_TYPE_NAME (events->data), events->data);
gst_pad_push_event (demux->priv->srcpad, GST_EVENT (events->data));
events = g_list_delete_link (events, events);
}
/* Send our own pending tag event */ /* Send our own pending tag event */
if (demux->priv->send_tag_event) { if (demux->priv->send_tag_event) {
@ -1333,6 +1322,13 @@ gst_tag_demux_src_getrange (GstPad * srcpad,
{ {
GstTagDemux *demux = GST_TAG_DEMUX (GST_PAD_PARENT (srcpad)); GstTagDemux *demux = GST_TAG_DEMUX (GST_PAD_PARENT (srcpad));
/* downstream in pull mode won't miss a newsegment event,
* but it likely appreciates other (tag) events */
if (demux->priv->need_newseg) {
gst_tag_demux_send_pending_events (demux);
demux->priv->need_newseg = FALSE;
}
if (demux->priv->send_tag_event) { if (demux->priv->send_tag_event) {
gst_tag_demux_send_tag_event (demux); gst_tag_demux_send_tag_event (demux);
demux->priv->send_tag_event = FALSE; demux->priv->send_tag_event = FALSE;
@ -1418,6 +1414,25 @@ gst_tag_demux_get_query_types (GstPad * pad)
return types; return types;
} }
static void
gst_tag_demux_send_pending_events (GstTagDemux * demux)
{
GList *events;
/* send any pending events we cached */
GST_OBJECT_LOCK (demux);
events = demux->priv->pending_events;
demux->priv->pending_events = NULL;
GST_OBJECT_UNLOCK (demux);
while (events != NULL) {
GST_DEBUG_OBJECT (demux->priv->srcpad, "sending cached %s event: %"
GST_PTR_FORMAT, GST_EVENT_TYPE_NAME (events->data), events->data);
gst_pad_push_event (demux->priv->srcpad, GST_EVENT (events->data));
events = g_list_delete_link (events, events);
}
}
static void static void
gst_tag_demux_send_tag_event (GstTagDemux * demux) gst_tag_demux_send_tag_event (GstTagDemux * demux)
{ {