mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 20:51:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

audiomixer: Remove some useless assignments and skip the current part of the buffer if the pad is muted

Browse source
This commit is contained in:
Sebastian Dröge 2014-01-16 12:18:45 +01:00
parent c29e04674a
commit ee15c8fd1f
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gst/audiomixer/gstaudiomixer.c
View file

@ -1435,12 +1435,10 @@ gst_audio_mixer_mix_buffer (GstAudioMixer * audiomixer, GstCollectPads * pads,
if (pad->mute || pad->volume < G_MINDOUBLE) { if (pad->mute || pad->volume < G_MINDOUBLE) {
GST_DEBUG_OBJECT (pad, "Skipping muted pad"); GST_DEBUG_OBJECT (pad, "Skipping muted pad");
gst_buffer_unref (inbuf); gst_buffer_unref (inbuf);
adata->position += adata->size; adata->position += overlap * bpf;
adata->output_offset += adata->size / bpf; adata->output_offset += overlap;
if (adata->position >= adata->size) { if (adata->position >= adata->size) {
/* Buffer done, drop it */ /* Buffer done, drop it */
adata->position = 0;
adata->size = 0;
gst_buffer_replace (&adata->buffer, NULL); gst_buffer_replace (&adata->buffer, NULL);
gst_buffer_unref (gst_collect_pads_pop (pads, collect_data)); gst_buffer_unref (gst_collect_pads_pop (pads, collect_data));
} }
@ -1452,7 +1450,6 @@ gst_audio_mixer_mix_buffer (GstAudioMixer * audiomixer, GstCollectPads * pads,
/* skip gap buffer */ /* skip gap buffer */
GST_LOG_OBJECT (pad, "skipping GAP buffer"); GST_LOG_OBJECT (pad, "skipping GAP buffer");
gst_buffer_unref (inbuf); gst_buffer_unref (inbuf);
adata->position += adata->size;
adata->output_offset += adata->size / bpf; adata->output_offset += adata->size / bpf;
/* Buffer done, drop it */ /* Buffer done, drop it */
gst_buffer_replace (&adata->buffer, NULL); gst_buffer_replace (&adata->buffer, NULL);