From ded86c1ad80b1f68ffdca2fdddcb4545a6b02ce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20=C3=85hgren?= Date: Mon, 9 Dec 2019 20:47:39 +0100 Subject: [PATCH] Remove remaining settings for using legacy AEC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This CL removes the remaining settings for using the legacy AEC. It also adds a missing printout of the enforce_high_pass_filtering parameter in the ToString method. Bug: webrtc:11165 Change-Id: I58f0861bf1c6cd24bd83f4d3e394653b2fab3d71 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/161683 Reviewed-by: Niels Moller Reviewed-by: Sam Zackrisson Commit-Queue: Per Åhgren Cr-Commit-Position: refs/heads/master@{#30050} --- media/engine/webrtc_voice_engine_unittest.cc | 1 - modules/audio_processing/audio_processing_impl.cc | 3 --- modules/audio_processing/include/audio_processing.cc | 5 ++--- modules/audio_processing/include/audio_processing.h | 6 ------ modules/audio_processing/test/audio_processing_simulator.cc | 1 - 5 files changed, 2 insertions(+), 14 deletions(-) diff --git a/media/engine/webrtc_voice_engine_unittest.cc b/media/engine/webrtc_voice_engine_unittest.cc index d34383c0a2..1d82f0d2d0 100644 --- a/media/engine/webrtc_voice_engine_unittest.cc +++ b/media/engine/webrtc_voice_engine_unittest.cc @@ -764,7 +764,6 @@ class WebRtcVoiceEngineTestFake : public ::testing::Test { #endif EXPECT_EQ(apm_config_.echo_canceller.enabled, enabled); EXPECT_EQ(apm_config_.echo_canceller.mobile_mode, kDefaultUseAecm); - EXPECT_FALSE(apm_config_.echo_canceller.use_legacy_aec); } bool IsHighPassFilterEnabled() { diff --git a/modules/audio_processing/audio_processing_impl.cc b/modules/audio_processing/audio_processing_impl.cc index 4d9cdb4d65..d544304070 100644 --- a/modules/audio_processing/audio_processing_impl.cc +++ b/modules/audio_processing/audio_processing_impl.cc @@ -658,9 +658,6 @@ void AudioProcessingImpl::ApplyConfig(const AudioProcessing::Config& config) { config_ = config; - // Ensure that this deprecated setting is not used by mistake. - RTC_DCHECK(!config_.echo_canceller.use_legacy_aec); - if (aec_config_changed) { InitializeEchoController(); } diff --git a/modules/audio_processing/include/audio_processing.cc b/modules/audio_processing/include/audio_processing.cc index eccc365fc0..282f07a505 100644 --- a/modules/audio_processing/include/audio_processing.cc +++ b/modules/audio_processing/include/audio_processing.cc @@ -83,9 +83,8 @@ std::string AudioProcessing::Config::ToString() const { << " }, high_pass_filter: { enabled: " << high_pass_filter.enabled << " }, echo_canceller: { enabled: " << echo_canceller.enabled << ", mobile_mode: " << echo_canceller.mobile_mode - << ", legacy_moderate_suppression_level: " - << echo_canceller.legacy_moderate_suppression_level - << ", use_legacy_aec: " << echo_canceller.use_legacy_aec + << ", enforce_high_pass_filtering: " + << echo_canceller.enforce_high_pass_filtering << " }, noise_suppression: { enabled: " << noise_suppression.enabled << ", level: " << NoiseSuppressionLevelToString(noise_suppression.level) diff --git a/modules/audio_processing/include/audio_processing.h b/modules/audio_processing/include/audio_processing.h index 2340834278..2f679196b0 100644 --- a/modules/audio_processing/include/audio_processing.h +++ b/modules/audio_processing/include/audio_processing.h @@ -229,12 +229,6 @@ class RTC_EXPORT AudioProcessing : public rtc::RefCountInterface { struct EchoCanceller { bool enabled = false; bool mobile_mode = false; - // Recommended not to use. Will be removed in the future. - // TODO(peah): Remove. - bool legacy_moderate_suppression_level = false; - // Recommended not to use. Will be removed in the future. - // TODO(webrtc:11165): Remove. - bool use_legacy_aec = false; bool export_linear_aec_output = false; // Enforce the highpass filter to be on (has no effect for the mobile // mode). diff --git a/modules/audio_processing/test/audio_processing_simulator.cc b/modules/audio_processing/test/audio_processing_simulator.cc index 5677600fd0..89a9f134fc 100644 --- a/modules/audio_processing/test/audio_processing_simulator.cc +++ b/modules/audio_processing/test/audio_processing_simulator.cc @@ -437,7 +437,6 @@ void AudioProcessingSimulator::CreateAudioProcessor() { if (use_aec || use_aecm) { apm_config.echo_canceller.enabled = true; apm_config.echo_canceller.mobile_mode = use_aecm; - apm_config.echo_canceller.use_legacy_aec = false; } apm_config.echo_canceller.export_linear_aec_output = !!settings_.linear_aec_output_filename;