Removed unused code and simplified the code for the AEC metrics

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 572 matching lines @@
         level->minlevel = new_frame_level;  // New minimum.
       } else {
         level->minlevel *= (1 + 0.001f);  // Small increase.
       }
     }
     level->averagelevel.AddValue(new_frame_level);
   }
 }
 
 static void UpdateMetrics(AecCore* aec) {
-  float dtmp, dtmp2;
+  float dtmp;
 
   const float actThresholdNoisy = 8.0f;
   const float actThresholdClean = 40.0f;
   const float safety = 0.99995f;
 
   const float noisyPower = 300000.0f;
 
   float actThreshold;
   float echo, suppressedEcho;
 
@@ skipping 18 matching lines @@
 
       const float near_average_level =
           aec->nearlevel.averagelevel.GetLatestMean();
 
       // Subtract noise power
       echo = near_average_level - safety * aec->nearlevel.minlevel;
 
       // ERL
       dtmp = 10 * static_cast<float>(log10(far_average_level /
                                            near_average_level + 1e-10f));
-      dtmp2 = 10 * static_cast<float>(log10(far_average_level / echo + 1e-10f));
 
       aec->erl.instant = dtmp;
       if (dtmp > aec->erl.max) {
         aec->erl.max = dtmp;
       }
 
       if (dtmp < aec->erl.min) {
         aec->erl.min = dtmp;
       }
 
@@ skipping 11 matching lines @@
       // A_NLP
       const float linout_average_level =
           aec->linoutlevel.averagelevel.GetLatestMean();
       dtmp = 10 * static_cast<float>(log10(near_average_level /
                                            linout_average_level + 1e-10f));
 
       // subtract noise power
       suppressedEcho =
           linout_average_level - safety * aec->linoutlevel.minlevel;
 
-      dtmp2 = 10 * static_cast<float>(log10(echo / suppressedEcho + 1e-10f));
+      aec->aNlp.instant =
+          10 * static_cast<float>(log10(echo / suppressedEcho + 1e-10f));
 
-      aec->aNlp.instant = dtmp2;
       if (dtmp > aec->aNlp.max) {
         aec->aNlp.max = dtmp;
       }
 
       if (dtmp < aec->aNlp.min) {
         aec->aNlp.min = dtmp;
       }
 
       aec->aNlp.counter++;
       aec->aNlp.sum += dtmp;
       aec->aNlp.average = aec->aNlp.sum / aec->aNlp.counter;
 
       // Upper mean
       if (dtmp > aec->aNlp.average) {
         aec->aNlp.hicounter++;
         aec->aNlp.hisum += dtmp;
         aec->aNlp.himean = aec->aNlp.hisum / aec->aNlp.hicounter;
       }
 
       // ERLE
       const float nlpout_average_level =
           aec->nlpoutlevel.averagelevel.GetLatestMean();
       // subtract noise power
       suppressedEcho =
           nlpout_average_level - safety * aec->nlpoutlevel.minlevel;
+      dtmp = 10 * static_cast<float>(log10(echo / suppressedEcho + 1e-10f));
 
-      dtmp = 10 * static_cast<float>(log10(near_average_level /
-                                           nlpout_average_level + 1e-10f));
-      dtmp2 = 10 * static_cast<float>(log10(echo / suppressedEcho + 1e-10f));
-
-      dtmp = dtmp2;
       aec->erle.instant = dtmp;
       if (dtmp > aec->erle.max) {
         aec->erle.max = dtmp;
       }
 
       if (dtmp < aec->erle.min) {
         aec->erle.min = dtmp;
       }
 
       aec->erle.counter++;
@@ skipping 1184 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