From 4fd3efa46b33726d489af933e709289d20ed5ea0 Mon Sep 17 00:00:00 2001 From: Bart Cerneels Date: Sat, 28 May 2011 07:56:00 +0530 Subject: echo-cancel: Speex preprocessor has to run *after* the AEC. This is how it is expected to be run. --- src/modules/echo-cancel/module-echo-cancel.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/modules/echo-cancel/module-echo-cancel.c b/src/modules/echo-cancel/module-echo-cancel.c index e83839a9..90577d4c 100644 --- a/src/modules/echo-cancel/module-echo-cancel.c +++ b/src/modules/echo-cancel/module-echo-cancel.c @@ -726,12 +726,13 @@ static void source_output_push_cb(pa_source_output *o, const pa_memchunk *chunk) fwrite(pdata, 1, u->blocksize, u->played_file); } - if (u->ec->pp_state) - speex_preprocess_run(u->ec->pp_state, (spx_int16_t *) rdata); - /* perform echo cancelation */ u->ec->run(u->ec, rdata, pdata, cdata); + /* preprecessor is run after AEC. This is not a mistake! */ + if (u->ec->pp_state) + speex_preprocess_run(u->ec->pp_state, (spx_int16_t *) cdata); + if (u->save_aec) { if (u->canceled_file) fwrite(cdata, 1, u->blocksize, u->canceled_file); -- cgit