From dba4db5668d6dd95475dc4e8aa42de3011b4a15e Mon Sep 17 00:00:00 2001 From: Andrey Logvin Date: Thu, 1 Oct 2020 14:48:45 +0000 Subject: [PATCH] Revert "Reland "Reduce the amount of howling reduction in AEC3"" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 18515e2793fbcfce358a1c650da6cb552ca59ac5. Reason for revert: Continuation of previous revert https://webrtc-review.googlesource.com/c/src/+/186304 Original change's description: > Reland "Reduce the amount of howling reduction in AEC3" > > This is a reland of 2978abb88c49362e296bdce3cb662f6255b17083 > > Original change's description: > > Reduce the amount of howling reduction in AEC3 > > > > This CL backs off the howling protection functionality in AEC3. > > The effect is increased transparency in some cases. No negative effects > > have been identified in the hands-on testing. > > > > > > A kill-switch is added that can be used to turn off the functionality. > > > > Bug: b/150764764 > > Change-Id: I604c569c76f911799556a60bc8fd2fb43bbfe196 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/186082 > > Reviewed-by: Gustaf Ullberg > > Commit-Queue: Per Åhgren > > Cr-Commit-Position: refs/heads/master@{#32258} > > Bug: b/150764764 > Change-Id: I277f24eb3288ad0307e7463bad9aea6436cfe879 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/186263 > Reviewed-by: Per Åhgren > Reviewed-by: Gustaf Ullberg > Commit-Queue: Per Åhgren > Cr-Commit-Position: refs/heads/master@{#32274} TBR=gustaf@webrtc.org,peah@webrtc.org Change-Id: I0596855e3bf910878aebcee90e03345d5db1105d No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: b/150764764 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/186269 Reviewed-by: Andrey Logvin Commit-Queue: Andrey Logvin Cr-Commit-Position: refs/heads/master@{#32276} --- api/audio/echo_canceller3_config.h | 4 ++-- modules/audio_processing/aec3/echo_canceller3.cc | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/api/audio/echo_canceller3_config.h b/api/audio/echo_canceller3_config.h index 3fdf1feedd..a505625538 100644 --- a/api/audio/echo_canceller3_config.h +++ b/api/audio/echo_canceller3_config.h @@ -215,8 +215,8 @@ struct RTC_EXPORT EchoCanceller3Config { struct HighBandsSuppression { float enr_threshold = 1.f; float max_gain_during_echo = 1.f; - float anti_howling_activation_threshold = 400.f; - float anti_howling_gain = 1.f; + float anti_howling_activation_threshold = 25.f; + float anti_howling_gain = 0.01f; } high_bands_suppression; float floor_first_increase = 0.00001f; diff --git a/modules/audio_processing/aec3/echo_canceller3.cc b/modules/audio_processing/aec3/echo_canceller3.cc index 4b67df0eee..d96abc979f 100644 --- a/modules/audio_processing/aec3/echo_canceller3.cc +++ b/modules/audio_processing/aec3/echo_canceller3.cc @@ -213,12 +213,6 @@ void CopyBufferIntoFrame(const AudioBuffer& buffer, EchoCanceller3Config AdjustConfig(const EchoCanceller3Config& config) { EchoCanceller3Config adjusted_cfg = config; - if (field_trial::IsEnabled("WebRTC-Aec3AntiHowlingMinimizationKillSwitch")) { - adjusted_cfg.suppressor.high_bands_suppression - .anti_howling_activation_threshold = 25.f; - adjusted_cfg.suppressor.high_bands_suppression.anti_howling_gain = 0.01f; - } - if (field_trial::IsEnabled("WebRTC-Aec3UseShortConfigChangeDuration")) { adjusted_cfg.filter.config_change_duration_blocks = 10; }