Refactoring of the farend buffering scheme inside the AEC

webrtc/modules/audio_processing/aec/aec_core.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 65 matching lines @@
 };
 
 typedef struct PowerLevel {
   PowerLevel();
 
   BlockMeanCalculator framelevel;
   BlockMeanCalculator averagelevel;
   float minlevel;
 } PowerLevel;
 
+class BlockBuffer {
+ public:
+  BlockBuffer();
+  ~BlockBuffer();
+  void ReInit();
+  void Insert(const float block[PART_LEN]);
+  void ExtractExtendedBlock(float extended_block[PART_LEN]);
+  int AdjustSize(int buffer_size_decrease);
+  size_t Size();
+  size_t AvaliableSpace();
+
+ private:
+  RingBuffer* buffer_;
+};
+
 class DivergentFilterFraction {
  public:
   DivergentFilterFraction();
 
   // Reset.
   void Reset();
 
   void AddObservation(const PowerLevel& nearlevel,
                       const PowerLevel& linoutlevel,
                       const PowerLevel& nlpoutlevel);
@@ skipping 65 matching lines @@
   float overdrive_scaling;
   int nlp_mode;
   float outBuf[PART_LEN];
   int delayIdx;
 
   short stNearState, echoState;
   short divergeState;
 
   int xfBufBlockPos;
 
-  RingBuffer* far_time_buf;
+  BlockBuffer farend_block_buffer_;
 
   int system_delay;  // Current system delay buffered in AEC.
 
   int mult;  // sampling frequency multiple
   int sampFreq = 16000;
   size_t num_bands;
   uint32_t seed;
 
   float filter_step_size;  // stepsize
   float error_threshold;   // error threshold
@@ skipping 57 matching lines @@
 void WebRtcAec_FreeAec(AecCore* aec);
 int WebRtcAec_InitAec(AecCore* aec, int sampFreq);
 void WebRtcAec_InitAec_SSE2(void);
 #if defined(MIPS_FPU_LE)
 void WebRtcAec_InitAec_mips(void);
 #endif
 #if defined(WEBRTC_HAS_NEON)
 void WebRtcAec_InitAec_neon(void);
 #endif
 
-void WebRtcAec_BufferFarendPartition(AecCore* aec, const float* farend);
+void WebRtcAec_BufferFarendBlock(AecCore* aec, const float* farend);
 void WebRtcAec_ProcessFrames(AecCore* aec,
                              const float* const* nearend,
                              size_t num_bands,
                              size_t num_samples,
                              int knownDelay,
                              float* const* out);
 
-// A helper function to call WebRtc_MoveReadPtr() for all far-end buffers.
-// Returns the number of elements moved, and adjusts |system_delay| by the
-// corresponding amount in ms.
-int WebRtcAec_MoveFarReadPtr(AecCore* aec, int elements);
+// A helper function to call adjust the farend buffer size.
+// Returns the number of elements the size was decreased with, and adjusts
+// |system_delay| by the corresponding amount in ms.
+int WebRtcAec_AdjustFarendBufferSizeAndSystemDelay(AecCore* aec,
+                                                   int size_decrease);
 
 // Calculates the median, standard deviation and amount of poor values among the
 // delay estimates aggregated up to the first call to the function. After that
 // first call the metrics are aggregated and updated every second. With poor
 // values we mean values that most likely will cause the AEC to perform poorly.
 // TODO(bjornv): Consider changing tests and tools to handle constant
 // constant aggregation window throughout the session instead.
 int WebRtcAec_GetDelayMetricsCore(AecCore* self,
                                   int* median,
                                   int* std,
@@ skipping 45 matching lines @@
 int WebRtcAec_system_delay(AecCore* self);
 
 // Sets the |system_delay| to |value|.  Note that if the value is changed
 // improperly, there can be a performance regression.  So it should be used with
 // care.
 void WebRtcAec_SetSystemDelay(AecCore* self, int delay);
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_H_