From 38cf87aaea3f88a6a204a62bb1309c706a1db6d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 4 Mar 2015 13:16:03 +0100 Subject: [PATCH] Revert "audiomixer: Latency is twice the output buffer duration, not only once" This reverts commit d387cf67df91b59540f32ee17b4c02f747969add. The analysis was wrong: The first 20ms of latency are introduced by the source already and put into the latency query, making it only necessary to cover the additional 20ms of audiomixer inside audiomixer. --- gst/audiomixer/gstaudiomixer.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/gst/audiomixer/gstaudiomixer.c b/gst/audiomixer/gstaudiomixer.c index da0884238d..8881d63ebb 100644 --- a/gst/audiomixer/gstaudiomixer.c +++ b/gst/audiomixer/gstaudiomixer.c @@ -826,8 +826,7 @@ gst_audiomixer_init (GstAudioMixer * audiomixer) audiomixer->discont_wait = DEFAULT_DISCONT_WAIT; audiomixer->output_buffer_duration = DEFAULT_OUTPUT_BUFFER_DURATION; gst_aggregator_set_latency (GST_AGGREGATOR (audiomixer), - 2 * audiomixer->output_buffer_duration, - 2 * audiomixer->output_buffer_duration); + audiomixer->output_buffer_duration, audiomixer->output_buffer_duration); } static void @@ -878,8 +877,8 @@ gst_audiomixer_set_property (GObject * object, guint prop_id, case PROP_OUTPUT_BUFFER_DURATION: audiomixer->output_buffer_duration = g_value_get_uint64 (value); gst_aggregator_set_latency (GST_AGGREGATOR (audiomixer), - 2 * audiomixer->output_buffer_duration, - 2 * audiomixer->output_buffer_duration); + audiomixer->output_buffer_duration, + audiomixer->output_buffer_duration); break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);