From 6697f1521a747cbdadc20c8384a3b0877af7e9eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 23 Dec 2014 09:52:20 +0100 Subject: [PATCH] aggregator: Fix docs and default value of the latency property --- libs/gst/base/gstaggregator.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/gst/base/gstaggregator.c b/libs/gst/base/gstaggregator.c index 5055d24b74..7f754964ba 100644 --- a/libs/gst/base/gstaggregator.c +++ b/libs/gst/base/gstaggregator.c @@ -1555,8 +1555,9 @@ gst_aggregator_class_init (GstAggregatorClass * klass) g_object_class_install_property (gobject_class, PROP_LATENCY, g_param_spec_int64 ("latency", "Buffer latency", - "Number of nanoseconds to wait for a buffer to arrive on a sink pad" - "before the pad is deemed unresponsive (-1 unlimited)", -1, + "Additional latency in live mode to allow upstream " + "to take longer to produce buffers for the current " + "position", 0, (G_MAXLONG == G_MAXINT64) ? G_MAXINT64 : (G_MAXLONG * GST_SECOND - 1), DEFAULT_LATENCY, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); } @@ -1599,7 +1600,7 @@ gst_aggregator_init (GstAggregator * self, GstAggregatorClass * klass) gst_element_add_pad (GST_ELEMENT (self), self->srcpad); self->clock = gst_system_clock_obtain (); - self->latency = -1; + self->latency = 0; g_mutex_init (&self->priv->setcaps_lock); g_mutex_init (&self->priv->src_lock);