Ducking fix #1:Initial refactoring preparing for further AEC work (changes are bitexact).

webrtc/modules/audio_processing/aec/aec_core_sse2.c

 /*
  *  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 56 matching lines @@
                         aec->wfBuf[0][pos + j],
                         aec->wfBuf[1][pos + j]);
       yf[1][j] += MulIm(aec->xfBuf[0][xPos + j],
                         aec->xfBuf[1][xPos + j],
                         aec->wfBuf[0][pos + j],
                         aec->wfBuf[1][pos + j]);
     }
   }
 }
 
-static void ScaleErrorSignalSSE2(AecCore* aec, float ef[2][PART_LEN1]) {
+static void ScaleErrorSignalSSE2(int extended_filter_enabled,
+                                 float normal_mu,
+                                 float normal_error_threshold,
+                                 float *x_pow,
+                                 float ef[2][PART_LEN1]) {
   const __m128 k1e_10f = _mm_set1_ps(1e-10f);
-  const __m128 kMu = aec->extended_filter_enabled ? _mm_set1_ps(kExtendedMu)
-                                                  : _mm_set1_ps(aec->normal_mu);
-  const __m128 kThresh = aec->extended_filter_enabled
+  const __m128 kMu = extended_filter_enabled ? _mm_set1_ps(kExtendedMu)
+      : _mm_set1_ps(normal_mu);
+  const __m128 kThresh = extended_filter_enabled
                              ? _mm_set1_ps(kExtendedErrorThreshold)
-                             : _mm_set1_ps(aec->normal_error_threshold);
+                             : _mm_set1_ps(normal_error_threshold);
 
   int i;
   // vectorized code (four at once)
   for (i = 0; i + 3 < PART_LEN1; i += 4) {
-    const __m128 xPow = _mm_loadu_ps(&aec->xPow[i]);
+    const __m128 x_pow_local = _mm_loadu_ps(&x_pow[i]);
     const __m128 ef_re_base = _mm_loadu_ps(&ef[0][i]);
     const __m128 ef_im_base = _mm_loadu_ps(&ef[1][i]);
 
-    const __m128 xPowPlus = _mm_add_ps(xPow, k1e_10f);
+    const __m128 xPowPlus = _mm_add_ps(x_pow_local, k1e_10f);
     __m128 ef_re = _mm_div_ps(ef_re_base, xPowPlus);
     __m128 ef_im = _mm_div_ps(ef_im_base, xPowPlus);
     const __m128 ef_re2 = _mm_mul_ps(ef_re, ef_re);
     const __m128 ef_im2 = _mm_mul_ps(ef_im, ef_im);
     const __m128 ef_sum2 = _mm_add_ps(ef_re2, ef_im2);
     const __m128 absEf = _mm_sqrt_ps(ef_sum2);
     const __m128 bigger = _mm_cmpgt_ps(absEf, kThresh);
     __m128 absEfPlus = _mm_add_ps(absEf, k1e_10f);
     const __m128 absEfInv = _mm_div_ps(kThresh, absEfPlus);
     __m128 ef_re_if = _mm_mul_ps(ef_re, absEfInv);
     __m128 ef_im_if = _mm_mul_ps(ef_im, absEfInv);
     ef_re_if = _mm_and_ps(bigger, ef_re_if);
     ef_im_if = _mm_and_ps(bigger, ef_im_if);
     ef_re = _mm_andnot_ps(bigger, ef_re);
     ef_im = _mm_andnot_ps(bigger, ef_im);
     ef_re = _mm_or_ps(ef_re, ef_re_if);
     ef_im = _mm_or_ps(ef_im, ef_im_if);
     ef_re = _mm_mul_ps(ef_re, kMu);
     ef_im = _mm_mul_ps(ef_im, kMu);
 
     _mm_storeu_ps(&ef[0][i], ef_re);
     _mm_storeu_ps(&ef[1][i], ef_im);
   }
   // scalar code for the remaining items.
   {
     const float mu =
-        aec->extended_filter_enabled ? kExtendedMu : aec->normal_mu;
-    const float error_threshold = aec->extended_filter_enabled
+        extended_filter_enabled ? kExtendedMu : normal_mu;
+    const float error_threshold = extended_filter_enabled
                                       ? kExtendedErrorThreshold
-                                      : aec->normal_error_threshold;
+                                      : normal_error_threshold;
     for (; i < (PART_LEN1); i++) {
       float abs_ef;
-      ef[0][i] /= (aec->xPow[i] + 1e-10f);
-      ef[1][i] /= (aec->xPow[i] + 1e-10f);
+      ef[0][i] /= (x_pow[i] + 1e-10f);
+      ef[1][i] /= (x_pow[i] + 1e-10f);
       abs_ef = sqrtf(ef[0][i] * ef[0][i] + ef[1][i] * ef[1][i]);
 
       if (abs_ef > error_threshold) {
         abs_ef = error_threshold / (abs_ef + 1e-10f);
         ef[0][i] *= abs_ef;
         ef[1][i] *= abs_ef;
       }
 
       // Stepsize factor
       ef[0][i] *= mu;
@@ skipping 585 matching lines @@
   }
 }
 
 void WebRtcAec_InitAec_SSE2(void) {
   WebRtcAec_FilterFar = FilterFarSSE2;
   WebRtcAec_ScaleErrorSignal = ScaleErrorSignalSSE2;
   WebRtcAec_FilterAdaptation = FilterAdaptationSSE2;
   WebRtcAec_OverdriveAndSuppress = OverdriveAndSuppressSSE2;
   WebRtcAec_SubbandCoherence = SubbandCoherenceSSE2;
 }