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

echo-cancel: Fix drift timer restart logic across suspend

Browse source 
The IS_ACTIVE() macro does a pa_sink/source_get_state() on our sink and
source, which does not work in the state change callback, since the
state is not actually committed at that point.
This commit is contained in:
Arun Raghavan 2014-08-04 13:51:48 +05:30
parent 1b600a2d54
commit 6fdddf45f7
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/echo-cancel/module-echo-cancel.c
View file

@ -475,7 +475,7 @@ static int source_set_state_cb(pa_source *s, pa_source_state_t state) {
if (state == PA_SOURCE_RUNNING) { if (state == PA_SOURCE_RUNNING) {
/* restart timer when both sink and source are active */ /* restart timer when both sink and source are active */
if (IS_ACTIVE(u) && u->adjust_time) if ((pa_sink_get_state(u->sink) == PA_SINK_RUNNING) && u->adjust_time)
pa_core_rttime_restart(u->core, u->time_event, pa_rtclock_now() + u->adjust_time); pa_core_rttime_restart(u->core, u->time_event, pa_rtclock_now() + u->adjust_time);
pa_atomic_store(&u->request_resync, 1); pa_atomic_store(&u->request_resync, 1);
@ -500,7 +500,7 @@ static int sink_set_state_cb(pa_sink *s, pa_sink_state_t state) {
if (state == PA_SINK_RUNNING) { if (state == PA_SINK_RUNNING) {
/* restart timer when both sink and source are active */ /* restart timer when both sink and source are active */
if (IS_ACTIVE(u) && u->adjust_time) if ((pa_source_get_state(u->source) == PA_SOURCE_RUNNING) && u->adjust_time)
pa_core_rttime_restart(u->core, u->time_event, pa_rtclock_now() + u->adjust_time); pa_core_rttime_restart(u->core, u->time_event, pa_rtclock_now() + u->adjust_time);
pa_atomic_store(&u->request_resync, 1); pa_atomic_store(&u->request_resync, 1);