Added the ability to adjust the AEC3 performance for large rooms

webrtc/modules/audio_processing/aec3/block_processor_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.
  */
 
@@ skipping 18 matching lines @@
 namespace {
 
 using testing::AtLeast;
 using testing::Return;
 using testing::StrictMock;
 using testing::_;
 
 // Verifies that the basic BlockProcessor functionality works and that the API
 // methods are callable.
 void RunBasicSetupAndApiCallTest(int sample_rate_hz) {
-  std::unique_ptr<BlockProcessor> block_processor(
-      BlockProcessor::Create(sample_rate_hz));
+  std::unique_ptr<BlockProcessor> block_processor(BlockProcessor::Create(
+      AudioProcessing::Config::EchoCanceller3(), sample_rate_hz));
   std::vector<std::vector<float>> block(NumBandsForRate(sample_rate_hz),
                                         std::vector<float>(kBlockSize, 0.f));
 
   block_processor->BufferRender(block);
   block_processor->ProcessCapture(false, false, &block);
   block_processor->UpdateEchoLeakageStatus(false);
 }
 
 #if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
 void RunRenderBlockSizeVerificationTest(int sample_rate_hz) {
-  std::unique_ptr<BlockProcessor> block_processor(
-      BlockProcessor::Create(sample_rate_hz));
+  std::unique_ptr<BlockProcessor> block_processor(BlockProcessor::Create(
+      AudioProcessing::Config::EchoCanceller3(), sample_rate_hz));
   std::vector<std::vector<float>> block(
       NumBandsForRate(sample_rate_hz), std::vector<float>(kBlockSize - 1, 0.f));
 
   EXPECT_DEATH(block_processor->BufferRender(block), "");
 }
 
 void RunCaptureBlockSizeVerificationTest(int sample_rate_hz) {
-  std::unique_ptr<BlockProcessor> block_processor(
-      BlockProcessor::Create(sample_rate_hz));
+  std::unique_ptr<BlockProcessor> block_processor(BlockProcessor::Create(
+      AudioProcessing::Config::EchoCanceller3(), sample_rate_hz));
   std::vector<std::vector<float>> block(
       NumBandsForRate(sample_rate_hz), std::vector<float>(kBlockSize - 1, 0.f));
 
   EXPECT_DEATH(block_processor->ProcessCapture(false, false, &block), "");
 }
 
 void RunRenderNumBandsVerificationTest(int sample_rate_hz) {
   const size_t wrong_num_bands = NumBandsForRate(sample_rate_hz) < 3
                                      ? NumBandsForRate(sample_rate_hz) + 1
                                      : 1;
-  std::unique_ptr<BlockProcessor> block_processor(
-      BlockProcessor::Create(sample_rate_hz));
+  std::unique_ptr<BlockProcessor> block_processor(BlockProcessor::Create(
+      AudioProcessing::Config::EchoCanceller3(), sample_rate_hz));
   std::vector<std::vector<float>> block(wrong_num_bands,
                                         std::vector<float>(kBlockSize, 0.f));
 
   EXPECT_DEATH(block_processor->BufferRender(block), "");
 }
 
 void RunCaptureNumBandsVerificationTest(int sample_rate_hz) {
   const size_t wrong_num_bands = NumBandsForRate(sample_rate_hz) < 3
                                      ? NumBandsForRate(sample_rate_hz) + 1
                                      : 1;
-  std::unique_ptr<BlockProcessor> block_processor(
-      BlockProcessor::Create(sample_rate_hz));
+  std::unique_ptr<BlockProcessor> block_processor(BlockProcessor::Create(
+      AudioProcessing::Config::EchoCanceller3(), sample_rate_hz));
   std::vector<std::vector<float>> block(wrong_num_bands,
                                         std::vector<float>(kBlockSize, 0.f));
 
   EXPECT_DEATH(block_processor->ProcessCapture(false, false, &block), "");
 }
 #endif
 
 std::string ProduceDebugText(int sample_rate_hz) {
   std::ostringstream ss;
   ss << "Sample rate: " << sample_rate_hz;
@@ skipping 23 matching lines @@
     EXPECT_CALL(*render_delay_buffer_mock, IsBlockAvailable())
         .Times(kNumBlocks)
         .WillRepeatedly(Return(true));
     EXPECT_CALL(*render_delay_buffer_mock, SetDelay(kDelayInBlocks))
         .Times(AtLeast(1));
     EXPECT_CALL(*render_delay_buffer_mock, MaxDelay()).WillOnce(Return(30));
     EXPECT_CALL(*render_delay_buffer_mock, Delay())
         .Times(kNumBlocks + 1)
         .WillRepeatedly(Return(0));
     std::unique_ptr<BlockProcessor> block_processor(
-        BlockProcessor::Create(rate, std::move(render_delay_buffer_mock)));
+        BlockProcessor::Create(AudioProcessing::Config::EchoCanceller3(), rate,
+                               std::move(render_delay_buffer_mock)));
 
     std::vector<std::vector<float>> render_block(
         NumBandsForRate(rate), std::vector<float>(kBlockSize, 0.f));
     std::vector<std::vector<float>> capture_block(
         NumBandsForRate(rate), std::vector<float>(kBlockSize, 0.f));
     DelayBuffer<float> signal_delay_buffer(kDelayInSamples);
     for (size_t k = 0; k < kNumBlocks; ++k) {
       RandomizeSampleVector(&random_generator, render_block[0]);
       signal_delay_buffer.Delay(render_block[0], capture_block[0]);
       block_processor->BufferRender(render_block);
@@ skipping 33 matching lines @@
         .Times(kNumBlocks)
         .WillRepeatedly(Return(9));
     EXPECT_CALL(*render_delay_controller_mock, AlignmentHeadroomSamples())
         .Times(kNumBlocks);
     EXPECT_CALL(*echo_remover_mock, ProcessCapture(_, _, _, _, _))
         .Times(kNumBlocks);
     EXPECT_CALL(*echo_remover_mock, UpdateEchoLeakageStatus(_))
         .Times(kNumBlocks);
 
     std::unique_ptr<BlockProcessor> block_processor(BlockProcessor::Create(
-        rate, std::move(render_delay_buffer_mock),
+        AudioProcessing::Config::EchoCanceller3(), rate,
+        std::move(render_delay_buffer_mock),
         std::move(render_delay_controller_mock), std::move(echo_remover_mock)));
 
     std::vector<std::vector<float>> render_block(
         NumBandsForRate(rate), std::vector<float>(kBlockSize, 0.f));
     std::vector<std::vector<float>> capture_block(
         NumBandsForRate(rate), std::vector<float>(kBlockSize, 0.f));
     DelayBuffer<float> signal_delay_buffer(640);
     for (size_t k = 0; k < kNumBlocks; ++k) {
       RandomizeSampleVector(&random_generator, render_block[0]);
       signal_delay_buffer.Delay(render_block[0], capture_block[0]);
@@ skipping 37 matching lines @@
 // signal.
 TEST(BlockProcessor, VerifyCaptureNumBandsCheck) {
   for (auto rate : {8000, 16000, 32000, 48000}) {
     SCOPED_TRACE(ProduceDebugText(rate));
     RunCaptureNumBandsVerificationTest(rate);
   }
 }
 
 // Verifiers that the verification for null ProcessCapture input works.
 TEST(BlockProcessor, NullProcessCaptureParameter) {
-  EXPECT_DEATH(std::unique_ptr<BlockProcessor>(BlockProcessor::Create(8000))
+  EXPECT_DEATH(std::unique_ptr<BlockProcessor>(
+                   BlockProcessor::Create(
+                       AudioProcessing::Config::EchoCanceller3(), 8000))
                    ->ProcessCapture(false, false, nullptr),
                "");
 }
 
 // Verifies the check for correct sample rate.
 // TODO(peah): Re-enable the test once the issue with memory leaks during DEATH
 // tests on test bots has been fixed.
 TEST(BlockProcessor, DISABLED_WrongSampleRate) {
-  EXPECT_DEATH(std::unique_ptr<BlockProcessor>(BlockProcessor::Create(8001)),
+  EXPECT_DEATH(std::unique_ptr<BlockProcessor>(BlockProcessor::Create(
+                   AudioProcessing::Config::EchoCanceller3(), 8001)),
                "");
 }
 
 #endif
 
 }  // namespace webrtc