Separated the functionalities in the OverdriveAndSuppress method in the AEC into two methods

webrtc/modules/audio_processing/aec/aec_core_mips.cc

 /*
  *  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 326 matching lines @@
       ".set     pop                                     \n\t"
       : [f0] "=&f" (f0), [f1] "=&f" (f1), [f2] "=&f" (f2),
         [f3] "=&f" (f3), [f4] "=&f" (f4), [f5] "=&f" (f5),
         [f6] "=&f" (f6), [f7] "=&f" (f7), [len] "=&r" (len),
         [fft_tmp] "=&r" (fft_tmp), [aRe] "+r" (aRe), [aIm] "+r" (aIm)
       : [fft] "r" (fft)
       : "memory");
   }
 }
 
-void WebRtcAec_OverdriveAndSuppress_mips(float overdrive_scaling,
-                                         float hNl[PART_LEN1],
-                                         const float hNlFb,
-                                         float efw[2][PART_LEN1]) {
-  int i;
+void WebRtcAec_Overdrive_mips(float overdrive_scaling,
+                              float hNlFb,
+                              float hNl[PART_LEN1]) {
   const float one = 1.0;
   float* p_hNl;
-  float* p_efw0;
-  float* p_efw1;
   const float* p_WebRtcAec_wC;
   float temp1, temp2, temp3, temp4;
 
   p_hNl = &hNl[0];
-  p_efw0 = &efw[0][0];
-  p_efw1 = &efw[1][0];
   p_WebRtcAec_wC = &WebRtcAec_weightCurve[0];
 
-  for (i = 0; i < PART_LEN1; i++) {
+  for (int i = 0; i < PART_LEN1; ++i) {
     // Weight subbands
     __asm __volatile(
       ".set      push                                              \n\t"
       ".set      noreorder                                         \n\t"
       "lwc1      %[temp1],    0(%[p_hNl])                          \n\t"
       "lwc1      %[temp2],    0(%[p_wC])                           \n\t"
       "c.lt.s    %[hNlFb],    %[temp1]                             \n\t"
       "bc1f      1f                                                \n\t"
       " mul.s    %[temp3],    %[temp2],     %[hNlFb]               \n\t"
       "sub.s     %[temp4],    %[one],       %[temp2]               \n\t"
 #if !defined(MIPS32_R2_LE)
       "mul.s     %[temp1],    %[temp1],     %[temp4]               \n\t"
       "add.s     %[temp1],    %[temp3],     %[temp1]               \n\t"
 #else  // #if !defined(MIPS32_R2_LE)
       "madd.s    %[temp1],    %[temp3],     %[temp1],   %[temp4]   \n\t"
 #endif  // #if !defined(MIPS32_R2_LE)
       "swc1      %[temp1],    0(%[p_hNl])                          \n\t"
      "1:                                                           \n\t"
       "addiu     %[p_wC],     %[p_wC],      4                      \n\t"
       ".set      pop                                               \n\t"
       : [temp1] "=&f" (temp1), [temp2] "=&f" (temp2), [temp3] "=&f" (temp3),
         [temp4] "=&f" (temp4), [p_wC] "+r" (p_WebRtcAec_wC)
       : [hNlFb] "f" (hNlFb), [one] "f" (one), [p_hNl] "r" (p_hNl)
       : "memory");
 
     hNl[i] = powf(hNl[i], overdrive_scaling * WebRtcAec_overDriveCurve[i]);
+  }
+}
 
+void WebRtcAec_Suppress_mips(const float hNl[PART_LEN1],
+                             float efw[2][PART_LEN1]) {
+  const float* p_hNl;
+  float* p_efw0;
+  float* p_efw1;
+  float temp1, temp2, temp3, temp4;
+
+  p_hNl = &hNl[0];
+  p_efw0 = &efw[0][0];
+  p_efw1 = &efw[1][0];
+
+  for (int i = 0; i < PART_LEN1; ++i) {
     __asm __volatile(
       "lwc1      %[temp1],    0(%[p_hNl])              \n\t"
       "lwc1      %[temp3],    0(%[p_efw1])             \n\t"
       "lwc1      %[temp2],    0(%[p_efw0])             \n\t"
       "addiu     %[p_hNl],    %[p_hNl],     4          \n\t"
       "mul.s     %[temp3],    %[temp3],     %[temp1]   \n\t"
       "mul.s     %[temp2],    %[temp2],     %[temp1]   \n\t"
       "addiu     %[p_efw0],   %[p_efw0],    4          \n\t"
       "addiu     %[p_efw1],   %[p_efw1],    4          \n\t"
       "neg.s     %[temp4],    %[temp3]                 \n\t"
@@ skipping 66 matching lines @@
       [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_OverdriveAndSuppress = WebRtcAec_OverdriveAndSuppress_mips;
+  WebRtcAec_Overdrive = WebRtcAec_Overdrive_mips;
+  WebRtcAec_Suppress = WebRtcAec_Suppress_mips;
 }
 }  // namespace webrtc