From e9b2873af801b15c03e7204bd73306a2bd2a7890 Mon Sep 17 00:00:00 2001
From: Martin Piatka <piatka@cesnet.cz>
Date: Tue, 24 Aug 2021 13:05:50 +0200
Subject: [PATCH] audio.cpp: reorder echo canceller calls

---
 src/audio/audio.cpp | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/audio/audio.cpp b/src/audio/audio.cpp
index 7c76a2b23..0f5c5bc33 100644
--- a/src/audio/audio.cpp
+++ b/src/audio/audio.cpp
@@ -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;
                         }