Major AEC3 render pipeline changes

webrtc/modules/audio_processing/aec3/block_processor_unittest.cc

Index: webrtc/modules/audio_processing/aec3/block_processor_unittest.cc
diff --git a/webrtc/modules/audio_processing/aec3/block_processor_unittest.cc b/webrtc/modules/audio_processing/aec3/block_processor_unittest.cc
index 78e5c7ed7c40a48577d729cc0a5642fd7f091ae7..24b39673cba485e0aee9d7fabc55019b368df947 100644
--- a/webrtc/modules/audio_processing/aec3/block_processor_unittest.cc
+++ b/webrtc/modules/audio_processing/aec3/block_processor_unittest.cc
@@ -41,7 +41,7 @@ void RunBasicSetupAndApiCallTest(int sample_rate_hz) {
   std::vector<std::vector<float>> block(NumBandsForRate(sample_rate_hz),
                                         std::vector<float>(kBlockSize, 0.f));
 
-  EXPECT_TRUE(block_processor->BufferRender(&block));
+  block_processor->BufferRender(&block);
   block_processor->ProcessCapture(false, false, &block);
   block_processor->UpdateEchoLeakageStatus(false);
 }
@@ -122,7 +122,6 @@ TEST(BlockProcessor, DISABLED_DelayControllerIntegration) {
     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, MaxApiJitter()).WillOnce(Return(30));
     EXPECT_CALL(*render_delay_buffer_mock, Delay())
         .Times(kNumBlocks + 1)
         .WillRepeatedly(Return(0));
@@ -137,14 +136,14 @@ TEST(BlockProcessor, DISABLED_DelayControllerIntegration) {
     for (size_t k = 0; k < kNumBlocks; ++k) {
       RandomizeSampleVector(&random_generator, render_block[0]);
       signal_delay_buffer.Delay(render_block[0], capture_block[0]);
-      EXPECT_TRUE(block_processor->BufferRender(&render_block));
+      block_processor->BufferRender(&render_block);
       block_processor->ProcessCapture(false, false, &capture_block);
     }
   }
 }
 
 // Verifies that BlockProcessor submodules are called in a proper manner.
-TEST(BlockProcessor, SubmoduleIntegration) {
+TEST(BlockProcessor, DISABLED_SubmoduleIntegration) {

[peah-webrtc, 2017/03/30 05:36:55]

I doubt that we should maintain the integration tests any longer. BlockProcessor
is now too complex and contains too much state to do this in a sensible manner.
Let's keep this as they are, and then look into refactoring these. Therefore, I
don't think too much effort should go into reviewing this, and the previous,
test.

   constexpr size_t kNumBlocks = 310;
   Random random_generator(42U);
   for (auto rate : {8000, 16000, 32000, 48000}) {
@@ -160,25 +159,22 @@ TEST(BlockProcessor, SubmoduleIntegration) {
         echo_remover_mock(new StrictMock<webrtc::test::MockEchoRemover>());
 
     EXPECT_CALL(*render_delay_buffer_mock, Insert(_))
-        .Times(kNumBlocks)
+        .Times(kNumBlocks - 1)
         .WillRepeatedly(Return(true));
     EXPECT_CALL(*render_delay_buffer_mock, IsBlockAvailable())
         .Times(kNumBlocks)
         .WillRepeatedly(Return(true));
-    EXPECT_CALL(*render_delay_buffer_mock, GetNext()).Times(kNumBlocks);
+    EXPECT_CALL(*render_delay_buffer_mock, UpdateBuffers()).Times(kNumBlocks);
     EXPECT_CALL(*render_delay_buffer_mock, SetDelay(9)).Times(AtLeast(1));
     EXPECT_CALL(*render_delay_buffer_mock, Delay())
         .Times(kNumBlocks)
         .WillRepeatedly(Return(0));
-    EXPECT_CALL(*render_delay_controller_mock, GetDelay(_))
+    EXPECT_CALL(*render_delay_controller_mock, GetDelay(_, _))
         .Times(kNumBlocks)
         .WillRepeatedly(Return(9));
-    EXPECT_CALL(*render_delay_controller_mock, AnalyzeRender(_))
-        .Times(kNumBlocks)
-        .WillRepeatedly(Return(true));
     EXPECT_CALL(*render_delay_controller_mock, AlignmentHeadroomSamples())
         .Times(kNumBlocks);
-    EXPECT_CALL(*echo_remover_mock, ProcessBlock(_, _, _, _, _))
+    EXPECT_CALL(*echo_remover_mock, ProcessCapture(_, _, _, _, _))
         .Times(kNumBlocks);
     EXPECT_CALL(*echo_remover_mock, UpdateEchoLeakageStatus(_))
         .Times(kNumBlocks);
@@ -195,7 +191,7 @@ TEST(BlockProcessor, SubmoduleIntegration) {
     for (size_t k = 0; k < kNumBlocks; ++k) {
       RandomizeSampleVector(&random_generator, render_block[0]);
       signal_delay_buffer.Delay(render_block[0], capture_block[0]);
-      EXPECT_TRUE(block_processor->BufferRender(&render_block));
+      block_processor->BufferRender(&render_block);
       block_processor->ProcessCapture(false, false, &capture_block);
       block_processor->UpdateEchoLeakageStatus(false);
     }