mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

baseaudiosink: fix latency calculation for live elements

Browse source 
Max_latency was computed on already adjusted min_latency. Introduce a new
variable for clarity. Spotted by Blaise Gassend.
Fixes #644284
This commit is contained in:
Stefan Sauer 2011-07-20 18:10:57 +02:00
parent 68231a645a
commit 264d91a502
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst-libs/gst/audio/gstbaseaudiosink.c
View file

@ -415,7 +415,7 @@ gst_base_audio_sink_query (GstElement * element, GstQuery * query)
if ((res = if ((res =
gst_base_sink_query_latency (GST_BASE_SINK_CAST (basesink), &live, gst_base_sink_query_latency (GST_BASE_SINK_CAST (basesink), &live,
&us_live, &min_l, &max_l))) { &us_live, &min_l, &max_l))) {
GstClockTime min_latency, max_latency; GstClockTime base_latency, min_latency, max_latency;
/* we and upstream are both live, adjust the min_latency */ /* we and upstream are both live, adjust the min_latency */
if (live && us_live) { if (live && us_live) {
@ -434,16 +434,16 @@ gst_base_audio_sink_query (GstElement * element, GstQuery * query)
basesink->priv->us_latency = min_l; basesink->priv->us_latency = min_l;
min_latency = base_latency =
gst_util_uint64_scale_int (spec->seglatency * spec->segsize, gst_util_uint64_scale_int (spec->seglatency * spec->segsize,
GST_SECOND, spec->rate * spec->bytes_per_sample); GST_SECOND, spec->rate * spec->bytes_per_sample);
GST_OBJECT_UNLOCK (basesink); GST_OBJECT_UNLOCK (basesink);
/* we cannot go lower than the buffer size and the min peer latency */ /* we cannot go lower than the buffer size and the min peer latency */
min_latency = min_latency + min_l; min_latency = base_latency + min_l;
/* the max latency is the max of the peer, we can delay an infinite /* the max latency is the max of the peer, we can delay an infinite
* amount of time. */ * amount of time. */
max_latency = (max_l == -1) ? -1 : (min_latency + max_l); max_latency = (max_l == -1) ? -1 : (base_latency + max_l);
GST_DEBUG_OBJECT (basesink, GST_DEBUG_OBJECT (basesink,
"peer min %" GST_TIME_FORMAT ", our min latency: %" "peer min %" GST_TIME_FORMAT ", our min latency: %"