From 2f622179816f242d3a2a768073008a5fc17ba41b Mon Sep 17 00:00:00 2001 From: Stefan Sauer Date: Mon, 2 Oct 2017 16:57:21 +0200 Subject: [PATCH] audioaggregator: reduce variable scope This is a non-functional change that makes the code more alike to the previous check. I should be more obvious when we drop a buffer. --- gst-libs/gst/audio/gstaudioaggregator.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gst-libs/gst/audio/gstaudioaggregator.c b/gst-libs/gst/audio/gstaudioaggregator.c index b499d0ec1d..7d91f48368 100644 --- a/gst-libs/gst/audio/gstaudioaggregator.c +++ b/gst-libs/gst/audio/gstaudioaggregator.c @@ -1212,7 +1212,6 @@ gst_audio_aggregator_aggregate (GstAggregator * agg, gboolean timeout) GstBuffer *inbuf; GstAudioAggregatorPad *pad = (GstAudioAggregatorPad *) iter->data; GstAggregatorPad *aggpad = (GstAggregatorPad *) iter->data; - gboolean drop_buf = FALSE; gboolean pad_eos = gst_aggregator_pad_is_eos (aggpad); if (!pad_eos) @@ -1289,6 +1288,8 @@ gst_audio_aggregator_aggregate (GstAggregator * agg, gboolean timeout) if (pad->priv->output_offset >= aagg->priv->offset && pad->priv->output_offset < aagg->priv->offset + blocksize && pad->priv->buffer) { + gboolean drop_buf = FALSE; + GST_LOG_OBJECT (aggpad, "Mixing buffer for current offset"); drop_buf = !gst_audio_aggregator_mix_buffer (aagg, pad, pad->priv->buffer, outbuf); @@ -1299,12 +1300,14 @@ gst_audio_aggregator_aggregate (GstAggregator * agg, gboolean timeout) } else { is_done = FALSE; } + if (drop_buf) { + GST_OBJECT_UNLOCK (pad); + gst_aggregator_pad_drop_buffer (aggpad); + continue; + } } GST_OBJECT_UNLOCK (pad); - if (drop_buf) - gst_aggregator_pad_drop_buffer (aggpad); - } GST_OBJECT_UNLOCK (agg);