Major AEC3 render pipeline changes

webrtc/modules/audio_processing/aec3/render_delay_controller_unittest.cc

Index: webrtc/modules/audio_processing/aec3/render_delay_controller_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/render_delay_controller_unittest.cc b/webrtc/modules/audio_processing/aec3/render_delay_controller_unittest.cc
index 169cb7e7fd7acab81c1fd58adf716d843b6685c8..164d237b2754096021412c9ac0846614de63c12f 100644
--- a/webrtc/modules/audio_processing/aec3/render_delay_controller_unittest.cc
+++ b/webrtc/modules/audio_processing/aec3/render_delay_controller_unittest.cc
@@ -18,6 +18,8 @@
 
 #include "webrtc/base/random.h"
 #include "webrtc/modules/audio_processing/aec3/aec3_common.h"
+#include "webrtc/modules/audio_processing/aec3/block_processor.h"
+#include "webrtc/modules/audio_processing/aec3/decimator_by_4.h"
 #include "webrtc/modules/audio_processing/aec3/render_delay_buffer.h"
 #include "webrtc/modules/audio_processing/logging/apm_data_dumper.h"
 #include "webrtc/modules/audio_processing/test/echo_canceller_test_tools.h"
@@ -38,17 +40,6 @@ std::string ProduceDebugText(int sample_rate_hz, size_t delay) {
   return ss.str();
 }
 
-std::string ProduceDebugText(int sample_rate_hz,
-                             size_t delay,
-                             size_t max_jitter) {
-  std::ostringstream ss;
-  ss << ProduceDebugText(sample_rate_hz, delay)
-     << ", Max Api call jitter: " << max_jitter;
-  return ss.str();
-}
-
-constexpr size_t kMaxApiCallJitter = 30;
-
 }  // namespace
 
 // Verifies the output of GetDelay when there are no AnalyzeRender calls.
@@ -56,48 +47,33 @@ TEST(RenderDelayController, NoRenderSignal) {
   std::vector<float> block(kBlockSize, 0.f);
   for (auto rate : {8000, 16000, 32000, 48000}) {
     SCOPED_TRACE(ProduceDebugText(rate));
-    std::unique_ptr<RenderDelayBuffer> delay_buffer(RenderDelayBuffer::Create(
-        250, NumBandsForRate(rate), kMaxApiCallJitter));
+    std::unique_ptr<RenderDelayBuffer> delay_buffer(
+        RenderDelayBuffer::Create(NumBandsForRate(rate)));
     std::unique_ptr<RenderDelayController> delay_controller(
-        RenderDelayController::Create(rate, *delay_buffer));
+        RenderDelayController::Create(rate));
     for (size_t k = 0; k < 100; ++k) {
-      EXPECT_EQ(0u, delay_controller->GetDelay(block));
-    }
-  }
-}
-
-// Verifies the behavior when there are too many AnalyzeRender calls.
-TEST(RenderDelayController, RenderOverflow) {
-  std::vector<float> block(kBlockSize, 0.f);
-  for (auto rate : {8000, 16000, 32000, 48000}) {
-    SCOPED_TRACE(ProduceDebugText(rate));
-    std::unique_ptr<RenderDelayBuffer> delay_buffer(RenderDelayBuffer::Create(
-        250, NumBandsForRate(rate), kMaxApiCallJitter));
-    std::unique_ptr<RenderDelayController> delay_controller(
-        RenderDelayController::Create(rate, *delay_buffer));
-    for (size_t k = 0; k < kMaxApiCallJitter; ++k) {
-      EXPECT_TRUE(delay_controller->AnalyzeRender(block));
+      EXPECT_EQ(0u, delay_controller->GetDelay(
+                        delay_buffer->GetDownsampledRenderBuffer(), block));
     }
-    EXPECT_FALSE(delay_controller->AnalyzeRender(block));
-    delay_controller->GetDelay(block);
-    EXPECT_TRUE(delay_controller->AnalyzeRender(block));
   }
 }
 
 // Verifies the basic API call sequence.
 TEST(RenderDelayController, BasicApiCalls) {
-  std::vector<float> render_block(kBlockSize, 0.f);
   std::vector<float> capture_block(kBlockSize, 0.f);
   size_t delay_blocks = 0;
   for (auto rate : {8000, 16000, 32000, 48000}) {
+    std::vector<std::vector<float>> render_block(
+        NumBandsForRate(rate), std::vector<float>(kBlockSize, 0.f));
     std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
-        RenderDelayBuffer::Create(50, NumBandsForRate(rate),
-                                  kMaxApiCallJitter));
+        RenderDelayBuffer::Create(NumBandsForRate(rate)));
     std::unique_ptr<RenderDelayController> delay_controller(
-        RenderDelayController::Create(rate, *render_delay_buffer));
+        RenderDelayController::Create(rate));
     for (size_t k = 0; k < 10; ++k) {
-      EXPECT_TRUE(delay_controller->AnalyzeRender(render_block));
-      delay_blocks = delay_controller->GetDelay(capture_block);
+      render_delay_buffer->Insert(render_block);
+      render_delay_buffer->UpdateBuffers();
+      delay_blocks = delay_controller->GetDelay(
+          render_delay_buffer->GetDownsampledRenderBuffer(), capture_block);
     }
     EXPECT_FALSE(delay_controller->AlignmentHeadroomSamples());
     EXPECT_EQ(0u, delay_blocks);
@@ -108,23 +84,26 @@ TEST(RenderDelayController, BasicApiCalls) {
 // simple timeshifts between the signals.
 TEST(RenderDelayController, Alignment) {
   Random random_generator(42U);
-  std::vector<float> render_block(kBlockSize, 0.f);
   std::vector<float> capture_block(kBlockSize, 0.f);
   size_t delay_blocks = 0;
   for (auto rate : {8000, 16000, 32000, 48000}) {
+    std::vector<std::vector<float>> render_block(
+        NumBandsForRate(rate), std::vector<float>(kBlockSize, 0.f));
+
     for (size_t delay_samples : {15, 50, 150, 200, 800, 4000}) {
       SCOPED_TRACE(ProduceDebugText(rate, delay_samples));
       std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
-          RenderDelayBuffer::Create(250, NumBandsForRate(rate),
-                                    kMaxApiCallJitter));
+          RenderDelayBuffer::Create(NumBandsForRate(rate)));
       std::unique_ptr<RenderDelayController> delay_controller(
-          RenderDelayController::Create(rate, *render_delay_buffer));
+          RenderDelayController::Create(rate));
       DelayBuffer<float> signal_delay_buffer(delay_samples);
       for (size_t k = 0; k < (400 + delay_samples / kBlockSize); ++k) {
-        RandomizeSampleVector(&random_generator, render_block);
-        signal_delay_buffer.Delay(render_block, capture_block);
-        EXPECT_TRUE(delay_controller->AnalyzeRender(render_block));
-        delay_blocks = delay_controller->GetDelay(capture_block);
+        RandomizeSampleVector(&random_generator, render_block[0]);
+        signal_delay_buffer.Delay(render_block[0], capture_block);
+        render_delay_buffer->Insert(render_block);
+        render_delay_buffer->UpdateBuffers();
+        delay_blocks = delay_controller->GetDelay(
+            render_delay_buffer->GetDownsampledRenderBuffer(), capture_block);
       }
 
       constexpr int kDelayHeadroomBlocks = 1;
@@ -150,51 +129,55 @@ TEST(RenderDelayController, Alignment) {
 // simple timeshifts between the signals when there is jitter in the API calls.
 TEST(RenderDelayController, AlignmentWithJitter) {
   Random random_generator(42U);
-  std::vector<float> render_block(kBlockSize, 0.f);
   std::vector<float> capture_block(kBlockSize, 0.f);
   for (auto rate : {8000, 16000, 32000, 48000}) {
-    for (size_t delay_samples : {15, 50, 800}) {
-      for (size_t max_jitter : {1, 9, 20}) {
-        size_t delay_blocks = 0;
-        SCOPED_TRACE(ProduceDebugText(rate, delay_samples, max_jitter));
-        std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
-            RenderDelayBuffer::Create(250, NumBandsForRate(rate), max_jitter));
-        std::unique_ptr<RenderDelayController> delay_controller(
-            RenderDelayController::Create(rate, *render_delay_buffer));
-        DelayBuffer<float> signal_delay_buffer(delay_samples);
-        for (size_t j = 0;
-             j < (300 + delay_samples / kBlockSize) / max_jitter + 1; ++j) {
-          std::vector<std::vector<float>> capture_block_buffer;
-          for (size_t k = 0; k < max_jitter; ++k) {
-            RandomizeSampleVector(&random_generator, render_block);
-            signal_delay_buffer.Delay(render_block, capture_block);
-            capture_block_buffer.push_back(capture_block);
-            EXPECT_TRUE(delay_controller->AnalyzeRender(render_block));
-          }
-          for (size_t k = 0; k < max_jitter; ++k) {
-            delay_blocks = delay_controller->GetDelay(capture_block_buffer[k]);
-          }
+    std::vector<std::vector<float>> render_block(
+        NumBandsForRate(rate), std::vector<float>(kBlockSize, 0.f));
+    for (size_t delay_samples : {15, 50, 300, 800}) {
+      size_t delay_blocks = 0;
+      SCOPED_TRACE(ProduceDebugText(rate, delay_samples));
+      std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
+          RenderDelayBuffer::Create(NumBandsForRate(rate)));
+      std::unique_ptr<RenderDelayController> delay_controller(
+          RenderDelayController::Create(rate));
+      DelayBuffer<float> signal_delay_buffer(delay_samples);
+      for (size_t j = 0;
+           j <
+           (1000 + delay_samples / kBlockSize) / kMaxApiCallsJitterBlocks + 1;
+           ++j) {
+        std::vector<std::vector<float>> capture_block_buffer;
+        for (size_t k = 0; k < (kMaxApiCallsJitterBlocks - 1); ++k) {
+          RandomizeSampleVector(&random_generator, render_block[0]);
+          signal_delay_buffer.Delay(render_block[0], capture_block);
+          capture_block_buffer.push_back(capture_block);
+          render_delay_buffer->Insert(render_block);
         }
-
-        constexpr int kDelayHeadroomBlocks = 1;
-        size_t expected_delay_blocks =
-            std::max(0, static_cast<int>(delay_samples / kBlockSize) -
-                            kDelayHeadroomBlocks);
-        if (expected_delay_blocks < 2) {
-          expected_delay_blocks = 0;
+        for (size_t k = 0; k < (kMaxApiCallsJitterBlocks - 1); ++k) {
+          render_delay_buffer->UpdateBuffers();
+          delay_blocks = delay_controller->GetDelay(
+              render_delay_buffer->GetDownsampledRenderBuffer(),
+              capture_block_buffer[k]);
         }
+      }
 
-        EXPECT_EQ(expected_delay_blocks, delay_blocks);
+      constexpr int kDelayHeadroomBlocks = 1;
+      size_t expected_delay_blocks =
+          std::max(0, static_cast<int>(delay_samples / kBlockSize) -
+                          kDelayHeadroomBlocks);
+      if (expected_delay_blocks < 2) {
+        expected_delay_blocks = 0;
+      }
 
-        const rtc::Optional<size_t> headroom_samples =
-            delay_controller->AlignmentHeadroomSamples();
-        ASSERT_TRUE(headroom_samples);
-        EXPECT_NEAR(delay_samples - delay_blocks * kBlockSize,
-                    *headroom_samples, 4);
+      EXPECT_EQ(expected_delay_blocks, delay_blocks);
+
+      const rtc::Optional<size_t> headroom_samples =
+          delay_controller->AlignmentHeadroomSamples();
+      ASSERT_TRUE(headroom_samples);
+      EXPECT_NEAR(delay_samples - delay_blocks * kBlockSize, *headroom_samples,
+                  4);
       }
     }
   }
-}
 
 // Verifies the initial value for the AlignmentHeadroomSamples.
 TEST(RenderDelayController, InitialHeadroom) {
@@ -203,10 +186,9 @@ TEST(RenderDelayController, InitialHeadroom) {
   for (auto rate : {8000, 16000, 32000, 48000}) {
     SCOPED_TRACE(ProduceDebugText(rate));
     std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
-        RenderDelayBuffer::Create(250, NumBandsForRate(rate),
-                                  kMaxApiCallJitter));
+        RenderDelayBuffer::Create(NumBandsForRate(rate)));
     std::unique_ptr<RenderDelayController> delay_controller(
-        RenderDelayController::Create(rate, *render_delay_buffer));
+        RenderDelayController::Create(rate));
     EXPECT_FALSE(delay_controller->AlignmentHeadroomSamples());
   }
 }
@@ -219,41 +201,26 @@ TEST(RenderDelayController, WrongCaptureSize) {
   for (auto rate : {8000, 16000, 32000, 48000}) {
     SCOPED_TRACE(ProduceDebugText(rate));
     std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
-        RenderDelayBuffer::Create(250, NumBandsForRate(rate),
-                                  kMaxApiCallJitter));
-    EXPECT_DEATH(std::unique_ptr<RenderDelayController>(
-                     RenderDelayController::Create(rate, *render_delay_buffer))
-                     ->GetDelay(block),
-                 "");
+        RenderDelayBuffer::Create(NumBandsForRate(rate)));
+    EXPECT_DEATH(
+        std::unique_ptr<RenderDelayController>(
+            RenderDelayController::Create(rate))
+            ->GetDelay(render_delay_buffer->GetDownsampledRenderBuffer(),
+                       block),
+        "");
   }
 }
 
-// Verifies the check for the render signal block size.
+// 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(RenderDelayController, DISABLED_WrongRenderSize) {
-  std::vector<float> block(kBlockSize - 1, 0.f);
-  for (auto rate : {8000, 16000, 32000, 48000}) {
-    SCOPED_TRACE(ProduceDebugText(rate));
-    std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
-        RenderDelayBuffer::Create(250, NumBandsForRate(rate),
-                                  kMaxApiCallJitter));
-    EXPECT_DEATH(std::unique_ptr<RenderDelayController>(
-                     RenderDelayController::Create(rate, *render_delay_buffer))
-                     ->AnalyzeRender(block),
-                 "");
-  }
-}
-
-// Verifies the check for correct sample rate.
-TEST(RenderDelayController, WrongSampleRate) {
+TEST(RenderDelayController, DISABLED_WrongSampleRate) {
   for (auto rate : {-1, 0, 8001, 16001}) {
     SCOPED_TRACE(ProduceDebugText(rate));
     std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
-        RenderDelayBuffer::Create(10, NumBandsForRate(rate),
-                                  kMaxApiCallJitter));
+        RenderDelayBuffer::Create(NumBandsForRate(rate)));
     EXPECT_DEATH(std::unique_ptr<RenderDelayController>(
-                     RenderDelayController::Create(rate, *render_delay_buffer)),
+                     RenderDelayController::Create(rate)),
                  "");
   }
 }