mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-01 09:21:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

audioaggregator: remove buffer!=NULL check

Browse source 
Acording to the logic this cannot happen (we already check this before). So
add a assert like we do above and remove the check. This make it clearer that
we check for the offset range.
Also remove a dead assignment since we reassign this a few lines below.
This commit is contained in:
Stefan Sauer 2017-10-05 17:54:34 +02:00
parent f46d80f07d
commit 1b84283396
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1287,11 +1287,11 @@ gst_audio_aggregator_aggregate (GstAggregator * agg, gboolean timeout)
} }
} }
g_assert (pad->priv->buffer);
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) {
aagg->priv->offset + blocksize && pad->priv->buffer) { gboolean drop_buf;
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,