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

loopback: Disable adjust timer when suspended

Browse source 
Stop the rate adjustment timer when no audio is flowing.
This commit is contained in:
Mikel Astiz 2012-09-20 14:28:34 +02:00 • committed by Tanu Kaskinen
parent 6c916697bc
commit 5412a69cac
1 changed files with 33 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -131,6 +131,8 @@ enum {
SOURCE_OUTPUT_MESSAGE_LATENCY_SNAPSHOT SOURCE_OUTPUT_MESSAGE_LATENCY_SNAPSHOT
}; };
static void enable_adjust_timer(struct userdata *u, bool enable);
/* Called from main context */ /* Called from main context */
static void teardown(struct userdata *u) { static void teardown(struct userdata *u) {
pa_assert(u); pa_assert(u);
@ -140,10 +142,7 @@ static void teardown(struct userdata *u) {
pa_asyncmsgq_flush(u->asyncmsgq, 0); pa_asyncmsgq_flush(u->asyncmsgq, 0);
u->adjust_time = 0; u->adjust_time = 0;
if (u->time_event) { enable_adjust_timer(u, false);
u->core->mainloop->time_free(u->time_event);
u->time_event = NULL;
}
if (u->sink_input) if (u->sink_input)
pa_sink_input_unlink(u->sink_input); pa_sink_input_unlink(u->sink_input);
@ -236,6 +235,30 @@ static void time_callback(pa_mainloop_api *a, pa_time_event *e, const struct tim
adjust_rates(u); adjust_rates(u);
} }
/* Called from main context */
static void enable_adjust_timer(struct userdata *u, bool enable) {
if (enable) {
if (u->time_event || u->adjust_time <= 0)
return;
u->time_event = pa_core_rttime_new(u->module->core, pa_rtclock_now() + u->adjust_time, time_callback, u);
} else {
if (!u->time_event)
return;
u->core->mainloop->time_free(u->time_event);
u->time_event = NULL;
}
}
/* Called from main context */
static void update_adjust_timer(struct userdata *u) {
if (u->sink_input->state == PA_SINK_INPUT_CORKED || u->source_output->state == PA_SOURCE_OUTPUT_CORKED)
enable_adjust_timer(u, false);
else
enable_adjust_timer(u, true);
}
/* Called from input thread context */ /* Called from input thread context */
static void source_output_push_cb(pa_source_output *o, const pa_memchunk *chunk) { static void source_output_push_cb(pa_source_output *o, const pa_memchunk *chunk) {
struct userdata *u; struct userdata *u;
@ -398,6 +421,8 @@ static void source_output_suspend_cb(pa_source_output *o, pa_bool_t suspended) {
pa_assert_se(u = o->userdata); pa_assert_se(u = o->userdata);
pa_sink_input_cork(u->sink_input, suspended); pa_sink_input_cork(u->sink_input, suspended);
update_adjust_timer(u);
} }
/* Called from output thread context */ /* Called from output thread context */
@ -540,7 +565,7 @@ static int sink_input_process_msg_cb(pa_msgobject *obj, int code, void *data, in
pa_assert_ctl_context(); pa_assert_ctl_context();
if (u->adjust_time > 0) if (u->time_event)
adjust_rates(u); adjust_rates(u);
return 0; return 0;
} }
@ -664,6 +689,8 @@ static void sink_input_suspend_cb(pa_sink_input *i, pa_bool_t suspended) {
pa_assert_se(u = i->userdata); pa_assert_se(u = i->userdata);
pa_source_output_cork(u->source_output, suspended); pa_source_output_cork(u->source_output, suspended);
update_adjust_timer(u);
} }
int pa__init(pa_module *m) { int pa__init(pa_module *m) {
@ -933,8 +960,7 @@ int pa__init(pa_module *m) {
if (pa_sink_get_state(u->sink_input->sink) != PA_SINK_SUSPENDED) if (pa_sink_get_state(u->sink_input->sink) != PA_SINK_SUSPENDED)
pa_source_output_cork(u->source_output, FALSE); pa_source_output_cork(u->source_output, FALSE);
if (u->adjust_time > 0) update_adjust_timer(u);
u->time_event = pa_core_rttime_new(m->core, pa_rtclock_now() + u->adjust_time, time_callback, u);
pa_modargs_free(ma); pa_modargs_free(ma);
return 0; return 0;