diff --git a/webrtc/modules/audio_processing/aec3/echo_canceller3.cc b/webrtc/modules/audio_processing/aec3/echo_canceller3.cc index 3175c5414c..c85116d72c 100644 --- a/webrtc/modules/audio_processing/aec3/echo_canceller3.cc +++ b/webrtc/modules/audio_processing/aec3/echo_canceller3.cc @@ -334,7 +334,7 @@ std::string EchoCanceller3::ToString( bool EchoCanceller3::Validate( const AudioProcessing::Config::EchoCanceller3& config) { - return (config.echo_decay >= 0.f && config.echo_decay < 1.f); + return true; } void EchoCanceller3::EmptyRenderQueue() { diff --git a/webrtc/modules/audio_processing/aec3/echo_canceller3_unittest.cc b/webrtc/modules/audio_processing/aec3/echo_canceller3_unittest.cc index 376cf1edfb..3a4550077d 100644 --- a/webrtc/modules/audio_processing/aec3/echo_canceller3_unittest.cc +++ b/webrtc/modules/audio_processing/aec3/echo_canceller3_unittest.cc @@ -684,17 +684,7 @@ TEST(EchoCanceller3Messaging, EchoLeakage) { TEST(EchoCanceller3, ConfigValidation) { AudioProcessing::Config::EchoCanceller3 config; - - config.echo_decay = 0.f; EXPECT_TRUE(EchoCanceller3::Validate(config)); - config.echo_decay = 0.9f; - EXPECT_TRUE(EchoCanceller3::Validate(config)); - config.echo_decay = -0.1f; - EXPECT_FALSE(EchoCanceller3::Validate(config)); - config.echo_decay = 1.0f; - EXPECT_FALSE(EchoCanceller3::Validate(config)); - config.echo_decay = 1.1f; - EXPECT_FALSE(EchoCanceller3::Validate(config)); } #if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID) diff --git a/webrtc/modules/audio_processing/aec3/echo_remover.cc b/webrtc/modules/audio_processing/aec3/echo_remover.cc index 0c6184e3bb..9828192b91 100644 --- a/webrtc/modules/audio_processing/aec3/echo_remover.cc +++ b/webrtc/modules/audio_processing/aec3/echo_remover.cc @@ -104,7 +104,7 @@ EchoRemoverImpl::EchoRemoverImpl( suppression_gain_(optimization_), cng_(optimization_), suppression_filter_(sample_rate_hz_), - aec_state_(config.echo_decay) { + aec_state_(0.8f) { RTC_DCHECK(ValidFullBandRate(sample_rate_hz)); } diff --git a/webrtc/modules/audio_processing/include/audio_processing.h b/webrtc/modules/audio_processing/include/audio_processing.h index 6dc6e3fc76..05be5feeb1 100644 --- a/webrtc/modules/audio_processing/include/audio_processing.h +++ b/webrtc/modules/audio_processing/include/audio_processing.h @@ -268,7 +268,6 @@ class AudioProcessing : public rtc::RefCountInterface { // does not yet have the desired behavior. struct EchoCanceller3 { bool enabled = false; - float echo_decay = 0.f; } echo_canceller3; // Enables the next generation AGC functionality. This feature replaces the