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

module-echo-cancel: Avoid discontinuity

Browse source 
Keep the samples in the ringbuffer that are needed the next cycle to
avoid discontinuity when the aec blocksize is not equal to or divisible
by quantum.
This commit is contained in:
Jonas Holmberg 2025-10-27 14:37:03 +01:00
parent 23c449af5d
commit 76a31a47c2
1 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -317,10 +317,15 @@ static void process(struct impl *impl)
/* First read a block from the capture ring buffer */ /* First read a block from the capture ring buffer */
avail = spa_ringbuffer_get_read_index(&impl->rec_ring, &rindex); avail = spa_ringbuffer_get_read_index(&impl->rec_ring, &rindex);
while (avail > (int32_t)size) { while (avail >= (int32_t)size * 2) {
/* drop samples from previous graph cycles */ /* drop samples that are not needed this or next cycle. Note
* that samples are kept in the ringbuffer until next cycle if
* size is not equal to or divisible by quantum, to avoid
* discontinuity */
pw_log_debug("avail %d", avail);
spa_ringbuffer_read_update(&impl->rec_ring, rindex + size); spa_ringbuffer_read_update(&impl->rec_ring, rindex + size);
avail = spa_ringbuffer_get_read_index(&impl->rec_ring, &rindex); avail = spa_ringbuffer_get_read_index(&impl->rec_ring, &rindex);
pw_log_debug("new avail %d, size %u", avail, size);
} }
for (i = 0; i < impl->rec_info.channels; i++) { for (i = 0; i < impl->rec_info.channels; i++) {
@ -352,15 +357,19 @@ static void process(struct impl *impl)
goto done; goto done;
} }
while (pavail > (int32_t)size) { if (pavail > avail) {
/* drop samples from previous graph cycles */ /* drop too old samples from previous graph cycles */
spa_ringbuffer_read_update(&impl->play_ring, pindex + size); pw_log_debug("pavail %d, dropping %d", pavail, pavail - avail);
spa_ringbuffer_read_update(&impl->play_ring, pindex + pavail - avail);
pavail = spa_ringbuffer_get_read_index(&impl->play_ring, &pindex); pavail = spa_ringbuffer_get_read_index(&impl->play_ring, &pindex);
pw_log_debug("new pavail %d, avail %d", pavail, avail);
} }
while (pdavail > (int32_t)size) { if (pdavail > avail) {
/* drop samples from previous graph cycles */ /* drop too old samples from previous graph cycles */
spa_ringbuffer_read_update(&impl->play_delayed_ring, pdindex + size); pw_log_debug("pdavail %d, dropping %d", pdavail, pdavail - avail);
spa_ringbuffer_read_update(&impl->play_delayed_ring, pdindex + pdavail - avail);
pdavail = spa_ringbuffer_get_read_index(&impl->play_delayed_ring, &pdindex); pdavail = spa_ringbuffer_get_read_index(&impl->play_delayed_ring, &pdindex);
pw_log_debug("new pdavail %d, avail %d", pdavail, avail);
} }
for (i = 0; i < impl->play_info.channels; i++) { for (i = 0; i < impl->play_info.channels; i++) {