mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

aggregator: don't use iterator when setting flush pending on pads

Browse source
This commit is contained in:
Tim-Philipp Müller 2015-01-04 17:15:37 +00:00
parent 4da01dadcc
commit fbd4cf9810
1 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
gst-libs/gst/base/gstaggregator.c
View file

@ -1320,16 +1320,6 @@ gst_aggregator_event_forward_func (GstPad * pad, gpointer user_data)
return FALSE; return FALSE;
} }
static gboolean
gst_aggregator_set_flush_pending (GstAggregator * self, GstAggregatorPad * pad,
gpointer udata)
{
pad->priv->pending_flush_start = TRUE;
pad->priv->pending_flush_stop = FALSE;
return TRUE;
}
static EventData static EventData
gst_aggregator_forward_event_to_all_sinkpads (GstAggregator * self, gst_aggregator_forward_event_to_all_sinkpads (GstAggregator * self,
GstEvent * event, gboolean flush) GstEvent * event, gboolean flush)
@ -1344,9 +1334,18 @@ gst_aggregator_forward_event_to_all_sinkpads (GstAggregator * self,
/* We first need to set all pads as flushing in a first pass /* We first need to set all pads as flushing in a first pass
* as flush_start flush_stop is sometimes sent synchronously * as flush_start flush_stop is sometimes sent synchronously
* while we send the seek event */ * while we send the seek event */
if (flush) if (flush) {
gst_aggregator_iterate_sinkpads (self, GList *l;
gst_aggregator_set_flush_pending, NULL);
GST_OBJECT_LOCK (self);
for (l = GST_ELEMENT_CAST (self)->sinkpads; l != NULL; l = l->next) {
GstAggregatorPad *pad = l->data;
pad->priv->pending_flush_start = TRUE;
pad->priv->pending_flush_stop = FALSE;
}
GST_OBJECT_UNLOCK (self);
}
gst_pad_forward (self->srcpad, gst_aggregator_event_forward_func, &evdata); gst_pad_forward (self->srcpad, gst_aggregator_event_forward_func, &evdata);
@ -1643,7 +1642,6 @@ gst_aggregator_class_init (GstAggregatorClass * klass)
GST_DEBUG_REGISTER_FUNCPTR (gst_aggregator_stop_pad); GST_DEBUG_REGISTER_FUNCPTR (gst_aggregator_stop_pad);
GST_DEBUG_REGISTER_FUNCPTR (gst_aggregator_query_sink_latency_foreach); GST_DEBUG_REGISTER_FUNCPTR (gst_aggregator_query_sink_latency_foreach);
GST_DEBUG_REGISTER_FUNCPTR (gst_aggregator_set_flush_pending);
} }
static void static void