From: Sebastian Dröge <sebastian@centricular.com>
Date: Thu, 16 Jan 2014 11:18:45 +0000 (+0100)
Subject: audiomixer: Remove some useless assignments and skip the current part of the buffer... 
X-Git-Tag: 1.19.3~507^2~12753
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dfd23a3182e68c268c5ab3f040a772c9e1ffadb8;p=platform%2Fupstream%2Fgstreamer.git

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

diff --git a/gst/audiomixer/gstaudiomixer.c b/gst/audiomixer/gstaudiomixer.c
index 5929851..f604ce7 100644
--- a/gst/audiomixer/gstaudiomixer.c
+++ b/gst/audiomixer/gstaudiomixer.c
@@ -1435,12 +1435,10 @@ gst_audio_mixer_mix_buffer (GstAudioMixer * audiomixer, GstCollectPads * pads,
   if (pad->mute || pad->volume < G_MINDOUBLE) {
     GST_DEBUG_OBJECT (pad, "Skipping muted pad");
     gst_buffer_unref (inbuf);
-    adata->position += adata->size;
-    adata->output_offset += adata->size / bpf;
+    adata->position += overlap * bpf;
+    adata->output_offset += overlap;
     if (adata->position >= adata->size) {
       /* Buffer done, drop it */
-      adata->position = 0;
-      adata->size = 0;
       gst_buffer_replace (&adata->buffer, NULL);
       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 */
     GST_LOG_OBJECT (pad, "skipping GAP buffer");
     gst_buffer_unref (inbuf);
-    adata->position += adata->size;
     adata->output_offset += adata->size / bpf;
     /* Buffer done, drop it */
     gst_buffer_replace (&adata->buffer, NULL);