Revert "audiomixer: Latency is twice the output buffer duration, not only once"
authorSebastian Dröge <sebastian@centricular.com>
Wed, 4 Mar 2015 12:16:03 +0000 (13:16 +0100)
committerSebastian Dröge <sebastian@centricular.com>
Wed, 4 Mar 2015 12:16:03 +0000 (13:16 +0100)
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

index da08842..8881d63 100644 (file)
@@ -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);