Changed the AEC SubbandCoherence function to not use the full aec state

webrtc/modules/audio_processing/aec/aec_core_internal.h

 /*
  *  Copyright (c) 2013 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 54 matching lines @@
   // Clear all values added.
   void Clear();
 
   size_t count_;
   size_t occurrence_;
   float fraction_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(DivergentFilterFraction);
 };
 
+typedef struct CoherenceState {
+  complex_t sde[PART_LEN1];  // cross-psd of nearend and error
+  complex_t sxd[PART_LEN1];  // cross-psd of farend and nearend
+  float sx[PART_LEN1], sd[PART_LEN1], se[PART_LEN1];  // far, near, error psd
+} CoherenceState;
+
 struct AecCore {
   explicit AecCore(int instance_index);
   ~AecCore();
 
   std::unique_ptr<ApmDataDumper> data_dumper;
 
+  CoherenceState coherence_state;
+
   int farBufWritePos, farBufReadPos;
 
   int knownDelay;
   int inSamples, outSamples;
   int delayEstCtr;
 
   RingBuffer* nearFrBuf;
   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 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
-  complex_t sde[PART_LEN1];  // cross-psd of nearend and error
-  complex_t sxd[PART_LEN1];  // cross-psd of farend and nearend
   // Farend windowed fft buffer.
   complex_t xfwBuf[kExtendedNumPartitions * PART_LEN1];
 
-  float sx[PART_LEN1], sd[PART_LEN1], se[PART_LEN1];  // far, near, error psd
   float hNs[PART_LEN1];
   float hNlFbMin, hNlFbLocalMin;
   float hNlXdAvgMin;
   int hNlNewMin, hNlMinCtr;
   float overDrive;
   float overdrive_scaling;
   int nlp_mode;
   float outBuf[PART_LEN];
   int delayIdx;
 
@@ skipping 94 matching lines @@
                                               float efw[2][PART_LEN1]);
 extern WebRtcAecOverdriveAndSuppress WebRtcAec_OverdriveAndSuppress;
 
 typedef void (*WebRtcAecComfortNoise)(AecCore* aec,
                                       float efw[2][PART_LEN1],
                                       float comfortNoiseHband[2][PART_LEN1],
                                       const float* noisePow,
                                       const float* lambda);
 extern WebRtcAecComfortNoise WebRtcAec_ComfortNoise;
 
-typedef void (*WebRtcAecSubBandCoherence)(AecCore* aec,
+typedef void (*WebRtcAecSubBandCoherence)(int mult,
+                                          bool extended_filter_enabled,
                                           float efw[2][PART_LEN1],
                                           float dfw[2][PART_LEN1],
                                           float xfw[2][PART_LEN1],
                                           float* fft,
                                           float* cohde,
                                           float* cohxd,
+                                          CoherenceState* coherence_state,
+                                          short* filter_divergence_state,
                                           int* extreme_filter_divergence);
 extern WebRtcAecSubBandCoherence WebRtcAec_SubbandCoherence;
 
 typedef int (*WebRtcAecPartitionDelay)(const AecCore* aec);
 extern WebRtcAecPartitionDelay WebRtcAec_PartitionDelay;
 
 typedef void (*WebRtcAecStoreAsComplex)(const float* data,
                                         float data_complex[2][PART_LEN1]);
 extern WebRtcAecStoreAsComplex WebRtcAec_StoreAsComplex;
 
 typedef void (*WebRtcAecWindowData)(float* x_windowed, const float* x);
 extern WebRtcAecWindowData WebRtcAec_WindowData;
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_INTERNAL_H_