scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 06:40:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

audio.cpp: reorder echo canceller calls

Browse Source
This commit is contained in:
Martin Piatka
2021-08-24 13:05:50 +02:00
parent f3c5923aab
commit e9b2873af8
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/audio/audio.cpp
View File

@@ -740,11 +740,6 @@ static void *audio_receiver_thread(void *arg)
if (decoded) {
bool failed = false;
if(s->echo_state) {
#ifdef HAVE_SPEEXDSP
echo_play(s->echo_state, &current_pbuf->buffer);
#endif
}
struct audio_desc curr_desc;
curr_desc = audio_desc_from_audio_frame(&current_pbuf->buffer);
@@ -773,6 +768,13 @@ static void *audio_receiver_thread(void *arg)
continue;
}
audio_update_recv_buf(s, current_pbuf->frame_size);
if(s->echo_state) {
#ifdef HAVE_SPEEXDSP
echo_play(s->echo_state, &current_pbuf->buffer);
#endif
}
if (!playback_supports_multiple_streams) {
audio_playback_put_frame(s->audio_playback_device, &current_pbuf->buffer);
} else {
@@ -1014,10 +1016,6 @@ static void *audio_sender_thread(void *arg)
buffer = audio_capture_read(s->audio_capture_device);
if(buffer) {
if (s->muted_sender) {
memset(buffer->data, 0, buffer->data_len);
}
export_audio(s->exporter, buffer);
if(s->echo_state) {
#ifdef HAVE_SPEEXDSP
buffer = echo_cancel(s->echo_state, buffer);
@@ -1025,6 +1023,10 @@ static void *audio_sender_thread(void *arg)
continue;
#endif
}
if (s->muted_sender) {
memset(buffer->data, 0, buffer->data_len);
}
export_audio(s->exporter, buffer);
if (s->paused) {
continue;
}