From: Sebastian Dröge <sebastian@centricular.com>
Date: Sat, 27 Dec 2014 08:42:57 +0000 (+0100)
Subject: aggregator: Wait for the minimum latency, not the maximum
X-Git-Tag: 1.16.2~574^2~170
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4846f06b417002b7373e28032f22452bd7a72df7;p=platform%2Fupstream%2Fgstreamer.git

aggregator: Wait for the minimum latency, not the maximum

The minimum latency is the latency we have to wait at least
to guarantee that all upstreams have produced data. The maximum
latency has no meaning like that and shouldn't be used for waiting.
---

diff --git a/libs/gst/base/gstaggregator.c b/libs/gst/base/gstaggregator.c
index fbd088c0af..bb8924e159 100644
--- a/libs/gst/base/gstaggregator.c
+++ b/libs/gst/base/gstaggregator.c
@@ -539,9 +539,7 @@ _wait_and_check (GstAggregator * self, gboolean * timeout)
 
     time = base_time + start;
 
-    if (GST_CLOCK_TIME_IS_VALID (latency_max)) {
-      time += latency_max;
-    } else if (GST_CLOCK_TIME_IS_VALID (latency_min)) {
+    if (GST_CLOCK_TIME_IS_VALID (latency_min)) {
       time += latency_min;
     } else {
       time += self->latency;