From a14db55c2bc912ed68eeb5059d2abc75e9ad9a47 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Wed, 17 Feb 2016 19:46:54 +0530 Subject: [PATCH] echo-cancel: Allow enabling the extended filter in webrtc AEC This creates a longer filter that is more complex and less sensitive to incorrect delay reporting from the hardware. There is also a delay-agnostic mode that can eventually be enabled if required. In some very quick testing, not enabling this seems to provide better results during double-talk. --- src/modules/echo-cancel/webrtc.cc | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/modules/echo-cancel/webrtc.cc b/src/modules/echo-cancel/webrtc.cc index ace5150..ee3075f 100644 --- a/src/modules/echo-cancel/webrtc.cc +++ b/src/modules/echo-cancel/webrtc.cc @@ -46,6 +46,7 @@ PA_C_DECL_END #define DEFAULT_ROUTING_MODE "speakerphone" #define DEFAULT_COMFORT_NOISE true #define DEFAULT_DRIFT_COMPENSATION false +#define DEFAULT_EXTENDED_FILTER false static const char* const valid_modargs[] = { "high_pass_filter", @@ -56,6 +57,7 @@ static const char* const valid_modargs[] = { "routing_mode", "comfort_noise", "drift_compensation", + "extended_filter", NULL }; @@ -81,7 +83,8 @@ bool pa_webrtc_ec_init(pa_core *c, pa_echo_canceller *ec, uint32_t *nframes, const char *args) { webrtc::AudioProcessing *apm = NULL; webrtc::ProcessingConfig pconfig; - bool hpf, ns, agc, dgc, mobile, cn; + webrtc::Config config; + bool hpf, ns, agc, dgc, mobile, cn, ext_filter; int rm = -1; pa_modargs *ma; @@ -154,7 +157,16 @@ bool pa_webrtc_ec_init(pa_core *c, pa_echo_canceller *ec, } } - apm = webrtc::AudioProcessing::Create(); + ext_filter = DEFAULT_EXTENDED_FILTER; + if (pa_modargs_get_value_boolean(ma, "extended_filter", &ext_filter) < 0) { + pa_log("Failed to parse extended_filter value"); + goto fail; + } + + if (ext_filter) + config.Set(new webrtc::ExtendedFilter(true)); + + apm = webrtc::AudioProcessing::Create(config); out_ss->format = PA_SAMPLE_S16NE; *play_ss = *out_ss; -- 2.7.4