Added basic framework for AEC3 in the audio processing module

webrtc/modules/audio_processing/include/audio_processing.h

 /*
  *  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 50 matching lines @@
 //   the delay difference more heavily, and back off from the difference more.
 //   Adjustments force a readaptation of the filter, so they should be avoided
 //   except when really necessary.
 struct ExtendedFilter {
   ExtendedFilter() : enabled(false) {}
   explicit ExtendedFilter(bool enabled) : enabled(enabled) {}
   static const ConfigOptionID identifier = ConfigOptionID::kExtendedFilter;
   bool enabled;
 };
 
-// Enables the next generation AEC functionality. This feature replaces the
-// standard methods for echo removal in the AEC. This configuration only applies
-// to EchoCancellation and not EchoControlMobile. It can be set in the
-// constructor or using AudioProcessing::SetExtraOptions().
-struct EchoCanceller3 {
-  EchoCanceller3() : enabled(false) {}
-  explicit EchoCanceller3(bool enabled) : enabled(enabled) {}
-  static const ConfigOptionID identifier = ConfigOptionID::kEchoCanceller3;
-  bool enabled;
-};
-
 // Enables the refined linear filter adaptation in the echo canceller.
 // This configuration only applies to EchoCancellation and not
 // EchoControlMobile. It can be set in the constructor
 // or using AudioProcessing::SetExtraOptions().
 struct RefinedAdaptiveFilter {
   RefinedAdaptiveFilter() : enabled(false) {}
   explicit RefinedAdaptiveFilter(bool enabled) : enabled(enabled) {}
   static const ConfigOptionID identifier =
       ConfigOptionID::kAecRefinedAdaptiveFilter;
   bool enabled;
@@ skipping 175 matching lines @@
 #if defined(WEBRTC_ANDROID) || defined(WEBRTC_IOS)
       bool enabled = false;
 #else
       bool enabled = true;
 #endif
     } residual_echo_detector;
 
     struct HighPassFilter {
       bool enabled = false;
     } high_pass_filter;
+
+    // Enables the next generation AEC functionality. This feature replaces the
+    // standard methods for echo removal in the AEC.
+    // The functionality is not yet activated in the code and turning this on
+    // does not yet have the desired behavior.
+    struct EchoCanceller3 {
+      bool enabled = false;
+    } echo_canceller3;
   };
 
   // TODO(mgraczyk): Remove once all methods that use ChannelLayout are gone.
   enum ChannelLayout {
     kMono,
     // Left, right.
     kStereo,
     // Mono, keyboard, and mic.
     kMonoAndKeyboard,
     // Left, right, keyboard, and mic.
@@ skipping 794 matching lines @@
   // This does not impact the size of frames passed to |ProcessStream()|.
   virtual int set_frame_size_ms(int size) = 0;
   virtual int frame_size_ms() const = 0;
 
  protected:
   virtual ~VoiceDetection() {}
 };
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_PROCESSING_INCLUDE_AUDIO_PROCESSING_H_