Refactoring of the buffering of the nearend signal done 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 110 matching lines @@
   std::unique_ptr<ApmDataDumper> data_dumper;
 
   CoherenceState coherence_state;
 
   int farBufWritePos, farBufReadPos;
 
   int knownDelay;
   int inSamples, outSamples;
   int delayEstCtr;
 
-  RingBuffer* nearFrBuf;
+  // Nearend buffer used for changing from FRAME_LEN to PART_LEN sample block
+  // sizes. The buffer stores all the incoming bands and for each band a maximum
+  // of PART_LEN - (FRAME_LEN - PART_LEN) values need to be buffered in order to
+  // change the block size from FRAME_LEN to PART_LEN.
+  float nearend_buffer[NUM_HIGH_BANDS_MAX + 1]
+                      [PART_LEN - (FRAME_LEN - PART_LEN)];
+  int nearend_buffer_size;
   RingBuffer* outFrBuf;
 
-  RingBuffer* nearFrBufH[NUM_HIGH_BANDS_MAX];
   RingBuffer* outFrBufH[NUM_HIGH_BANDS_MAX];
 
-  float dBuf[PART_LEN2];  // nearend
   float eBuf[PART_LEN2];  // error
 
-  float dBufH[NUM_HIGH_BANDS_MAX][PART_LEN2];  // nearend
+  float previous_nearend_block[NUM_HIGH_BANDS_MAX + 1][PART_LEN];
 
   float xPow[PART_LEN1];
   float dPow[PART_LEN1];
   float dMinPow[PART_LEN1];
   float dInitMinPow[PART_LEN1];
   float* noisePow;
 
   float xfBuf[2][kExtendedNumPartitions * PART_LEN1];  // farend fft buffer
   float wfBuf[2][kExtendedNumPartitions * PART_LEN1];  // filter fft
   // Farend windowed fft buffer.
@@ skipping 162 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_