mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-05 13:29:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

combine-sink: Improve initial latency reports

Browse source 
Currently, it takes one adjust time before the smoother is updated after an
unsuspend. Before the first update, the smoother will not be aware of the
slave sink latencies, leading to incorrect latency reports.

This patch moves the first smoother update to one latency time after the
sink was unsuspended, thereby improving initial latency reports. This
only partially resolves the problem because the smoother takes multiple
updates to adapt to the slave sink latencies.

Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/53>
This commit is contained in:
Georg Chini 2019-03-26 10:31:24 +01:00 • committed by PulseAudio Marge Bot
parent 54baa223bb
commit 9d1a43ae8d
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/module-combine-sink.c
View file

@ -789,9 +789,6 @@ static void unsuspend(struct userdata *u) {
PA_IDXSET_FOREACH(o, u->outputs, idx) PA_IDXSET_FOREACH(o, u->outputs, idx)
output_enable(o); output_enable(o);
if (!u->time_event && u->adjust_time > 0)
u->time_event = pa_core_rttime_new(u->core, pa_rtclock_now() + u->adjust_time, time_callback, u);
pa_log_info("Resumed successfully..."); pa_log_info("Resumed successfully...");
} }
@ -823,6 +820,13 @@ static int sink_set_state_in_main_thread_cb(pa_sink *sink, pa_sink_state_t state
if (u->sink->state == PA_SINK_SUSPENDED) if (u->sink->state == PA_SINK_SUSPENDED)
unsuspend(u); unsuspend(u);
/* The first smoother update should be done early, otherwise the smoother will
* not be aware of the slave sink latencies and report far too small values.
* This is especially important if after an unsuspend the sink runs on a different
* latency than before. */
if (state == PA_SINK_RUNNING && !u->time_event && u->adjust_time > 0)
u->time_event = pa_core_rttime_new(u->core, pa_rtclock_now() + pa_sink_get_requested_latency(u->sink), time_callback, u);
break; break;
case PA_SINK_UNLINKED: case PA_SINK_UNLINKED: