summaryrefslogtreecommitdiff
path: root/gst/audiomixer
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2015-02-11 14:16:21 +0100
committerSebastian Dröge <sebastian@centricular.com>2015-02-11 14:16:21 +0100
commit037928dcf675b1c6b360258878ae0e060621c03e (patch)
tree1c1aa293633c6ef940b2cddd6ddb180fb848f120 /gst/audiomixer
parent629b3508061afe3bc89e09a4b89e3a24d5c38a49 (diff)
downloadgstreamer-plugins-bad-037928dcf675b1c6b360258878ae0e060621c03e.tar.gz
Improve and fix LATENCY query handling
This now follows the design docs everywhere, especially the maximum latency handling. https://bugzilla.gnome.org/show_bug.cgi?id=744106
Diffstat (limited to 'gst/audiomixer')
-rw-r--r--gst/audiomixer/gstaudiomixer.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/gst/audiomixer/gstaudiomixer.c b/gst/audiomixer/gstaudiomixer.c
index e512863c7..a58ef74f9 100644
--- a/gst/audiomixer/gstaudiomixer.c
+++ b/gst/audiomixer/gstaudiomixer.c
@@ -826,7 +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),
- audiomixer->output_buffer_duration, GST_CLOCK_TIME_NONE);
+ audiomixer->output_buffer_duration, audiomixer->output_buffer_duration);
}
static void
@@ -877,7 +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),
- audiomixer->output_buffer_duration, GST_CLOCK_TIME_NONE);
+ audiomixer->output_buffer_duration,
+ audiomixer->output_buffer_duration);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);