mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

aggregator: check if pads are ready more efficiently

Browse source 
No need to use an iterator for this which creates a temporary
structure every time and also involves taking and releasing the
object lock many times in the course of iterating. Not to mention
all that GList handling in gst_aggregator_iterate_sinkpads().
This commit is contained in:
Tim-Philipp Müller 2015-01-04 16:57:05 +00:00
parent 3e38003218
commit 4da01dadcc
1 changed files with 36 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -349,17 +349,43 @@ no_iter:
return result; return result;
} }
static inline gboolean static gboolean
gst_aggregator_check_all_pads_with_data_or_eos (GstAggregator * self, gst_aggregator_check_pads_ready (GstAggregator * self)
GstAggregatorPad * aggpad, gpointer user_data)
{ {
if (aggpad->buffer || aggpad->eos) { GstAggregatorPad *pad;
return TRUE; GList *l, *sinkpads;
GST_LOG_OBJECT (self, "checking pads");
GST_OBJECT_LOCK (self);
sinkpads = GST_ELEMENT_CAST (self)->sinkpads;
if (sinkpads == NULL)
goto no_sinkpads;
for (l = sinkpads; l != NULL; l = l->next) {
pad = l->data;
if (pad->buffer == NULL && !pad->eos)
goto pad_not_ready;
} }
GST_LOG_OBJECT (aggpad, "Not ready to be aggregated"); GST_OBJECT_UNLOCK (self);
GST_LOG_OBJECT (self, "pads are ready");
return TRUE;
return FALSE; no_sinkpads:
{
GST_LOG_OBJECT (self, "pads not ready: no sink pads");
GST_OBJECT_UNLOCK (self);
return FALSE;
}
pad_not_ready:
{
GST_LOG_OBJECT (pad, "pad not ready to be aggregated yet");
GST_OBJECT_UNLOCK (self);
return FALSE;
}
} }
static void static void
@ -502,8 +528,7 @@ gst_aggregator_wait_and_check (GstAggregator * self, gboolean * timeout)
gst_aggregator_get_latency (self, &live, &latency_min, &latency_max); gst_aggregator_get_latency (self, &live, &latency_min, &latency_max);
if (gst_aggregator_iterate_sinkpads (self, if (gst_aggregator_check_pads_ready (self)) {
gst_aggregator_check_all_pads_with_data_or_eos, NULL)) {
GST_DEBUG_OBJECT (self, "all pads have data"); GST_DEBUG_OBJECT (self, "all pads have data");
SRC_STREAM_UNLOCK (self); SRC_STREAM_UNLOCK (self);
@ -580,8 +605,7 @@ gst_aggregator_wait_and_check (GstAggregator * self, gboolean * timeout)
} }
} }
res = gst_aggregator_iterate_sinkpads (self, res = gst_aggregator_check_pads_ready (self);
gst_aggregator_check_all_pads_with_data_or_eos, NULL);
SRC_STREAM_UNLOCK (self); SRC_STREAM_UNLOCK (self);
return res; return res;
@ -1617,7 +1641,6 @@ gst_aggregator_class_init (GstAggregatorClass * klass)
(G_MAXLONG == G_MAXINT64) ? G_MAXINT64 : (G_MAXLONG * GST_SECOND - 1), (G_MAXLONG == G_MAXINT64) ? G_MAXINT64 : (G_MAXLONG * GST_SECOND - 1),
DEFAULT_LATENCY, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); DEFAULT_LATENCY, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
GST_DEBUG_REGISTER_FUNCPTR (gst_aggregator_check_all_pads_with_data_or_eos);
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); GST_DEBUG_REGISTER_FUNCPTR (gst_aggregator_set_flush_pending);
@ -1737,8 +1760,7 @@ gst_aggregator_pad_chain (GstPad * pad, GstObject * object, GstBuffer * buffer)
PAD_STREAM_UNLOCK (aggpad); PAD_STREAM_UNLOCK (aggpad);
SRC_STREAM_LOCK (self); SRC_STREAM_LOCK (self);
if (gst_aggregator_iterate_sinkpads (self, if (gst_aggregator_check_pads_ready (self))
gst_aggregator_check_all_pads_with_data_or_eos, NULL))
SRC_STREAM_BROADCAST_UNLOCKED (self); SRC_STREAM_BROADCAST_UNLOCKED (self);
SRC_STREAM_UNLOCK (self); SRC_STREAM_UNLOCK (self);