mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-08 07:35:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

audioaggregator: reduce variable scope

Browse source 
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.
This commit is contained in:
Stefan Sauer 2017-10-02 16:57:21 +02:00
parent 81bbdd9fcd
commit 2f62217981
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst-libs/gst/audio/gstaudioaggregator.c
View file

@ -1212,7 +1212,6 @@ gst_audio_aggregator_aggregate (GstAggregator * agg, gboolean timeout)
GstBuffer *inbuf; GstBuffer *inbuf;
GstAudioAggregatorPad *pad = (GstAudioAggregatorPad *) iter->data; GstAudioAggregatorPad *pad = (GstAudioAggregatorPad *) iter->data;
GstAggregatorPad *aggpad = (GstAggregatorPad *) iter->data; GstAggregatorPad *aggpad = (GstAggregatorPad *) iter->data;
gboolean drop_buf = FALSE;
gboolean pad_eos = gst_aggregator_pad_is_eos (aggpad); gboolean pad_eos = gst_aggregator_pad_is_eos (aggpad);
if (!pad_eos) if (!pad_eos)
@ -1289,6 +1288,8 @@ gst_audio_aggregator_aggregate (GstAggregator * agg, gboolean timeout)
if (pad->priv->output_offset >= aagg->priv->offset if (pad->priv->output_offset >= aagg->priv->offset
&& pad->priv->output_offset < && pad->priv->output_offset <
aagg->priv->offset + blocksize && pad->priv->buffer) { aagg->priv->offset + blocksize && pad->priv->buffer) {
gboolean drop_buf = FALSE;
GST_LOG_OBJECT (aggpad, "Mixing buffer for current offset"); GST_LOG_OBJECT (aggpad, "Mixing buffer for current offset");
drop_buf = !gst_audio_aggregator_mix_buffer (aagg, pad, pad->priv->buffer, drop_buf = !gst_audio_aggregator_mix_buffer (aagg, pad, pad->priv->buffer,
outbuf); outbuf);
@ -1299,12 +1300,14 @@ gst_audio_aggregator_aggregate (GstAggregator * agg, gboolean timeout)
} else { } else {
is_done = FALSE; is_done = FALSE;
} }
if (drop_buf) {
GST_OBJECT_UNLOCK (pad);
gst_aggregator_pad_drop_buffer (aggpad);
continue;
}
} }
GST_OBJECT_UNLOCK (pad); GST_OBJECT_UNLOCK (pad);
if (drop_buf)
gst_aggregator_pad_drop_buffer (aggpad);
} }
GST_OBJECT_UNLOCK (agg); GST_OBJECT_UNLOCK (agg);