Major updates to the echo removal functionality in AEC3

webrtc/modules/audio_processing/aec3/subtractor.h

Index: webrtc/modules/audio_processing/aec3/subtractor.h
diff --git a/webrtc/modules/audio_processing/aec3/subtractor.h b/webrtc/modules/audio_processing/aec3/subtractor.h
index 671f6c8a51eb6047fc523926bff85500bf4dfe24..a127141be348c1552a85d6115059e2b4e7b4ff41 100644
--- a/webrtc/modules/audio_processing/aec3/subtractor.h
+++ b/webrtc/modules/audio_processing/aec3/subtractor.h
@@ -19,6 +19,7 @@
 #include "webrtc/modules/audio_processing/aec3/adaptive_fir_filter.h"
 #include "webrtc/modules/audio_processing/aec3/aec3_common.h"
 #include "webrtc/modules/audio_processing/aec3/aec3_fft.h"
+#include "webrtc/modules/audio_processing/aec3/aec_state.h"
 #include "webrtc/modules/audio_processing/aec3/echo_path_variability.h"
 #include "webrtc/modules/audio_processing/aec3/main_filter_update_gain.h"
 #include "webrtc/modules/audio_processing/aec3/render_buffer.h"
@@ -39,18 +40,9 @@ class Subtractor {
   void Process(const RenderBuffer& render_buffer,
                const rtc::ArrayView<const float> capture,
                const RenderSignalAnalyzer& render_signal_analyzer,
-               bool saturation,
+               const AecState& aec_state,
                SubtractorOutput* output);
 
-  // Returns a vector with the number of blocks included in the render buffer
-  // sums.
-  std::vector<size_t> NumBlocksInRenderSums() const;
-
-  // Returns the minimum required farend buffer length.
-  size_t MinFarendBufferLength() const {
-    return std::max(kMainFilterSizePartitions, kShadowFilterSizePartitions);
-  }
-
   void HandleEchoPathChange(const EchoPathVariability& echo_path_variability);
 
   // Returns the block-wise frequency response of the main adaptive filter.
@@ -60,9 +52,6 @@ class Subtractor {
   }
 
  private:
-  const size_t kMainFilterSizePartitions = 12;
-  const size_t kShadowFilterSizePartitions = 12;
-
   const Aec3Fft fft_;
   ApmDataDumper* data_dumper_;
   const Aec3Optimization optimization_;