diff --git a/modules/audio_processing/aec3/residual_echo_estimator.cc b/modules/audio_processing/aec3/residual_echo_estimator.cc index 397a29048f..e0de375e21 100644 --- a/modules/audio_processing/aec3/residual_echo_estimator.cc +++ b/modules/audio_processing/aec3/residual_echo_estimator.cc @@ -23,57 +23,32 @@ namespace webrtc { namespace { -bool UseLowEarlyReflectionsTransparentModeGain() { - return field_trial::IsEnabled( - "WebRTC-Aec3UseLowEarlyReflectionsTransparentModeGain"); -} - -bool UseLowLateReflectionsTransparentModeGain() { - return field_trial::IsEnabled( - "WebRTC-Aec3UseLowLateReflectionsTransparentModeGain"); -} - -bool UseLowEarlyReflectionsDefaultGain() { - return field_trial::IsEnabled("WebRTC-Aec3UseLowEarlyReflectionsDefaultGain"); -} - -bool UseLowLateReflectionsDefaultGain() { - return field_trial::IsEnabled("WebRTC-Aec3UseLowLateReflectionsDefaultGain"); -} - bool ModelReverbInNonlinearMode() { - return !field_trial::IsEnabled("WebRTC-Aec3rNonlinearModeReverbKillSwitch"); + return !field_trial::IsEnabled("WebRTC-Aec3NonlinearModeReverbKillSwitch"); } -constexpr float kDefaultTransparentModeGain = 0.01f; +constexpr float kDefaultTransparentModeGain = 0.f; -float GetEarlyReflectionsTransparentModeGain() { - if (UseLowEarlyReflectionsTransparentModeGain()) { - return 0.001f; +float GetTransparentModeGain() { + if (field_trial::IsEnabled( + "WebRTC-Aec3NoSuppressionInTransparentModeKillSwitch")) { + return 0.01f; + } else { + return kDefaultTransparentModeGain; } - return kDefaultTransparentModeGain; -} - -float GetLateReflectionsTransparentModeGain() { - if (UseLowLateReflectionsTransparentModeGain()) { - return 0.001f; - } - - return kDefaultTransparentModeGain; } float GetEarlyReflectionsDefaultModeGain( const EchoCanceller3Config::EpStrength& config) { - if (UseLowEarlyReflectionsDefaultGain()) { + if (field_trial::IsEnabled("WebRTC-Aec3UseLowEarlyReflectionsDefaultGain")) { return 0.1f; } - return config.default_gain; } float GetLateReflectionsDefaultModeGain( const EchoCanceller3Config::EpStrength& config) { - if (UseLowLateReflectionsDefaultGain()) { + if (field_trial::IsEnabled("WebRTC-Aec3UseLowLateReflectionsDefaultGain")) { return 0.1f; } return config.default_gain; @@ -201,10 +176,8 @@ ResidualEchoEstimator::ResidualEchoEstimator(const EchoCanceller3Config& config, size_t num_render_channels) : config_(config), num_render_channels_(num_render_channels), - early_reflections_transparent_mode_gain_( - GetEarlyReflectionsTransparentModeGain()), - late_reflections_transparent_mode_gain_( - GetLateReflectionsTransparentModeGain()), + early_reflections_transparent_mode_gain_(GetTransparentModeGain()), + late_reflections_transparent_mode_gain_(GetTransparentModeGain()), early_reflections_general_gain_( GetEarlyReflectionsDefaultModeGain(config_.ep_strength)), late_reflections_general_gain_(