Broke apart the functionalities in the SubbandCoherence method in the AEC

webrtc/modules/audio_processing/aec/aec_core_sse2.cc

 /*
  *  Copyright (c) 2011 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 479 matching lines @@
 
 // Updates the following smoothed  Power Spectral Densities (PSD):
 //  - sd  : near-end
 //  - se  : residual echo
 //  - sx  : far-end
 //  - sde : cross-PSD of near-end and residual echo
 //  - sxd : cross-PSD of near-end and far-end
 //
 // In addition to updating the PSDs, also the filter diverge state is determined
 // upon actions are taken.
-static void SmoothedPSD(int mult,
-                        bool extended_filter_enabled,
-                        float efw[2][PART_LEN1],
-                        float dfw[2][PART_LEN1],
-                        float xfw[2][PART_LEN1],
-                        CoherenceState* coherence_state,
-                        short* filter_divergence_state,
-                        int* extreme_filter_divergence) {
+static void UpdateCoherenceSpectraSSE2(int mult,
+                                       bool extended_filter_enabled,
+                                       float efw[2][PART_LEN1],
+                                       float dfw[2][PART_LEN1],
+                                       float xfw[2][PART_LEN1],
+                                       CoherenceState* coherence_state,
+                                       short* filter_divergence_state,
+                                       int* extreme_filter_divergence) {
   // Power estimate smoothing coefficients.
   const float* ptrGCoh =
       extended_filter_enabled
           ? WebRtcAec_kExtendedSmoothingCoefficients[mult - 1]
           : WebRtcAec_kNormalSmoothingCoefficients[mult - 1];
   int i;
   float sdSum = 0, seSum = 0;
   const __m128 vec_15 = _mm_set1_ps(WebRtcAec_kMinFarendPSD);
   const __m128 vec_GCoh0 = _mm_set1_ps(ptrGCoh[0]);
   const __m128 vec_GCoh1 = _mm_set1_ps(ptrGCoh[1]);
@@ skipping 155 matching lines @@
     _mm_storeu_ps(&data_complex[0][i], vec_a);
     _mm_storeu_ps(&data_complex[1][i], vec_b);
   }
   // fix beginning/end values
   data_complex[1][0] = 0;
   data_complex[1][PART_LEN] = 0;
   data_complex[0][0] = data[0];
   data_complex[0][PART_LEN] = data[1];
 }
 
-static void SubbandCoherenceSSE2(int mult,
-                                 bool extended_filter_enabled,
-                                 float efw[2][PART_LEN1],
-                                 float dfw[2][PART_LEN1],
-                                 float xfw[2][PART_LEN1],
-                                 float* fft,
+static void ComputeCoherenceSSE2(const CoherenceState* coherence_state,
                                  float* cohde,
-                                 float* cohxd,
-                                 CoherenceState* coherence_state,
-                                 short* filter_divergence_state,
-                                 int* extreme_filter_divergence) {
+                                 float* cohxd) {
   int i;
 
-  SmoothedPSD(mult, extended_filter_enabled, efw, dfw, xfw, coherence_state,
-              filter_divergence_state, extreme_filter_divergence);
-
   {
     const __m128 vec_1eminus10 = _mm_set1_ps(1e-10f);
 
     // Subband coherence
     for (i = 0; i + 3 < PART_LEN1; i += 4) {
       const __m128 vec_sd = _mm_loadu_ps(&coherence_state->sd[i]);
       const __m128 vec_se = _mm_loadu_ps(&coherence_state->se[i]);
       const __m128 vec_sx = _mm_loadu_ps(&coherence_state->sx[i]);
       const __m128 vec_sdse =
           _mm_add_ps(vec_1eminus10, _mm_mul_ps(vec_sd, vec_se));
@@ skipping 31 matching lines @@
                  (coherence_state->sx[i] * coherence_state->sd[i] + 1e-10f);
     }
   }
 }
 
 void WebRtcAec_InitAec_SSE2(void) {
   WebRtcAec_FilterFar = FilterFarSSE2;
   WebRtcAec_ScaleErrorSignal = ScaleErrorSignalSSE2;
   WebRtcAec_FilterAdaptation = FilterAdaptationSSE2;
   WebRtcAec_OverdriveAndSuppress = OverdriveAndSuppressSSE2;
-  WebRtcAec_SubbandCoherence = SubbandCoherenceSSE2;
+  WebRtcAec_ComputeCoherence = ComputeCoherenceSSE2;
+  WebRtcAec_UpdateCoherenceSpectra = UpdateCoherenceSpectraSSE2;
   WebRtcAec_StoreAsComplex = StoreAsComplexSSE2;
   WebRtcAec_PartitionDelay = PartitionDelaySSE2;
   WebRtcAec_WindowData = WindowDataSSE2;
 }
 }  // namespace webrtc