From 69d276d7dcc774d273a94758af9e29501bacf310 Mon Sep 17 00:00:00 2001 From: Ivo Creusen Date: Fri, 24 Nov 2017 15:35:57 +0100 Subject: [PATCH] Removed residual echo complexity unittest. This test produces a consistent stream of false positive alerts, and I have been unable to make it more robust, despite several attempts. It also has never managed to catch a real regression, so I think it is better to remove it. Bug: chromium:788318 Change-Id: I7e9731834f67af1ef2fa15a655e620bd64a4cfde Reviewed-on: https://webrtc-review.googlesource.com/25824 Commit-Queue: Ivo Creusen Reviewed-by: Alex Loiko Cr-Commit-Position: refs/heads/master@{#20874} --- modules/audio_processing/BUILD.gn | 7 +- ...idual_echo_detector_complexity_unittest.cc | 181 ------------------ 2 files changed, 5 insertions(+), 183 deletions(-) delete mode 100644 modules/audio_processing/residual_echo_detector_complexity_unittest.cc diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn index 302f24350a..fa3f3bdee4 100644 --- a/modules/audio_processing/BUILD.gn +++ b/modules/audio_processing/BUILD.gn @@ -686,13 +686,16 @@ if (rtc_include_tests) { sources = [ "audio_processing_performance_unittest.cc", "level_controller/level_controller_complexity_unittest.cc", - "residual_echo_detector_complexity_unittest.cc", ] deps = [ ":audio_processing", ":audioproc_test_utils", + "../../api:array_view", + "../../modules:module_api", "../../rtc_base:protobuf_utils", - "//testing/gtest", + "../../rtc_base:rtc_base_approved", + "../../system_wrappers:system_wrappers", + "../../test:test_support", ] if (rtc_enable_intelligibility_enhancer) { diff --git a/modules/audio_processing/residual_echo_detector_complexity_unittest.cc b/modules/audio_processing/residual_echo_detector_complexity_unittest.cc deleted file mode 100644 index d829703e07..0000000000 --- a/modules/audio_processing/residual_echo_detector_complexity_unittest.cc +++ /dev/null @@ -1,181 +0,0 @@ -/* - * 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 -#include - -#include "api/array_view.h" -#include "modules/audio_processing/audio_buffer.h" -#include "modules/audio_processing/include/audio_processing.h" -#include "modules/audio_processing/residual_echo_detector.h" -#include "modules/audio_processing/test/audio_buffer_tools.h" -#include "modules/audio_processing/test/performance_timer.h" -#include "modules/audio_processing/test/simulator_buffers.h" -#include "rtc_base/random.h" -#include "system_wrappers/include/clock.h" -#include "test/gtest.h" -#include "test/testsupport/perf_test.h" - -namespace webrtc { -namespace { - -constexpr size_t kNumFramesToProcess = 20000; -constexpr size_t kNumFramesToProcessStandalone = 50 * kNumFramesToProcess; -constexpr size_t kProcessingBatchSize = 200; -constexpr size_t kProcessingBatchSizeStandalone = 50 * kProcessingBatchSize; -constexpr size_t kNumberOfWarmupMeasurements = - (kNumFramesToProcess / kProcessingBatchSize) / 2; -constexpr size_t kNumberOfWarmupMeasurementsStandalone = - (kNumFramesToProcessStandalone / kProcessingBatchSizeStandalone) / 2; -constexpr int kSampleRate = AudioProcessing::kSampleRate48kHz; -constexpr int kNumberOfChannels = 1; - -void RunStandaloneSubmodule() { - test::SimulatorBuffers buffers( - kSampleRate, kSampleRate, kSampleRate, kSampleRate, kNumberOfChannels, - kNumberOfChannels, kNumberOfChannels, kNumberOfChannels); - test::PerformanceTimer timer(kNumFramesToProcessStandalone / - kProcessingBatchSizeStandalone); - - ResidualEchoDetector echo_detector; - echo_detector.Initialize(); - float sum = 0.f; - - for (size_t frame_no = 0; frame_no < kNumFramesToProcessStandalone; - ++frame_no) { - // The first batch of frames are for warming up, and are not part of the - // benchmark. After that the processing time is measured in chunks of - // kProcessingBatchSize frames. - if (frame_no % kProcessingBatchSizeStandalone == 0) { - timer.StartTimer(); - } - - buffers.UpdateInputBuffers(); - echo_detector.AnalyzeRenderAudio(rtc::ArrayView( - buffers.render_input_buffer->split_bands_const_f(0)[kBand0To8kHz], - buffers.render_input_buffer->num_frames_per_band())); - echo_detector.AnalyzeCaptureAudio(rtc::ArrayView( - buffers.capture_input_buffer->split_bands_const_f(0)[kBand0To8kHz], - buffers.capture_input_buffer->num_frames_per_band())); - sum += echo_detector.echo_likelihood(); - - if (frame_no % kProcessingBatchSizeStandalone == - kProcessingBatchSizeStandalone - 1) { - timer.StopTimer(); - } - } - EXPECT_EQ(0.0f, sum); - webrtc::test::PrintResultMeanAndError( - "echo_detector_call_durations", "", "StandaloneEchoDetector", - timer.GetDurationAverage(kNumberOfWarmupMeasurementsStandalone), - timer.GetDurationStandardDeviation(kNumberOfWarmupMeasurementsStandalone), - "us", false); -} - -void RunTogetherWithApm(const 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 timer(kNumFramesToProcess / kProcessingBatchSize); - - webrtc::Config config; - AudioProcessing::Config apm_config; - if (include_default_apm_processing) { - config.Set(new DelayAgnostic(true)); - config.Set(new ExtendedFilter(true)); - } - apm_config.level_controller.enabled = include_default_apm_processing; - apm_config.residual_echo_detector.enabled = true; - - std::unique_ptr apm; - apm.reset(AudioProcessing::Create(config)); - ASSERT_TRUE(apm.get()); - apm->ApplyConfig(apm_config); - - ASSERT_EQ(AudioProcessing::kNoError, - apm->gain_control()->Enable(include_default_apm_processing)); - if (use_mobile_aec) { - ASSERT_EQ(AudioProcessing::kNoError, - apm->echo_cancellation()->Enable(false)); - ASSERT_EQ(AudioProcessing::kNoError, apm->echo_control_mobile()->Enable( - include_default_apm_processing)); - } else { - ASSERT_EQ(AudioProcessing::kNoError, - apm->echo_cancellation()->Enable(include_default_apm_processing)); - ASSERT_EQ(AudioProcessing::kNoError, - apm->echo_control_mobile()->Enable(false)); - } - ASSERT_EQ(AudioProcessing::kNoError, - apm->high_pass_filter()->Enable(include_default_apm_processing)); - 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 batch of frames are for warming up, and are not part of the - // benchmark. After that the processing time is measured in chunks of - // kProcessingBatchSize frames. - if (frame_no % kProcessingBatchSize == 0) { - timer.StartTimer(); - } - - buffers.UpdateInputBuffers(); - - ASSERT_EQ( - AudioProcessing::kNoError, - apm->ProcessReverseStream(&buffers.render_input[0], stream_config, - stream_config, &buffers.render_output[0])); - - 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])); - - if (frame_no % kProcessingBatchSize == kProcessingBatchSize - 1) { - timer.StopTimer(); - } - } - - webrtc::test::PrintResultMeanAndError( - "echo_detector_call_durations", "_total", test_description, - timer.GetDurationAverage(kNumberOfWarmupMeasurements), - timer.GetDurationStandardDeviation(kNumberOfWarmupMeasurements), "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