Further utilizing the AEC3 config struct for constants

webrtc/modules/audio_processing/aec3/matched_filter_unittest.cc

 /*
  *  Copyright (c) 2017 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 119 matching lines @@
                                          std::vector<float>(kBlockSize, 0.f));
   std::array<float, kBlockSize> capture;
   capture.fill(0.f);
   ApmDataDumper data_dumper(0);
   for (size_t delay_samples : {5, 64, 150, 200, 800, 1000}) {
     SCOPED_TRACE(ProduceDebugText(delay_samples));
     DecimatorBy4 capture_decimator;
     DelayBuffer<float> signal_delay_buffer(4 * delay_samples);
     MatchedFilter filter(&data_dumper, DetectOptimization(),
                          kWindowSizeSubBlocks, kNumMatchedFilters,
-                         kAlignmentShiftSubBlocks);
+                         kAlignmentShiftSubBlocks, 150);
     std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
         RenderDelayBuffer::Create(3));
 
     // Analyze the correlation between render and capture.
     for (size_t k = 0; k < (100 + delay_samples / kSubBlockSize); ++k) {
       RandomizeSampleVector(&random_generator, render[0]);
       signal_delay_buffer.Delay(render[0], capture);
       render_delay_buffer->Insert(render);
       render_delay_buffer->UpdateBuffers();
       std::array<float, kSubBlockSize> downsampled_capture;
@@ skipping 48 matching lines @@
 TEST(MatchedFilter, LagNotReliableForUncorrelatedRenderAndCapture) {
   Random random_generator(42U);
   std::vector<std::vector<float>> render(3,
                                          std::vector<float>(kBlockSize, 0.f));
   std::array<float, kSubBlockSize> capture;
   capture.fill(0.f);
   ApmDataDumper data_dumper(0);
   std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
       RenderDelayBuffer::Create(3));
   MatchedFilter filter(&data_dumper, DetectOptimization(), kWindowSizeSubBlocks,
-                       kNumMatchedFilters, kAlignmentShiftSubBlocks);
+                       kNumMatchedFilters, kAlignmentShiftSubBlocks, 150);
 
   // Analyze the correlation between render and capture.
   for (size_t k = 0; k < 100; ++k) {
     RandomizeSampleVector(&random_generator, render[0]);
     RandomizeSampleVector(&random_generator, capture);
     render_delay_buffer->Insert(render);
     filter.Update(render_delay_buffer->GetDownsampledRenderBuffer(), capture);
   }
 
   // Obtain the lag estimates.
   auto lag_estimates = filter.GetLagEstimates();
   EXPECT_EQ(kNumMatchedFilters, lag_estimates.size());
 
   // Verify that no lag estimates are reliable.
   for (auto& le : lag_estimates) {
     EXPECT_FALSE(le.reliable);
   }
 }
 
 // Verifies that the matched filter does not produce updated lag estimates for
 // render signals of low level.
 TEST(MatchedFilter, LagNotUpdatedForLowLevelRender) {
   Random random_generator(42U);
   std::vector<std::vector<float>> render(3,
                                          std::vector<float>(kBlockSize, 0.f));
   std::array<float, kBlockSize> capture;
   capture.fill(0.f);
   ApmDataDumper data_dumper(0);
   MatchedFilter filter(&data_dumper, DetectOptimization(), kWindowSizeSubBlocks,
-                       kNumMatchedFilters, kAlignmentShiftSubBlocks);
+                       kNumMatchedFilters, kAlignmentShiftSubBlocks, 150);
   std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
       RenderDelayBuffer::Create(3));
   DecimatorBy4 capture_decimator;
 
   // Analyze the correlation between render and capture.
   for (size_t k = 0; k < 100; ++k) {
     RandomizeSampleVector(&random_generator, render[0]);
     for (auto& render_k : render[0]) {
       render_k *= 149.f / 32767.f;
     }
@@ skipping 16 matching lines @@
   }
 }
 
 // Verifies that the correct number of lag estimates are produced for a certain
 // number of alignment shifts.
 TEST(MatchedFilter, NumberOfLagEstimates) {
   ApmDataDumper data_dumper(0);
   for (size_t num_matched_filters = 0; num_matched_filters < 10;
        ++num_matched_filters) {
     MatchedFilter filter(&data_dumper, DetectOptimization(), 32,
-                         num_matched_filters, 1);
+                         num_matched_filters, 1, 150);
     EXPECT_EQ(num_matched_filters, filter.GetLagEstimates().size());
   }
 }
 
 #if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
 
 // Verifies the check for non-zero windows size.
 TEST(MatchedFilter, ZeroWindowSize) {
   ApmDataDumper data_dumper(0);
-  EXPECT_DEATH(MatchedFilter(&data_dumper, DetectOptimization(), 0, 1, 1), "");
+  EXPECT_DEATH(MatchedFilter(&data_dumper, DetectOptimization(), 0, 1, 1, 150),
+               "");
 }
 
 // Verifies the check for non-null data dumper.
 TEST(MatchedFilter, NullDataDumper) {
-  EXPECT_DEATH(MatchedFilter(nullptr, DetectOptimization(), 1, 1, 1), "");
+  EXPECT_DEATH(MatchedFilter(nullptr, DetectOptimization(), 1, 1, 1, 150), "");
 }
 
 #endif
 
 }  // namespace aec3
 }  // namespace webrtc