mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-31 11:08:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

echo-cancel: Expose dereverb in the speex canceller

Browse source 
Enabled by default.
This commit is contained in:
Arun Raghavan 2017-05-15 14:17:58 +05:30
parent fa228745c1
commit 2c9a2aa01e
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/modules/echo-cancel/speex.c
View file

@ -33,6 +33,7 @@
#define DEFAULT_FILTER_SIZE_MS 200 #define DEFAULT_FILTER_SIZE_MS 200
#define DEFAULT_AGC_ENABLED true #define DEFAULT_AGC_ENABLED true
#define DEFAULT_DENOISE_ENABLED true #define DEFAULT_DENOISE_ENABLED true
#define DEFAULT_DEREVERB_ENABLED true
#define DEFAULT_ECHO_SUPPRESS_ENABLED true #define DEFAULT_ECHO_SUPPRESS_ENABLED true
#define DEFAULT_ECHO_SUPPRESS_ATTENUATION 0 #define DEFAULT_ECHO_SUPPRESS_ATTENUATION 0
@ -41,6 +42,7 @@ static const char* const valid_modargs[] = {
"filter_size_ms", "filter_size_ms",
"agc", "agc",
"denoise", "denoise",
"dereverb",
"echo_suppress", "echo_suppress",
"echo_suppress_attenuation", "echo_suppress_attenuation",
"echo_suppress_attenuation_active", "echo_suppress_attenuation_active",
@ -61,6 +63,7 @@ static void speex_ec_fixate_spec(pa_sample_spec *rec_ss, pa_channel_map *rec_map
static bool pa_speex_ec_preprocessor_init(pa_echo_canceller *ec, pa_sample_spec *out_ss, uint32_t nframes, pa_modargs *ma) { static bool pa_speex_ec_preprocessor_init(pa_echo_canceller *ec, pa_sample_spec *out_ss, uint32_t nframes, pa_modargs *ma) {
bool agc; bool agc;
bool denoise; bool denoise;
bool dereverb;
bool echo_suppress; bool echo_suppress;
int32_t echo_suppress_attenuation; int32_t echo_suppress_attenuation;
int32_t echo_suppress_attenuation_active; int32_t echo_suppress_attenuation_active;
@ -77,6 +80,12 @@ static bool pa_speex_ec_preprocessor_init(pa_echo_canceller *ec, pa_sample_spec
goto fail; goto fail;
} }
dereverb = DEFAULT_DEREVERB_ENABLED;
if (pa_modargs_get_value_boolean(ma, "dereverb", &dereverb) < 0) {
pa_log("Failed to parse dereverb value");
goto fail;
}
echo_suppress = DEFAULT_ECHO_SUPPRESS_ENABLED; echo_suppress = DEFAULT_ECHO_SUPPRESS_ENABLED;
if (pa_modargs_get_value_boolean(ma, "echo_suppress", &echo_suppress) < 0) { if (pa_modargs_get_value_boolean(ma, "echo_suppress", &echo_suppress) < 0) {
pa_log("Failed to parse echo_suppress value"); pa_log("Failed to parse echo_suppress value");
@ -103,11 +112,11 @@ static bool pa_speex_ec_preprocessor_init(pa_echo_canceller *ec, pa_sample_spec
goto fail; goto fail;
} }
if (agc || denoise || echo_suppress) { if (agc || denoise || dereverb || echo_suppress) {
spx_int32_t tmp; spx_int32_t tmp;
if (out_ss->channels != 1) { if (out_ss->channels != 1) {
pa_log("AGC, denoising and echo suppression only work with channels=1"); pa_log("AGC, denoising, dereverb and echo suppression only work with channels=1");
goto fail; goto fail;
} }
@ -119,6 +128,9 @@ static bool pa_speex_ec_preprocessor_init(pa_echo_canceller *ec, pa_sample_spec
tmp = denoise; tmp = denoise;
speex_preprocess_ctl(ec->params.speex.pp_state, SPEEX_PREPROCESS_SET_DENOISE, &tmp); speex_preprocess_ctl(ec->params.speex.pp_state, SPEEX_PREPROCESS_SET_DENOISE, &tmp);
tmp = dereverb;
speex_preprocess_ctl(ec->params.speex.pp_state, SPEEX_PREPROCESS_SET_DEREVERB, &tmp);
if (echo_suppress) { if (echo_suppress) {
if (echo_suppress_attenuation) if (echo_suppress_attenuation)
speex_preprocess_ctl(ec->params.speex.pp_state, SPEEX_PREPROCESS_SET_ECHO_SUPPRESS, speex_preprocess_ctl(ec->params.speex.pp_state, SPEEX_PREPROCESS_SET_ECHO_SUPPRESS,
@ -133,8 +145,8 @@ static bool pa_speex_ec_preprocessor_init(pa_echo_canceller *ec, pa_sample_spec
speex_preprocess_ctl(ec->params.speex.pp_state, SPEEX_PREPROCESS_SET_ECHO_STATE, speex_preprocess_ctl(ec->params.speex.pp_state, SPEEX_PREPROCESS_SET_ECHO_STATE,
ec->params.speex.state); ec->params.speex.state);
pa_log_info("Loaded speex preprocessor with params: agc=%s, denoise=%s, echo_suppress=%s", pa_yes_no(agc), pa_log_info("Loaded speex preprocessor with params: agc=%s, denoise=%s, dereverb=%s, echo_suppress=%s",
pa_yes_no(denoise), pa_yes_no(echo_suppress)); pa_yes_no(agc), pa_yes_no(denoise), pa_yes_no(dereverb), pa_yes_no(echo_suppress));
} else } else
pa_log_info("All preprocessing options are disabled"); pa_log_info("All preprocessing options are disabled");