Ducking fix #2: Removed the aec state as an input parameter to the FilterFar function.

webrtc/modules/audio_processing/aec/aec_core_mips.c

 /*
  *  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 302 matching lines @@
     u[PART_LEN][1] = 0;
 
     for (i = 0; i < PART_LEN1; i++) {
       // Use average NLP weight for H band
       comfortNoiseHband[i][0] = tmpAvg * u[i][0];
       comfortNoiseHband[i][1] = tmpAvg * u[i][1];
     }
   }
 }
 
-void WebRtcAec_FilterFar_mips(AecCore* aec, float yf[2][PART_LEN1]) {
+void WebRtcAec_FilterFar_mips(
+    int num_partitions,
+    int xfBufBlockPos,
+    float xfBuf[2][kExtendedNumPartitions * PART_LEN1],
+    float wfBuf[2][kExtendedNumPartitions * PART_LEN1],
+    float yf[2][PART_LEN1]) {
   int i;
-  for (i = 0; i < aec->num_partitions; i++) {
-    int xPos = (i + aec->xfBufBlockPos) * PART_LEN1;
+  for (i = 0; i < num_partitions; i++) {
+    int xPos = (i + xfBufBlockPos) * PART_LEN1;
     int pos = i * PART_LEN1;
     // Check for wrap
-    if (i + aec->xfBufBlockPos >=  aec->num_partitions) {
-      xPos -=  aec->num_partitions * (PART_LEN1);
+    if (i + xfBufBlockPos >=  num_partitions) {
+      xPos -=  num_partitions * (PART_LEN1);
     }
     float* yf0 = yf[0];
     float* yf1 = yf[1];
-    float* aRe = aec->xfBuf[0] + xPos;
-    float* aIm = aec->xfBuf[1] + xPos;
-    float* bRe = aec->wfBuf[0] + pos;
-    float* bIm = aec->wfBuf[1] + pos;
+    float* aRe = xfBuf[0] + xPos;
+    float* aIm = xfBuf[1] + xPos;
+    float* bRe = wfBuf[0] + pos;
+    float* bIm = wfBuf[1] + pos;
     float f0, f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13;
     int len = PART_LEN1 >> 1;
 
     __asm __volatile (
       ".set       push                                                \n\t"
       ".set       noreorder                                           \n\t"
      "1:                                                              \n\t"
       "lwc1       %[f0],      0(%[aRe])                               \n\t"
       "lwc1       %[f1],      0(%[bRe])                               \n\t"
       "lwc1       %[f2],      0(%[bIm])                               \n\t"
@@ skipping 367 matching lines @@
   float err_th2 = error_threshold * error_threshold;
   float f0, f1, f2;
 #if !defined(MIPS32_R2_LE)
   float f3;
 #endif
 
   __asm __volatile (
     ".set       push                                   \n\t"
     ".set       noreorder                              \n\t"
    "1:                                                 \n\t"
-    "lwc1       %[f0],     0(%[x_pow])                  \n\t"
+    "lwc1       %[f0],     0(%[x_pow])                 \n\t"
     "lwc1       %[f1],     0(%[ef0])                   \n\t"
     "lwc1       %[f2],     0(%[ef1])                   \n\t"
     "add.s      %[f0],     %[f0],       %[fac1]        \n\t"
     "div.s      %[f1],     %[f1],       %[f0]          \n\t"
     "div.s      %[f2],     %[f2],       %[f0]          \n\t"
     "mul.s      %[f0],     %[f1],       %[f1]          \n\t"
 #if defined(MIPS32_R2_LE)
     "madd.s     %[f0],     %[f0],       %[f2],   %[f2] \n\t"
 #else
     "mul.s      %[f3],     %[f2],       %[f2]          \n\t"
     "add.s      %[f0],     %[f0],       %[f3]          \n\t"
 #endif
     "c.le.s     %[f0],     %[err_th2]                  \n\t"
     "nop                                               \n\t"
     "bc1t       2f                                     \n\t"
     " nop                                              \n\t"
     "sqrt.s     %[f0],     %[f0]                       \n\t"
     "add.s      %[f0],     %[f0],       %[fac1]        \n\t"
     "div.s      %[f0],     %[err_th],   %[f0]          \n\t"
     "mul.s      %[f1],     %[f1],       %[f0]          \n\t"
     "mul.s      %[f2],     %[f2],       %[f0]          \n\t"
    "2:                                                 \n\t"
     "mul.s      %[f1],     %[f1],       %[mu]          \n\t"
     "mul.s      %[f2],     %[f2],       %[mu]          \n\t"
     "swc1       %[f1],     0(%[ef0])                   \n\t"
     "swc1       %[f2],     0(%[ef1])                   \n\t"
     "addiu      %[len],    %[len],      -1             \n\t"
-    "addiu      %[x_pow],   %[x_pow],     4              \n\t"
+    "addiu      %[x_pow],  %[x_pow],    4              \n\t"
     "addiu      %[ef0],    %[ef0],      4              \n\t"
     "bgtz       %[len],    1b                          \n\t"
     " addiu     %[ef1],    %[ef1],      4              \n\t"
     ".set       pop                                    \n\t"
     : [f0] "=&f" (f0), [f1] "=&f" (f1), [f2] "=&f" (f2),
 #if !defined(MIPS32_R2_LE)
       [f3] "=&f" (f3),
 #endif
       [x_pow] "+r" (x_pow), [ef0] "+r" (ef0), [ef1] "+r" (ef1),
       [len] "+r" (len)
     : [fac1] "f" (fac1), [err_th2] "f" (err_th2), [mu] "f" (mu),
       [err_th] "f" (error_threshold)
     : "memory"
   );
 }
 
 void WebRtcAec_InitAec_mips(void) {
   WebRtcAec_FilterFar = WebRtcAec_FilterFar_mips;
   WebRtcAec_FilterAdaptation = WebRtcAec_FilterAdaptation_mips;
   WebRtcAec_ScaleErrorSignal = WebRtcAec_ScaleErrorSignal_mips;
   WebRtcAec_ComfortNoise = WebRtcAec_ComfortNoise_mips;
   WebRtcAec_OverdriveAndSuppress = WebRtcAec_OverdriveAndSuppress_mips;
 }