Improvements to the reliability of the echo detector perf test.

webrtc/modules/audio_processing/residual_echo_detector_complexity_unittest.cc

 /*
  *  Copyright (c) 2016 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.
  */
 
 #include <numeric>
 #include <vector>
 
 #include "webrtc/base/array_view.h"
 #include "webrtc/base/random.h"
 #include "webrtc/modules/audio_processing/audio_buffer.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"
 #include "webrtc/modules/audio_processing/residual_echo_detector.h"
 #include "webrtc/modules/audio_processing/test/audio_buffer_tools.h"
 #include "webrtc/modules/audio_processing/test/performance_timer.h"
 #include "webrtc/modules/audio_processing/test/simulator_buffers.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/test/gtest.h"
 #include "webrtc/test/testsupport/perf_test.h"
 
 namespace webrtc {
 namespace {
 
-const size_t kNumFramesToProcess = 100;
+const size_t kNumFramesToProcess = 500;
 const int kSampleRate = AudioProcessing::kSampleRate48kHz;
 const int kNumberOfChannels = 1;
 
 std::string FormPerformanceMeasureString(const test::PerformanceTimer& timer) {
   std::string s = std::to_string(timer.GetDurationAverage());
   s += ", ";
   s += std::to_string(timer.GetDurationStandardDeviation());
   return s;
 }
 
 void RunStandaloneSubmodule() {
   test::SimulatorBuffers buffers(
       kSampleRate, kSampleRate, kSampleRate, kSampleRate, kNumberOfChannels,
       kNumberOfChannels, kNumberOfChannels, kNumberOfChannels);
   test::PerformanceTimer timer(kNumFramesToProcess);
 
   ResidualEchoDetector echo_detector;
   echo_detector.Initialize();
 
   for (size_t frame_no = 0; frame_no < kNumFramesToProcess; ++frame_no) {
+    // The first 20 frames are for warming up, and are not part of the
+    // benchmark. After that the processing time is measured in chunks of 20
+    // frames.
+    if (frame_no >= 20 && frame_no % 20 == 0) {

[peah-webrtc, 2016/12/14 09:00:04]

You should probably add a constant (or 2) for the 20s, as you use them on lines
65, 124 and 146 as well (also as 19=20-1).

[ivoc, 2016/12/14 09:46:42]

Good idea, done.

+      timer.StartTimer();
+    }
+
     buffers.UpdateInputBuffers();
-
-    timer.StartTimer();
     echo_detector.AnalyzeRenderAudio(rtc::ArrayView<const float>(
         buffers.render_input_buffer->split_bands_const_f(0)[kBand0To8kHz],
         buffers.render_input_buffer->num_frames_per_band()));
     echo_detector.AnalyzeCaptureAudio(rtc::ArrayView<const float>(
         buffers.capture_input_buffer->split_bands_const_f(0)[kBand0To8kHz],
         buffers.capture_input_buffer->num_frames_per_band()));
-    timer.StopTimer();
+
+    if (frame_no >= 20 && frame_no % 20 == 19) {

[peah-webrtc, 2016/12/14 09:00:04]

Please add a constant (or 2) for the 20s.

[ivoc, 2016/12/14 09:46:42]

Done.

+      timer.StopTimer();
+    }
   }
   webrtc::test::PrintResultMeanAndError(
       "echo_detector_call_durations", "", "StandaloneEchoDetector",
       FormPerformanceMeasureString(timer), "us", false);
 }
 
 void RunTogetherWithApm(std::string test_description,
                         bool use_mobile_aec,
                         bool include_default_apm_processing) {
   test::SimulatorBuffers buffers(
       kSampleRate, kSampleRate, kSampleRate, kSampleRate, kNumberOfChannels,
       kNumberOfChannels, kNumberOfChannels, kNumberOfChannels);
-  test::PerformanceTimer render_timer(kNumFramesToProcess);
-  test::PerformanceTimer capture_timer(kNumFramesToProcess);
-  test::PerformanceTimer total_timer(kNumFramesToProcess);
+  test::PerformanceTimer timer(kNumFramesToProcess);
 
   webrtc::Config config;
   AudioProcessing::Config apm_config;
   if (include_default_apm_processing) {
     config.Set<DelayAgnostic>(new DelayAgnostic(true));
     config.Set<ExtendedFilter>(new ExtendedFilter(true));
   }
   apm_config.level_controller.enabled = include_default_apm_processing;
   apm_config.residual_echo_detector.enabled = true;
 
@@ skipping 20 matching lines @@
   ASSERT_EQ(AudioProcessing::kNoError,
             apm->noise_suppression()->Enable(include_default_apm_processing));
   ASSERT_EQ(AudioProcessing::kNoError,
             apm->voice_detection()->Enable(include_default_apm_processing));
   ASSERT_EQ(AudioProcessing::kNoError,
             apm->level_estimator()->Enable(include_default_apm_processing));
 
   StreamConfig stream_config(kSampleRate, kNumberOfChannels, false);
 
   for (size_t frame_no = 0; frame_no < kNumFramesToProcess; ++frame_no) {
+    // The first 20 frames are for warming up, and are not part of the
+    // benchmark. After that the processing time is measured in chunks of 20
+    // frames.
+    if (frame_no >= 20 && frame_no % 20 == 0) {

[peah-webrtc, 2016/12/14 09:00:04]

Please add a constant (or 2) for the 20s.

[ivoc, 2016/12/14 09:46:42]

Done.

+      timer.StartTimer();
+    }
+
     buffers.UpdateInputBuffers();
 
-    total_timer.StartTimer();
-    render_timer.StartTimer();
     ASSERT_EQ(
         AudioProcessing::kNoError,
         apm->ProcessReverseStream(&buffers.render_input[0], stream_config,
                                   stream_config, &buffers.render_output[0]));
 
-    render_timer.StopTimer();
-
-    capture_timer.StartTimer();
     ASSERT_EQ(AudioProcessing::kNoError, apm->set_stream_delay_ms(0));
     if (include_default_apm_processing) {
       apm->gain_control()->set_stream_analog_level(0);
       if (!use_mobile_aec) {
         apm->echo_cancellation()->set_stream_drift_samples(0);
       }
     }
     ASSERT_EQ(AudioProcessing::kNoError,
               apm->ProcessStream(&buffers.capture_input[0], stream_config,
                                  stream_config, &buffers.capture_output[0]));
 
-    capture_timer.StopTimer();
-    total_timer.StopTimer();
+    if (frame_no >= 20 && frame_no % 20 == 19) {

[peah-webrtc, 2016/12/14 09:00:04]

Please add a constant (or 2) for the 20s.

[ivoc, 2016/12/14 09:46:42]

Done.

+      timer.StopTimer();
+    }
   }
 
   webrtc::test::PrintResultMeanAndError(
-      "echo_detector_call_durations", "_render", test_description,
-      FormPerformanceMeasureString(render_timer), "us", false);
-  webrtc::test::PrintResultMeanAndError(
-      "echo_detector_call_durations", "_capture", test_description,
-      FormPerformanceMeasureString(capture_timer), "us", false);
-  webrtc::test::PrintResultMeanAndError(
       "echo_detector_call_durations", "_total", test_description,
-      FormPerformanceMeasureString(total_timer), "us", false);
+      FormPerformanceMeasureString(timer), "us", false);
 }
 
 }  // namespace
 
 TEST(EchoDetectorPerformanceTest, StandaloneProcessing) {
   RunStandaloneSubmodule();
 }
 
 TEST(EchoDetectorPerformanceTest, ProcessingViaApm) {
   RunTogetherWithApm("SimpleEchoDetectorViaApm", false, false);
 }
 
 TEST(EchoDetectorPerformanceTest, InteractionWithDefaultApm) {
   RunTogetherWithApm("EchoDetectorAndDefaultDesktopApm", false, true);
   RunTogetherWithApm("EchoDetectorAndDefaultMobileApm", true, true);
 }
 
 }  // namespace webrtc