Adding more conservative AEC3 suppressor behavior initially in calls
Bug: webrtc:8746
Change-Id: I47def88f8d6092fcb6b1a4bd14478e8d5ccd5320
Reviewed-on: https://webrtc-review.googlesource.com/39840
Commit-Queue: Per Åhgren <peah@webrtc.org>
Reviewed-by: Gustaf Ullberg <gustaf@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21631}diff --git a/modules/audio_processing/aec3/suppression_gain.cc b/modules/audio_processing/aec3/suppression_gain.cc
index 890e3ad..d1543c6 100644
--- a/modules/audio_processing/aec3/suppression_gain.cc
+++ b/modules/audio_processing/aec3/suppression_gain.cc
@@ -112,6 +112,7 @@
const EchoCanceller3Config& config,
size_t no_saturation_counter,
bool low_noise_render,
+ bool initial_state,
bool linear_echo_estimate,
const std::array<float, kFftLengthBy2Plus1>& last_echo,
const std::array<float, kFftLengthBy2Plus1>& echo,
@@ -126,13 +127,20 @@
float min_decreasing;
auto& param = config.gain_updates;
- if (linear_echo_estimate) {
+ if (!linear_echo_estimate) {
max_increasing = param.nonlinear.max_inc;
max_decreasing = param.nonlinear.max_dec;
rate_increasing = param.nonlinear.rate_inc;
rate_decreasing = param.nonlinear.rate_dec;
min_increasing = param.nonlinear.min_inc;
min_decreasing = param.nonlinear.min_dec;
+ } else if (initial_state && no_saturation_counter > 10) {
+ max_increasing = param.initial.max_inc;
+ max_decreasing = param.initial.max_dec;
+ rate_increasing = param.initial.rate_inc;
+ rate_decreasing = param.initial.rate_dec;
+ min_increasing = param.initial.min_inc;
+ min_decreasing = param.initial.min_dec;
} else if (low_noise_render) {
max_increasing = param.low_noise.max_inc;
max_decreasing = param.low_noise.max_dec;
@@ -279,6 +287,7 @@
const rtc::Optional<int>& narrow_peak_band,
bool saturated_echo,
bool saturating_echo_path,
+ bool initial_state,
bool linear_echo_estimate,
const std::array<float, kFftLengthBy2Plus1>& nearend,
const std::array<float, kFftLengthBy2Plus1>& echo,
@@ -338,8 +347,8 @@
// Update the allowed maximum gain increase.
UpdateMaxGainIncrease(config_, no_saturation_counter_, low_noise_render,
- linear_echo_estimate, last_echo_, echo, last_gain_,
- *gain, &gain_increase_);
+ initial_state, linear_echo_estimate, last_echo_, echo,
+ last_gain_, *gain, &gain_increase_);
// Adjust gain dynamics.
const float gain_bound =
@@ -380,7 +389,7 @@
const bool saturating_echo_path = aec_state.SaturatingEchoPath();
const bool force_zero_gain = aec_state.ForcedZeroGain();
const bool linear_echo_estimate = aec_state.UsableLinearEstimate();
-
+ const bool initial_state = aec_state.InitialState();
if (force_zero_gain) {
last_gain_.fill(0.f);
std::copy(comfort_noise.begin(), comfort_noise.end(), last_masker_.begin());
@@ -396,8 +405,8 @@
const rtc::Optional<int> narrow_peak_band =
render_signal_analyzer.NarrowPeakBand();
LowerBandGain(low_noise_render, narrow_peak_band, saturated_echo,
- saturating_echo_path, linear_echo_estimate, nearend, echo,
- comfort_noise, low_band_gain);
+ saturating_echo_path, initial_state, linear_echo_estimate,
+ nearend, echo, comfort_noise, low_band_gain);
// Compute the gain for the upper bands.
*high_bands_gain =
diff --git a/modules/audio_processing/aec3/suppression_gain.h b/modules/audio_processing/aec3/suppression_gain.h
index 6f21f71..36e4e34 100644
--- a/modules/audio_processing/aec3/suppression_gain.h
+++ b/modules/audio_processing/aec3/suppression_gain.h
@@ -40,6 +40,7 @@
const rtc::Optional<int>& narrow_peak_band,
bool saturated_echo,
bool saturating_echo_path,
+ bool initial_state,
bool linear_echo_estimate,
const std::array<float, kFftLengthBy2Plus1>& nearend,
const std::array<float, kFftLengthBy2Plus1>& echo,
diff --git a/modules/audio_processing/include/audio_processing.h b/modules/audio_processing/include/audio_processing.h
index 63da80c..31b41e7 100644
--- a/modules/audio_processing/include/audio_processing.h
+++ b/modules/audio_processing/include/audio_processing.h
@@ -1313,6 +1313,7 @@
};
GainChanges low_noise = {3.f, 3.f, 1.5f, 1.5f, 1.5f, 1.5f};
+ GainChanges initial = {2.f, 2.f, 1.5f, 1.5f, 1.2f, 1.2f};
GainChanges normal = {2.f, 2.f, 1.5f, 1.5f, 1.2f, 1.2f};
GainChanges saturation = {1.2f, 1.2f, 1.5f, 1.5f, 1.f, 1.f};
GainChanges nonlinear = {1.5f, 1.5f, 1.2f, 1.2f, 1.1f, 1.1f};