mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-10-29 05:40:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "module-echo-cancel: schedule source and playback last"

Browse source 
This reverts commit 0d422f00dd.

Fixes #1894
This commit is contained in:
Wim Taymans 2021-12-14 16:49:50 +01:00
parent 03f0a7c9ba
commit 311210d005
1 changed files with 2 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -109,15 +109,6 @@
* *
*/ */
/**
* .--------. .---------. .--------. .----------. .-------.
* | source | --> | capture | --> | | --> | source | --> | app |
* '--------' '---------' | echo | '----------' '-------'
* | cancel |
* .--------. .---------. | | .----------. .--------.
* | app | --> | sink | --> | | --> | playback | --> | sink |
* '--------' '---------' '--------' '----------' '--------'
*/
#define NAME "echo-cancel" #define NAME "echo-cancel"
PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME); PW_LOG_TOPIC_STATIC(mod_topic, "mod." NAME);
@ -264,8 +255,6 @@ static void process(struct impl *impl)
pw_stream_queue_buffer(impl->playback, pout); pw_stream_queue_buffer(impl->playback, pout);
pw_stream_trigger_process(impl->playback);
/* Now run the canceller */ /* Now run the canceller */
echo_cancel_run(impl->aec_info, impl->aec, rec, play, out, size / sizeof(float)); echo_cancel_run(impl->aec_info, impl->aec, rec, play, out, size / sizeof(float));
@ -320,7 +309,6 @@ static void process(struct impl *impl)
spa_ringbuffer_read_update(&impl->out_ring, oindex); spa_ringbuffer_read_update(&impl->out_ring, oindex);
avail -= size; avail -= size;
} }
pw_stream_trigger_process(impl->source);
done: done:
impl->sink_ready = false; impl->sink_ready = false;
@ -701,8 +689,7 @@ static int setup_streams(struct impl *impl)
PW_DIRECTION_OUTPUT, PW_DIRECTION_OUTPUT,
PW_ID_ANY, PW_ID_ANY,
PW_STREAM_FLAG_MAP_BUFFERS | PW_STREAM_FLAG_MAP_BUFFERS |
PW_STREAM_FLAG_RT_PROCESS | PW_STREAM_FLAG_RT_PROCESS,
PW_STREAM_FLAG_TRIGGER,
params, n_params)) < 0) params, n_params)) < 0)
return res; return res;
@ -719,8 +706,7 @@ static int setup_streams(struct impl *impl)
PW_ID_ANY, PW_ID_ANY,
PW_STREAM_FLAG_AUTOCONNECT | PW_STREAM_FLAG_AUTOCONNECT |
PW_STREAM_FLAG_MAP_BUFFERS | PW_STREAM_FLAG_MAP_BUFFERS |
PW_STREAM_FLAG_RT_PROCESS | PW_STREAM_FLAG_RT_PROCESS,
PW_STREAM_FLAG_TRIGGER,
params, n_params)) < 0) params, n_params)) < 0)
return res; return res;