From 39c8350613ae9758a0e2fe68d6702145fb91d2cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20=C3=85hgren?= Date: Wed, 22 Jan 2020 10:31:26 +0100 Subject: [PATCH] Reduce the complexity of the multichannel echo subtractor test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This CL reduces the complexity of the Subtractor.ConvergenceMultiChannel test by 1. Slightly reducing the amount of tested combinations for the non-debug mode. 2. Drastically reduce the amount of tested combinations for the debug mode. Bug: webrtc:11295 Change-Id: I56bfa4a1463d26e5217b6a4d7f2ef54de7aab512 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/166529 Commit-Queue: Per Åhgren Reviewed-by: Sam Zackrisson Cr-Commit-Position: refs/heads/master@{#30343} --- modules/audio_processing/aec3/subtractor_unittest.cc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/audio_processing/aec3/subtractor_unittest.cc b/modules/audio_processing/aec3/subtractor_unittest.cc index 507d70c39a..a49b205b95 100644 --- a/modules/audio_processing/aec3/subtractor_unittest.cc +++ b/modules/audio_processing/aec3/subtractor_unittest.cc @@ -233,9 +233,17 @@ TEST(Subtractor, Convergence) { // Verifies that the subtractor is able to converge on correlated data. TEST(Subtractor, ConvergenceMultiChannel) { +#if defined(NDEBUG) + const size_t kNumRenderChannelsToTest[] = {1, 2, 8}; + const size_t kNumCaptureChannelsToTest[] = {1, 2, 4}; +#else + const size_t kNumRenderChannelsToTest[] = {1, 2}; + const size_t kNumCaptureChannelsToTest[] = {1, 2}; +#endif + std::vector blocks_with_echo_path_changes; - for (size_t num_render_channels : {1, 2, 4, 8}) { - for (size_t num_capture_channels : {1, 2, 4}) { + for (size_t num_render_channels : kNumRenderChannelsToTest) { + for (size_t num_capture_channels : kNumCaptureChannelsToTest) { SCOPED_TRACE( ProduceDebugText(num_render_channels, num_render_channels, 64, 20)); size_t num_blocks_to_process = 2500 * num_render_channels;