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

aggregator: rename a local variable

Browse source 
The variable tracks wheter the queue is not empty, but num_buffers==0. That
means we have events or queries to process. Rename accordingly.
This commit is contained in:
Stefan Sauer 2017-10-15 16:48:21 +02:00 committed by Tim-Philipp Müller
parent 498cdd8fac
commit 45cef5726f
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -447,7 +447,7 @@ gst_aggregator_check_pads_ready (GstAggregator * self)
GstAggregatorPad *pad; GstAggregatorPad *pad;
GList *l, *sinkpads; GList *l, *sinkpads;
gboolean have_buffer = TRUE; gboolean have_buffer = TRUE;
gboolean have_event = FALSE; gboolean have_event_or_query = FALSE;
GST_LOG_OBJECT (self, "checking pads"); GST_LOG_OBJECT (self, "checking pads");
@ -464,7 +464,7 @@ gst_aggregator_check_pads_ready (GstAggregator * self)
if (pad->priv->num_buffers == 0) { if (pad->priv->num_buffers == 0) {
if (!gst_aggregator_pad_queue_is_empty (pad)) if (!gst_aggregator_pad_queue_is_empty (pad))
have_event = TRUE; have_event_or_query = TRUE;
if (!pad->priv->eos) { if (!pad->priv->eos) {
have_buffer = FALSE; have_buffer = FALSE;
@ -485,7 +485,7 @@ gst_aggregator_check_pads_ready (GstAggregator * self)
PAD_UNLOCK (pad); PAD_UNLOCK (pad);
} }
if (!have_buffer && !have_event) if (!have_buffer && !have_event_or_query)
goto pad_not_ready; goto pad_not_ready;
if (have_buffer) if (have_buffer)
@ -503,13 +503,13 @@ no_sinkpads:
} }
pad_not_ready: pad_not_ready:
{ {
if (have_event) if (have_event_or_query)
GST_LOG_OBJECT (pad, "pad not ready to be aggregated yet," GST_LOG_OBJECT (pad, "pad not ready to be aggregated yet,"
" but waking up for serialized event"); " but waking up for serialized event");
else else
GST_LOG_OBJECT (pad, "pad not ready to be aggregated yet"); GST_LOG_OBJECT (pad, "pad not ready to be aggregated yet");
GST_OBJECT_UNLOCK (self); GST_OBJECT_UNLOCK (self);
return have_event; return have_event_or_query;
} }
} }