From: Sebastian Dröge <sebastian@centricular.com>
Date: Thu, 19 Dec 2013 20:59:09 +0000 (+0100)
Subject: audiomixer: Also resync timestamps on the RESYNC flag
X-Git-Tag: 1.19.3~507^2~12828
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=30c93d504cf85fc192b3dce18cc639e3d0b167f3;p=platform%2Fupstream%2Fgstreamer.git

audiomixer: Also resync timestamps on the RESYNC flag
---

diff --git a/gst/audiomixer/gstaudiomixer.c b/gst/audiomixer/gstaudiomixer.c
index 28f8e51..2605cc3 100644
--- a/gst/audiomixer/gstaudiomixer.c
+++ b/gst/audiomixer/gstaudiomixer.c
@@ -1289,7 +1289,9 @@ gst_audio_mixer_fill_buffer (GstAudioMixer * audiomixer, GstCollectPads * pads,
   start_offset = gst_util_uint64_scale (start_time, rate, GST_SECOND);
   end_offset = start_offset + adata->size / bpf;
 
-  if (GST_BUFFER_IS_DISCONT (inbuf) || adata->next_offset == -1) {
+  if (GST_BUFFER_IS_DISCONT (inbuf)
+      || GST_BUFFER_FLAG_IS_SET (inbuf, GST_BUFFER_FLAG_RESYNC)
+      || adata->next_offset == -1) {
     discont = TRUE;
   } else {
     guint64 diff, max_sample_diff;