Added basic framework for AEC3 in the audio processing module

webrtc/modules/audio_processing/echo_cancellation_impl.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 323 matching lines @@
 bool EchoCancellationImpl::is_delay_logging_enabled() const {
   rtc::CritScope cs(crit_capture_);
   return enabled_ && delay_logging_enabled_;
 }
 
 bool EchoCancellationImpl::is_delay_agnostic_enabled() const {
   rtc::CritScope cs(crit_capture_);
   return delay_agnostic_enabled_;
 }
 
-bool EchoCancellationImpl::is_aec3_enabled() const {
-  rtc::CritScope cs(crit_capture_);
-  return aec3_enabled_;
-}
-
 std::string EchoCancellationImpl::GetExperimentsDescription() {
   rtc::CritScope cs(crit_capture_);
-  std::string description = (aec3_enabled_ ? "AEC3;" : "");
+  std::string description = "";

[aleloi, 2016/12/09 13:30:04]

Maybe change body to ternary operator one-liner?

[peah-webrtc, 2016/12/12 19:46:46]

Good point!
Done.

   if (refined_adaptive_filter_enabled_) {
     description += "RefinedAdaptiveFilter;";
   }
   return description;
 }
 
 bool EchoCancellationImpl::is_refined_adaptive_filter_enabled() const {
   rtc::CritScope cs(crit_capture_);
   return refined_adaptive_filter_enabled_;
 }
@@ skipping 104 matching lines @@
   }
 }
 
 void EchoCancellationImpl::SetExtraOptions(const webrtc::Config& config) {
   {
     rtc::CritScope cs(crit_capture_);
     extended_filter_enabled_ = config.Get<ExtendedFilter>().enabled;
     delay_agnostic_enabled_ = config.Get<DelayAgnostic>().enabled;
     refined_adaptive_filter_enabled_ =
         config.Get<RefinedAdaptiveFilter>().enabled;
-    aec3_enabled_ = config.Get<EchoCanceller3>().enabled;
   }
   Configure();
 }
 
 int EchoCancellationImpl::Configure() {
   rtc::CritScope cs_render(crit_render_);
   rtc::CritScope cs_capture(crit_capture_);
   AecConfig config;
   config.metricsMode = metrics_enabled_;
   config.nlpMode = MapSetting(suppression_level_);
   config.skewMode = drift_compensation_enabled_;
   config.delay_logging = delay_logging_enabled_;
 
   int error = AudioProcessing::kNoError;
   for (auto& canceller : cancellers_) {
     WebRtcAec_enable_extended_filter(WebRtcAec_aec_core(canceller->state()),
                                      extended_filter_enabled_ ? 1 : 0);
     WebRtcAec_enable_delay_agnostic(WebRtcAec_aec_core(canceller->state()),
                                     delay_agnostic_enabled_ ? 1 : 0);
-    WebRtcAec_enable_aec3(WebRtcAec_aec_core(canceller->state()),
-                          aec3_enabled_ ? 1 : 0);

[aleloi, 2016/12/09 13:30:04]

The member aec3_enabled_ is not used any longer, so there is no need for it.

[peah-webrtc, 2016/12/12 19:46:46]

Done.

     WebRtcAec_enable_refined_adaptive_filter(
         WebRtcAec_aec_core(canceller->state()),
         refined_adaptive_filter_enabled_);
     const int handle_error = WebRtcAec_set_config(canceller->state(), config);
     if (handle_error != AudioProcessing::kNoError) {
       error = AudioProcessing::kNoError;
     }
   }
   return error;
 }
 
 size_t EchoCancellationImpl::NumCancellersRequired(
     size_t num_output_channels,
     size_t num_reverse_channels) {
   return num_output_channels * num_reverse_channels;
 }
 
 }  // namespace webrtc