mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 16:50:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "audiomixer: Latency is twice the output buffer duration, not only once"

Browse source 
This reverts commit d387cf67df.

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.
This commit is contained in:
Sebastian Dröge 2015-03-04 13:16:03 +01:00
parent fc917fb8cf
commit 38cf87aaea
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
gst/audiomixer/gstaudiomixer.c
View file

@ -826,8 +826,7 @@ gst_audiomixer_init (GstAudioMixer * audiomixer)
audiomixer->discont_wait = DEFAULT_DISCONT_WAIT; audiomixer->discont_wait = DEFAULT_DISCONT_WAIT;
audiomixer->output_buffer_duration = DEFAULT_OUTPUT_BUFFER_DURATION; audiomixer->output_buffer_duration = DEFAULT_OUTPUT_BUFFER_DURATION;
gst_aggregator_set_latency (GST_AGGREGATOR (audiomixer), gst_aggregator_set_latency (GST_AGGREGATOR (audiomixer),
2 * audiomixer->output_buffer_duration, audiomixer->output_buffer_duration, audiomixer->output_buffer_duration);
2 * audiomixer->output_buffer_duration);
} }
static void static void
@ -878,8 +877,8 @@ gst_audiomixer_set_property (GObject * object, guint prop_id,
case PROP_OUTPUT_BUFFER_DURATION: case PROP_OUTPUT_BUFFER_DURATION:
audiomixer->output_buffer_duration = g_value_get_uint64 (value); audiomixer->output_buffer_duration = g_value_get_uint64 (value);
gst_aggregator_set_latency (GST_AGGREGATOR (audiomixer), gst_aggregator_set_latency (GST_AGGREGATOR (audiomixer),
2 * audiomixer->output_buffer_duration, audiomixer->output_buffer_duration,
2 * audiomixer->output_buffer_duration); audiomixer->output_buffer_duration);
break; break;
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);