diff options
| author | Arun Raghavan <git@arunraghavan.net> | 2016-02-17 19:47:04 +0530 |
|---|---|---|
| committer | Arun Raghavan <git@arunraghavan.net> | 2016-02-25 09:09:12 +0530 |
| commit | 8949ed96c635959ea9d010c5d4b7fcc021486532 (patch) | |
| tree | a686c20cbdea43ebd121c93ae358b0497ca96406 | |
| parent | 90608feac0a541ffc5ec97a7be25c76e8dfcb7e8 (diff) | |
| download | pulseaudio-8949ed96c635959ea9d010c5d4b7fcc021486532.tar.gz | |
echo-cancel: Add a modarg toggle for VAD in the webrtc canceller
| -rw-r--r-- | src/modules/echo-cancel/webrtc.cc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/modules/echo-cancel/webrtc.cc b/src/modules/echo-cancel/webrtc.cc index 8e2967ee0..db2901fd9 100644 --- a/src/modules/echo-cancel/webrtc.cc +++ b/src/modules/echo-cancel/webrtc.cc @@ -47,6 +47,7 @@ PA_C_DECL_END #define DEFAULT_ROUTING_MODE "speakerphone" #define DEFAULT_COMFORT_NOISE true #define DEFAULT_DRIFT_COMPENSATION false +#define DEFAULT_VAD true #define DEFAULT_EXTENDED_FILTER false #define DEFAULT_INTELLIGIBILITY_ENHANCER false #define DEFAULT_EXPERIMENTAL_AGC false @@ -64,6 +65,7 @@ static const char* const valid_modargs[] = { "routing_mode", "comfort_noise", "drift_compensation", + "voice_detection", "extended_filter", "intelligibility_enhancer", "experimental_agc", @@ -143,7 +145,7 @@ bool pa_webrtc_ec_init(pa_core *c, pa_echo_canceller *ec, webrtc::AudioProcessing *apm = NULL; webrtc::ProcessingConfig pconfig; webrtc::Config config; - bool hpf, ns, agc, dgc, mobile, cn, ext_filter, intelligibility, experimental_agc; + bool hpf, ns, agc, dgc, mobile, cn, vad, ext_filter, intelligibility, experimental_agc; int rm = -1; pa_modargs *ma; bool trace = false; @@ -217,6 +219,12 @@ bool pa_webrtc_ec_init(pa_core *c, pa_echo_canceller *ec, } } + vad = DEFAULT_VAD; + if (pa_modargs_get_value_boolean(ma, "voice_detection", &vad) < 0) { + pa_log("Failed to parse voice_detection value"); + goto fail; + } + 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"); @@ -304,7 +312,8 @@ bool pa_webrtc_ec_init(pa_core *c, pa_echo_canceller *ec, apm->gain_control()->Enable(true); } - apm->voice_detection()->Enable(true); + if (vad) + apm->voice_detection()->Enable(true); ec->params.priv.webrtc.apm = apm; ec->params.priv.webrtc.sample_spec = *out_ss; |