zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove remaining settings for using legacy AEC

Browse Source 
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 <nisse@webrtc.org>
Reviewed-by: Sam Zackrisson <saza@webrtc.org>
Commit-Queue: Per Åhgren <peah@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30050}
This commit is contained in:
Per Åhgren
2019-12-09 20:47:39 +01:00
committed by Commit Bot
parent 60ec3703cd
commit ded86c1ad8
5 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media/engine/webrtc_voice_engine_unittest.cc
View File

@ -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() {

3
modules/audio_processing/audio_processing_impl.cc
View File

@ -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();
}

5
modules/audio_processing/include/audio_processing.cc
View File

@ -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)

6
modules/audio_processing/include/audio_processing.h
View File

@ -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).

1
modules/audio_processing/test/audio_processing_simulator.cc
View File

@ -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;