mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-02 16:52:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

aggregator: Check for the result of caps events

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=782918
This commit is contained in:
Olivier Crête 2017-05-21 14:34:13 +02:00 committed by Tim-Philipp Müller
parent 0e973bc4fc
commit 87299b640a
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libs/gst/base/gstaggregator.c
View file

@ -221,6 +221,8 @@ struct _GstAggregatorPadPrivate
GstClockTime time_level; GstClockTime time_level;
GstSegment head_segment; /* segment before the queue */ GstSegment head_segment; /* segment before the queue */
gboolean negotiated;
gboolean eos; gboolean eos;
GMutex lock; GMutex lock;
@ -762,18 +764,29 @@ check_events (GstAggregator * self, GstAggregatorPad * pad, gpointer user_data)
} }
if (pad->priv->clipped_buffer == NULL && if (pad->priv->clipped_buffer == NULL &&
GST_IS_EVENT (g_queue_peek_tail (&pad->priv->buffers))) { GST_IS_EVENT (g_queue_peek_tail (&pad->priv->buffers))) {
event = g_queue_pop_tail (&pad->priv->buffers); event = gst_event_ref (g_queue_peek_tail (&pad->priv->buffers));
PAD_BROADCAST_EVENT (pad);
} }
PAD_UNLOCK (pad); PAD_UNLOCK (pad);
if (event) { if (event) {
gboolean ret;
if (processed_event) if (processed_event)
*processed_event = TRUE; *processed_event = TRUE;
if (klass == NULL) if (klass == NULL)
klass = GST_AGGREGATOR_GET_CLASS (self); klass = GST_AGGREGATOR_GET_CLASS (self);
GST_LOG_OBJECT (pad, "Processing %" GST_PTR_FORMAT, event); GST_LOG_OBJECT (pad, "Processing %" GST_PTR_FORMAT, event);
klass->sink_event (self, pad, event); gst_event_ref (event);
ret = klass->sink_event (self, pad, event);
PAD_LOCK (pad);
if (GST_EVENT_TYPE (event) == GST_EVENT_CAPS)
pad->priv->negotiated = ret;
if (g_queue_peek_tail (&pad->priv->buffers) == event)
gst_event_unref (g_queue_pop_tail (&pad->priv->buffers));
gst_event_unref (event);
PAD_BROADCAST_EVENT (pad);
PAD_UNLOCK (pad);
} }
} while (event != NULL); } while (event != NULL);
@ -1479,6 +1492,10 @@ gst_aggregator_stop_pad (GstAggregator * self, GstAggregatorPad * pad,
{ {
gst_aggregator_pad_flush (pad, self); gst_aggregator_pad_flush (pad, self);
PAD_LOCK (pad);
pad->priv->negotiated = FALSE;
PAD_UNLOCK (pad);
return TRUE; return TRUE;
} }
@ -2717,6 +2734,7 @@ gst_aggregator_pad_init (GstAggregatorPad * pad)
g_mutex_init (&pad->priv->lock); g_mutex_init (&pad->priv->lock);
gst_aggregator_pad_reset_unlocked (pad); gst_aggregator_pad_reset_unlocked (pad);
pad->priv->negotiated = FALSE;
} }
/* Must be called with the PAD_LOCK held */ /* Must be called with the PAD_LOCK held */