zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AEC3: Add state-specific suppressor behaviors

Browse Source 
This CL allows selecting an echo suppressor behavior which is specific
for whether the nearend is dominant, or the echo is dominant.

The changes in this CL are bitexact.

Bug: webrtc:9660
Change-Id: Ie32e65efe47e692de6d6a22a7ad3b469d745fd6b
Reviewed-on: https://webrtc-review.googlesource.com/95725
Commit-Queue: Per Åhgren <peah@webrtc.org>
Reviewed-by: Gustaf Ullberg <gustaf@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24434}
This commit is contained in:
Per Åhgren
2018-08-24 22:48:49 +02:00
committed by Commit Bot
parent 90ab76dd19
commit 524e878121
5 changed files with 225 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
api/audio/echo_canceller3_config.cc
View File

@ -25,4 +25,30 @@ EchoCanceller3Config::EchoModel::EchoModel() = default;
EchoCanceller3Config::EchoModel::EchoModel(
const EchoCanceller3Config::EchoModel& e) = default;
EchoCanceller3Config::Suppressor::Suppressor() = default;
EchoCanceller3Config::Suppressor::Suppressor(
const EchoCanceller3Config::Suppressor& e) = default;
EchoCanceller3Config::Suppressor::MaskingThresholds::MaskingThresholds(
float enr_transparent,
float enr_suppress,
float emr_transparent)
: enr_transparent(enr_transparent),
enr_suppress(enr_suppress),
emr_transparent(emr_transparent) {}
EchoCanceller3Config::Suppressor::Suppressor::MaskingThresholds::
MaskingThresholds(
const EchoCanceller3Config::Suppressor::MaskingThresholds& e) = default;
EchoCanceller3Config::Suppressor::Tuning::Tuning(MaskingThresholds mask_lf,
MaskingThresholds mask_hf,
float max_inc_factor,
float max_dec_factor_lf)
: mask_lf(mask_lf),
mask_hf(mask_hf),
max_inc_factor(max_inc_factor),
max_dec_factor_lf(max_dec_factor_lf) {}
EchoCanceller3Config::Suppressor::Tuning::Tuning(
const EchoCanceller3Config::Suppressor::Tuning& e) = default;
} // namespace webrtc

45
api/audio/echo_canceller3_config.h
View File

@ -112,12 +112,6 @@ struct EchoCanceller3Config {
float poor_excitation_render_limit_ds8 = 20.f;
} render_levels;
struct GainUpdates {
float max_inc_factor = 2.0f;
float max_dec_factor_lf = 0.25f;
float floor_first_increase = 0.00001f;
} gain_updates;
struct EchoRemovalControl {
struct GainRampup {
float initial_gain = 0.0f;
@ -146,15 +140,50 @@ struct EchoCanceller3Config {
} echo_model;
struct Suppressor {
Suppressor();
Suppressor(const Suppressor& e);
size_t nearend_average_blocks = 4;
struct MaskingThresholds {
MaskingThresholds(float enr_transparent,
float enr_suppress,
float emr_transparent);
MaskingThresholds(const MaskingThresholds& e);
float enr_transparent;
float enr_suppress;
float emr_transparent;
};
MaskingThresholds mask_lf = {.2f, .3f, .3f};
MaskingThresholds mask_hf = {.07f, .1f, .3f};
struct Tuning {
Tuning(MaskingThresholds mask_lf,
MaskingThresholds mask_hf,
float max_inc_factor,
float max_dec_factor_lf);
Tuning(const Tuning& e);
MaskingThresholds mask_lf;
MaskingThresholds mask_hf;
float max_inc_factor;
float max_dec_factor_lf;
};
Tuning normal_tuning = Tuning(MaskingThresholds(.2f, .3f, .3f),
MaskingThresholds(.07f, .1f, .3f),
2.0f,
0.25f);
Tuning nearend_tuning = Tuning(MaskingThresholds(.2f, .3f, .3f),
MaskingThresholds(.07f, .1f, .3f),
2.0f,
0.25f);
struct DominantNearendDetection {
float enr_threshold = 10.f;
float snr_threshold = 10.f;
int hold_duration = 25;
int trigger_threshold = 15;
} dominant_nearend_detection;
float floor_first_increase = 0.00001f;
bool enforce_transparent = false;
bool enforce_empty_higher_bands = false;
} suppressor;