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

loopback: Move timer restart and snapshots to timer callback

Browse source 
Restaring the timer and obtaining the latency snapshots belong to the timer callback.
To maintain an adjust time as near as possible to the configured value, the timer is
now restarted immediately at the beginning of the timer callback.
This commit is contained in:
Georg Chini 2016-06-05 21:05:08 +02:00 • committed by Tanu Kaskinen
parent b494bd62dd
commit 919cc2f3f9
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/module-loopback.c
View file

@ -177,9 +177,6 @@ static void adjust_rates(struct userdata *u) {
pa_assert(u); pa_assert(u);
pa_assert_ctl_context(); pa_assert_ctl_context();
pa_asyncmsgq_send(u->sink_input->sink->asyncmsgq, PA_MSGOBJECT(u->sink_input), SINK_INPUT_MESSAGE_LATENCY_SNAPSHOT, NULL, 0, NULL);
pa_asyncmsgq_send(u->source_output->source->asyncmsgq, PA_MSGOBJECT(u->source_output), SOURCE_OUTPUT_MESSAGE_LATENCY_SNAPSHOT, NULL, 0, NULL);
/* Rates and latencies*/ /* Rates and latencies*/
old_rate = u->sink_input->sample_spec.rate; old_rate = u->sink_input->sample_spec.rate;
base_rate = u->source_output->sample_spec.rate; base_rate = u->source_output->sample_spec.rate;
@ -234,8 +231,6 @@ static void adjust_rates(struct userdata *u) {
pa_sink_input_set_rate(u->sink_input, new_rate); pa_sink_input_set_rate(u->sink_input, new_rate);
pa_log_debug("[%s] Updated sampling rate to %lu Hz.", u->sink_input->sink->name, (unsigned long) new_rate); pa_log_debug("[%s] Updated sampling rate to %lu Hz.", u->sink_input->sink->name, (unsigned long) new_rate);
pa_core_rttime_restart(u->core, u->time_event, pa_rtclock_now() + u->adjust_time);
} }
/* Called from main context */ /* Called from main context */
@ -246,6 +241,13 @@ static void time_callback(pa_mainloop_api *a, pa_time_event *e, const struct tim
pa_assert(a); pa_assert(a);
pa_assert(u->time_event == e); pa_assert(u->time_event == e);
/* Restart timer right away */
pa_core_rttime_restart(u->core, u->time_event, pa_rtclock_now() + u->adjust_time);
/* Get sink and source latency snapshot */
pa_asyncmsgq_send(u->sink_input->sink->asyncmsgq, PA_MSGOBJECT(u->sink_input), SINK_INPUT_MESSAGE_LATENCY_SNAPSHOT, NULL, 0, NULL);
pa_asyncmsgq_send(u->source_output->source->asyncmsgq, PA_MSGOBJECT(u->source_output), SOURCE_OUTPUT_MESSAGE_LATENCY_SNAPSHOT, NULL, 0, NULL);
adjust_rates(u); adjust_rates(u);
} }