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

webrtc/modules/audio_processing/aec/aec_core.cc

Index: webrtc/modules/audio_processing/aec/aec_core.cc
diff --git a/webrtc/modules/audio_processing/aec/aec_core.cc b/webrtc/modules/audio_processing/aec/aec_core.cc
index 3dfcbe9bc28ec98cf351cd39d310ecdb7883dbb8..23f9f3219eb38fcf7b5cd01225bd76c4dca97809 100644
--- a/webrtc/modules/audio_processing/aec/aec_core.cc
+++ b/webrtc/modules/audio_processing/aec/aec_core.cc
@@ -140,7 +140,8 @@ extern int webrtc_aec_instance_count;
 WebRtcAecFilterFar WebRtcAec_FilterFar;
 WebRtcAecScaleErrorSignal WebRtcAec_ScaleErrorSignal;
 WebRtcAecFilterAdaptation WebRtcAec_FilterAdaptation;
-WebRtcAecOverdriveAndSuppress WebRtcAec_OverdriveAndSuppress;
+WebRtcAecOverdrive WebRtcAec_Overdrive;
+WebRtcAecSuppress WebRtcAec_Suppress;
 WebRtcAecComputeCoherence WebRtcAec_ComputeCoherence;
 WebRtcAecUpdateCoherenceSpectra WebRtcAec_UpdateCoherenceSpectra;
 WebRtcAecStoreAsComplex WebRtcAec_StoreAsComplex;
@@ -313,19 +314,21 @@ static void FilterAdaptation(
   }
 }
 
-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++) {
+static void Overdrive(float overdrive_scaling,
+                      const float hNlFb,
+                      float hNl[PART_LEN1]) {
+  for (int 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], overdrive_scaling * WebRtcAec_overDriveCurve[i]);
+  }
+}
 
+static void Suppress(float hNl[PART_LEN1], float efw[2][PART_LEN1]) {

[hlundin-webrtc, 2016/05/03 08:22:29]

hNl should be const.

[peah-webrtc, 2016/05/07 21:26:15]

Done.

+  for (int i = 0; i < PART_LEN1; ++i) {
     // Suppress error signal
     efw[0][i] *= hNl[i];
     efw[1][i] *= hNl[i];
@@ -1163,7 +1166,8 @@ static void EchoSuppression(AecCore* aec,
         0.9f * aec->overdrive_scaling + 0.1f * aec->overDrive;
   }
 
-  WebRtcAec_OverdriveAndSuppress(aec->overdrive_scaling, hNl, hNlFb, efw);
+  WebRtcAec_Overdrive(aec->overdrive_scaling, hNlFb, hNl);
+  WebRtcAec_Suppress(hNl, efw);
 
   // Add comfort noise.
   ComfortNoise(aec, efw, comfortNoiseHband, aec->noisePow, hNl);
@@ -1491,7 +1495,8 @@ AecCore* WebRtcAec_CreateAec() {
   WebRtcAec_FilterFar = FilterFar;
   WebRtcAec_ScaleErrorSignal = ScaleErrorSignal;
   WebRtcAec_FilterAdaptation = FilterAdaptation;
-  WebRtcAec_OverdriveAndSuppress = OverdriveAndSuppress;
+  WebRtcAec_Overdrive = Overdrive;
+  WebRtcAec_Suppress = Suppress;
   WebRtcAec_ComputeCoherence = ComputeCoherence;
   WebRtcAec_UpdateCoherenceSpectra = UpdateCoherenceSpectra;
   WebRtcAec_StoreAsComplex = StoreAsComplex;