From: Olivier Crête <olivier.crete@collabora.com>
Date: Thu, 13 Jul 2017 23:09:43 +0000 (-0400)
Subject: audioaggregator: Accept buffer with no data, but duration and gap flag
X-Git-Tag: 1.19.3~511^2~1882^2~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c2b462837b235c798e34bcd643642ed11c12dd41;p=platform%2Fupstream%2Fgstreamer.git

audioaggregator: Accept buffer with no data, but duration and gap flag

These are produced from GAP events by the base class.

https://bugzilla.gnome.org/show_bug.cgi?id=784846
---

diff --git a/gst-libs/gst/audio/gstaudioaggregator.c b/gst-libs/gst/audio/gstaudioaggregator.c
index 24b71b7..8e0d485 100644
--- a/gst-libs/gst/audio/gstaudioaggregator.c
+++ b/gst-libs/gst/audio/gstaudioaggregator.c
@@ -791,6 +791,18 @@ gst_audio_aggregator_queue_new_buffer (GstAudioAggregator * aagg,
   pad->priv->position = 0;
   pad->priv->size = gst_buffer_get_size (inbuf) / bpf;
 
+  if (pad->priv->size == 0) {
+    if (!GST_BUFFER_DURATION_IS_VALID (inbuf) ||
+        !GST_BUFFER_FLAG_IS_SET (inbuf, GST_BUFFER_FLAG_GAP)) {
+      GST_WARNING_OBJECT (pad, "Dropping 0-sized buffer missing either a"
+          " duration or a GAP flag: %" GST_PTR_FORMAT, inbuf);
+      return FALSE;
+    }
+
+    pad->priv->size = gst_util_uint64_scale (GST_BUFFER_DURATION (inbuf), rate,
+        GST_SECOND);
+  }
+
   if (!GST_BUFFER_PTS_IS_VALID (inbuf)) {
     if (pad->priv->output_offset == -1)
       pad->priv->output_offset = aagg->priv->offset;