From 919cc2f3f9ae0e2368b08086b9b566a53ec51481 Mon Sep 17 00:00:00 2001 From: Georg Chini Date: Sun, 5 Jun 2016 21:05:08 +0200 Subject: [PATCH] loopback: Move timer restart and snapshots to timer callback 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. --- src/modules/module-loopback.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/modules/module-loopback.c b/src/modules/module-loopback.c index 28b087a..2fd2be0 100644 --- a/src/modules/module-loopback.c +++ b/src/modules/module-loopback.c @@ -177,9 +177,6 @@ static void adjust_rates(struct userdata *u) { pa_assert(u); 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*/ old_rate = u->sink_input->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_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 */ @@ -246,6 +241,13 @@ static void time_callback(pa_mainloop_api *a, pa_time_event *e, const struct tim pa_assert(a); 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); } -- 2.7.4