commit d547d862d5bfb2cfaa91f8ddae36be8b5e7e46d0
author Per Åhgren <peah@webrtc.org> Fri May 03 15:48:47 2019 +0200
committer Commit Bot <commit-bot@chromium.org> Fri May 03 14:20:32 2019 +0000
tree 787951c0f13c2651864791bed7a72f4ec0e1f892
parent 9356252bfb75c4f85abe8894ac5f86b20f22e302

Remove the enable flag from AEC2 and AECM

This CL removes the redundant enable flags from AEC2 and AECM

Bug: webrtc:5298
Change-Id: Icc575abf1c368dda02ca77f057d166f1c921f662
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/135100
Commit-Queue: Per Åhgren <peah@webrtc.org>
Reviewed-by: Sam Zackrisson <saza@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27848}

modules/audio_processing/audio_processing_impl.cc

diff --git a/modules/audio_processing/audio_processing_impl.cc b/modules/audio_processing/audio_processing_impl.cc
index ac8afda..13db45f 100644
--- a/modules/audio_processing/audio_processing_impl.cc
+++ b/modules/audio_processing/audio_processing_impl.cc
@@ -1765,10 +1765,8 @@
 bool AudioProcessingImpl::UpdateActiveSubmoduleStates() {
   return submodule_states_.Update(
       config_.high_pass_filter.enabled,
-      private_submodules_->echo_cancellation &&
-          private_submodules_->echo_cancellation->is_enabled(),
-      private_submodules_->echo_control_mobile &&
-          private_submodules_->echo_control_mobile->is_enabled(),
+      !!private_submodules_->echo_cancellation,
+      !!private_submodules_->echo_control_mobile,
       config_.residual_echo_detector.enabled,
       public_submodules_->noise_suppression->is_enabled(),
       public_submodules_->gain_control->is_enabled(),
@@ -1860,8 +1858,6 @@
         proc_split_sample_rate_hz(), num_reverse_channels(),
         num_output_channels());
 
-    private_submodules_->echo_control_mobile->Enable(true);
-
     private_submodules_->echo_cancellation.reset();
     aec_render_signal_queue_.reset();
     return;
@@ -1897,8 +1893,6 @@
       proc_sample_rate_hz(), num_reverse_channels(), num_output_channels(),
       num_proc_channels());
 
-  private_submodules_->echo_cancellation->Enable(true);
-
   private_submodules_->echo_cancellation->set_suppression_level(
       config_.echo_canceller.legacy_moderate_suppression_level
           ? EchoCancellationImpl::SuppressionLevel::kModerateSuppression
@@ -1991,9 +1985,7 @@
                 private_submodules_->echo_cancellation->suppression_level())
           : 0;
 
-  apm_config.aecm_enabled =
-      private_submodules_->echo_control_mobile &&
-      private_submodules_->echo_control_mobile->is_enabled();
+  apm_config.aecm_enabled = !!private_submodules_->echo_control_mobile;
   apm_config.aecm_comfort_noise_enabled =
       private_submodules_->echo_control_mobile &&
       private_submodules_->echo_control_mobile->is_comfort_noise_enabled();