summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Sauer <ensonic@users.sf.net>2017-10-15 16:48:21 +0200
committerTim-Philipp Müller <tim@centricular.com>2017-12-02 15:10:27 +0000
commit45cef5726fbd6c6b54a76bc97500a8399b29876f (patch)
treef5f0d443f4e7c504596c768cc1b12644ac97599e
parent498cdd8fac7681dfeb160ab8eb3c640547cab5a1 (diff)
aggregator: rename a local variable
The variable tracks wheter the queue is not empty, but num_buffers==0. That means we have events or queries to process. Rename accordingly.
-rw-r--r--libs/gst/base/gstaggregator.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/gst/base/gstaggregator.c b/libs/gst/base/gstaggregator.c
index 88a3a1801..785775cff 100644
--- a/libs/gst/base/gstaggregator.c
+++ b/libs/gst/base/gstaggregator.c
@@ -447,7 +447,7 @@ gst_aggregator_check_pads_ready (GstAggregator * self)
GstAggregatorPad *pad;
GList *l, *sinkpads;
gboolean have_buffer = TRUE;
- gboolean have_event = FALSE;
+ gboolean have_event_or_query = FALSE;
GST_LOG_OBJECT (self, "checking pads");
@@ -464,7 +464,7 @@ gst_aggregator_check_pads_ready (GstAggregator * self)
if (pad->priv->num_buffers == 0) {
if (!gst_aggregator_pad_queue_is_empty (pad))
- have_event = TRUE;
+ have_event_or_query = TRUE;
if (!pad->priv->eos) {
have_buffer = FALSE;
@@ -485,7 +485,7 @@ gst_aggregator_check_pads_ready (GstAggregator * self)
PAD_UNLOCK (pad);
}
- if (!have_buffer && !have_event)
+ if (!have_buffer && !have_event_or_query)
goto pad_not_ready;
if (have_buffer)
@@ -503,13 +503,13 @@ no_sinkpads:
}
pad_not_ready:
{
- if (have_event)
+ if (have_event_or_query)
GST_LOG_OBJECT (pad, "pad not ready to be aggregated yet,"
" but waking up for serialized event");
else
GST_LOG_OBJECT (pad, "pad not ready to be aggregated yet");
GST_OBJECT_UNLOCK (self);
- return have_event;
+ return have_event_or_query;
}
}