Removed the state as an input to OverdriveAndSuppress in the AEC.

webrtc/modules/audio_processing/aec/aec_core.cc

 /*
  *  Copyright (c) 2012 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 289 matching lines @@
     h_fft_buf[0][pos] += fft[0];
     h_fft_buf[0][pos + PART_LEN] += fft[1];
 
     for (j = 1; j < PART_LEN; j++) {
       h_fft_buf[0][pos + j] += fft[2 * j];
       h_fft_buf[1][pos + j] += fft[2 * j + 1];
     }
   }
 }
 
-static void OverdriveAndSuppress(AecCore* aec,
+static void OverdriveAndSuppress(float overdrive_scaling,
                                  float hNl[PART_LEN1],
                                  const float hNlFb,
                                  float efw[2][PART_LEN1]) {
   int i;
   for (i = 0; i < PART_LEN1; i++) {
     // Weight subbands
     if (hNl[i] > hNlFb) {
       hNl[i] = WebRtcAec_weightCurve[i] * hNlFb +
                (1 - WebRtcAec_weightCurve[i]) * hNl[i];
     }
-    hNl[i] = powf(hNl[i], aec->overDriveSm * WebRtcAec_overDriveCurve[i]);
+    hNl[i] = powf(hNl[i], overdrive_scaling * WebRtcAec_overDriveCurve[i]);
 
     // Suppress error signal
     efw[0][i] *= hNl[i];
     efw[1][i] *= hNl[i];
 
     // Ooura fft returns incorrect sign on imaginary component. It matters here
     // because we are making an additive change with comfort noise.
     efw[1][i] *= -1;
   }
 }
@@ skipping 806 matching lines @@
   if (aec->hNlMinCtr == 2) {
     aec->hNlNewMin = 0;
     aec->hNlMinCtr = 0;
     aec->overDrive =
         WEBRTC_SPL_MAX(kTargetSupp[aec->nlp_mode] /
                        static_cast<float>(log(aec->hNlFbMin + 1e-10f) + 1e-10f),
                        min_overdrive[aec->nlp_mode]);
   }
 
   // Smooth the overdrive.
-  if (aec->overDrive < aec->overDriveSm) {
-    aec->overDriveSm = 0.99f * aec->overDriveSm + 0.01f * aec->overDrive;
+  if (aec->overDrive < aec->overdrive_scaling) {
+    aec->overdrive_scaling =
+        0.99f * aec->overdrive_scaling + 0.01f * aec->overDrive;
   } else {
-    aec->overDriveSm = 0.9f * aec->overDriveSm + 0.1f * aec->overDrive;
+    aec->overdrive_scaling =
+        0.9f * aec->overdrive_scaling + 0.1f * aec->overDrive;
   }
 
-  WebRtcAec_OverdriveAndSuppress(aec, hNl, hNlFb, efw);
+  WebRtcAec_OverdriveAndSuppress(aec->overdrive_scaling, hNl, hNlFb, efw);
 
   // Add comfort noise.
   WebRtcAec_ComfortNoise(aec, efw, comfortNoiseHband, aec->noisePow, hNl);
 
   // Inverse error fft.
   ScaledInverseFft(efw, fft, 2.0f, 1);
 
   // Overlap and add to obtain output.
   for (i = 0; i < PART_LEN; i++) {
     output[i] = (fft[i] * WebRtcAec_sqrtHanning[i] +
@@ skipping 515 matching lines @@
 
   memset(aec->hNs, 0, sizeof(aec->hNs));
   memset(aec->outBuf, 0, sizeof(float) * PART_LEN);
 
   aec->hNlFbMin = 1;
   aec->hNlFbLocalMin = 1;
   aec->hNlXdAvgMin = 1;
   aec->hNlNewMin = 0;
   aec->hNlMinCtr = 0;
   aec->overDrive = 2;
-  aec->overDriveSm = 2;
+  aec->overdrive_scaling = 2;
   aec->delayIdx = 0;
   aec->stNearState = 0;
   aec->echoState = 0;
   aec->divergeState = 0;
 
   aec->seed = 777;
   aec->delayEstCtr = 0;
 
   aec->extreme_filter_divergence = 0;
 
@@ skipping 244 matching lines @@
 
 int WebRtcAec_system_delay(AecCore* self) {
   return self->system_delay;
 }
 
 void WebRtcAec_SetSystemDelay(AecCore* self, int delay) {
   assert(delay >= 0);
   self->system_delay = delay;
 }
 }  // namespace webrtc