Adding second layer of the echo canceller 3 functionality.

webrtc/modules/audio_processing/aec3/block_processor.cc

Index: webrtc/modules/audio_processing/aec3/block_processor.cc
diff --git a/webrtc/modules/audio_processing/aec3/block_processor.cc b/webrtc/modules/audio_processing/aec3/block_processor.cc
index 066e2f71ac1078ddaddfbfc8d28600a9853ec8b4..2a5471a984597a34ac42e1f7b55221125a7fd820 100644
--- a/webrtc/modules/audio_processing/aec3/block_processor.cc
+++ b/webrtc/modules/audio_processing/aec3/block_processor.cc
@@ -9,65 +9,145 @@
  */
 #include "webrtc/modules/audio_processing/aec3/block_processor.h"
 
+#include <memory>
+
 #include "webrtc/base/atomicops.h"
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/base/optional.h"
 #include "webrtc/modules/audio_processing/aec3/aec3_constants.h"
+#include "webrtc/modules/audio_processing/aec3/echo_path_variability.h"
+#include "webrtc/modules/audio_processing/aec3/echo_remover.h"

[aleloi, 2017/01/20 14:45:37]

echo_remover.h is also included in parent header.

[peah-webrtc, 2017/01/23 14:16:40]

Done.

+#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h"
+#include "webrtc/system_wrappers/include/logging.h"
 
 namespace webrtc {
 namespace {
 
 class BlockProcessorImpl final : public BlockProcessor {
  public:
-  explicit BlockProcessorImpl(int sample_rate_hz);
+  BlockProcessorImpl(int sample_rate_hz,
+                     std::unique_ptr<RenderDelayBuffer> render_buffer,
+                     std::unique_ptr<RenderDelayController> delay_controller,
+                     std::unique_ptr<EchoRemover> echo_remover);
+
   ~BlockProcessorImpl() override;
 
-  void ProcessCapture(bool known_echo_path_change,
-                      bool saturated_microphone_signal,
+  void ProcessCapture(bool echo_path_gain_change,
+                      bool capture_signal_saturation,
                       std::vector<std::vector<float>>* capture_block) override;
 
   bool BufferRender(std::vector<std::vector<float>>* block) override;
 
-  void ReportEchoLeakage(bool leakage_detected) override;
+  void UpdateEchoLeakageStatus(bool leakage_detected) override;
 
  private:
-  const size_t sample_rate_hz_;
   static int instance_count_;
   std::unique_ptr<ApmDataDumper> data_dumper_;
+  const size_t sample_rate_hz_;
+  std::unique_ptr<RenderDelayBuffer> render_buffer_;
+  std::unique_ptr<RenderDelayController> delay_controller_;
+  std::unique_ptr<EchoRemover> echo_remover_;
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(BlockProcessorImpl);
 };
 
+static const size_t kRenderBufferSize = 250;
 int BlockProcessorImpl::instance_count_ = 0;
-
-BlockProcessorImpl::BlockProcessorImpl(int sample_rate_hz)
-    : sample_rate_hz_(sample_rate_hz),
-      data_dumper_(
-          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))) {}
+constexpr size_t kMaxApiJitter = 30;

[aleloi, 2017/01/20 14:45:37]

I think kRenderBufferSize and kMaxApiJitter should either both be static const
or both constexpr.

[peah-webrtc, 2017/01/23 14:16:40]

I agree.
Done.

+
+BlockProcessorImpl::BlockProcessorImpl(
+    int sample_rate_hz,
+    std::unique_ptr<RenderDelayBuffer> render_buffer,
+    std::unique_ptr<RenderDelayController> delay_controller,
+    std::unique_ptr<EchoRemover> echo_remover)
+    : data_dumper_(
+          new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
+      sample_rate_hz_(sample_rate_hz),
+      render_buffer_(std::move(render_buffer)),
+      delay_controller_(std::move(delay_controller)),
+      echo_remover_(std::move(echo_remover)) {}
 
 BlockProcessorImpl::~BlockProcessorImpl() = default;
 
 void BlockProcessorImpl::ProcessCapture(
-    bool known_echo_path_change,
-    bool saturated_microphone_signal,
+    bool echo_path_gain_change,
+    bool capture_signal_saturation,
     std::vector<std::vector<float>>* capture_block) {
   RTC_DCHECK(capture_block);
   RTC_DCHECK_EQ(NumBandsForRate(sample_rate_hz_), capture_block->size());
   RTC_DCHECK_EQ(kBlockSize, (*capture_block)[0].size());
+
+  const size_t delay = delay_controller_->GetDelay((*capture_block)[0]);
+  const bool render_delay_change = delay != render_buffer_->Delay();
+
+  if (render_delay_change) {
+    render_buffer_->SetDelay(delay);
+  }
+
+  if (render_buffer_->IsBlockAvailable()) {
+    auto& render_block = render_buffer_->GetNext();
+    echo_remover_->ProcessBlock(
+        delay_controller_->AlignmentHeadroom(),
+        EchoPathVariability(echo_path_gain_change, render_delay_change),
+        capture_signal_saturation, render_block, capture_block);
+  } else {
+    LOG(LS_INFO) << "AEC3 empty render buffer";
+  }
 }
 
-bool BlockProcessorImpl::BufferRender(
-    std::vector<std::vector<float>>* render_block) {
-  RTC_DCHECK(render_block);
-  RTC_DCHECK_EQ(NumBandsForRate(sample_rate_hz_), render_block->size());
-  RTC_DCHECK_EQ(kBlockSize, (*render_block)[0].size());
-  return false;
+bool BlockProcessorImpl::BufferRender(std::vector<std::vector<float>>* block) {
+  RTC_DCHECK(block);
+  RTC_DCHECK_EQ(NumBandsForRate(sample_rate_hz_), block->size());
+  RTC_DCHECK_EQ(kBlockSize, (*block)[0].size());
+
+  const bool delay_controller_overrun =
+      !delay_controller_->AnalyzeRender((*block)[0]);
+  const bool render_buffer_overrun = !render_buffer_->Insert(block);
+  if (delay_controller_overrun || render_buffer_overrun) {
+    LOG(LS_INFO) << "AEC3 buffer overrrun";
+    return false;
+  }
+
+  return true;
 }
 
-void BlockProcessorImpl::ReportEchoLeakage(bool leakage_detected) {}
+void BlockProcessorImpl::UpdateEchoLeakageStatus(bool leakage_detected) {
+  echo_remover_->UpdateEchoLeakageStatus(leakage_detected);
+}
 
 }  // namespace
 
 BlockProcessor* BlockProcessor::Create(int sample_rate_hz) {

[aleloi, 2017/01/20 14:45:37]

I think keeping the number of 'new' low is a good guideline. Therefore this
Create should be implemented in terms of the last factory method. 

[peah-webrtc, 2017/01/23 14:16:40]

Good point!
Done.

-  return new BlockProcessorImpl(sample_rate_hz);
+  std::unique_ptr<RenderDelayBuffer> render_buffer(RenderDelayBuffer::Create(
+      kRenderBufferSize, NumBandsForRate(sample_rate_hz), kMaxApiJitter));
+  std::unique_ptr<RenderDelayController> delay_controller(
+      RenderDelayController::Create(sample_rate_hz, *render_buffer));
+  std::unique_ptr<EchoRemover> echo_remover(
+      EchoRemover::Create(sample_rate_hz));
+  return new BlockProcessorImpl(sample_rate_hz, std::move(render_buffer),
+                                std::move(delay_controller),
+                                std::move(echo_remover));
+}
+
+BlockProcessor* BlockProcessor::Create(

[aleloi, 2017/01/20 14:45:37]

Same here.

[peah-webrtc, 2017/01/23 14:16:40]

Done.

+    int sample_rate_hz,
+    std::unique_ptr<RenderDelayBuffer> render_buffer) {
+  std::unique_ptr<RenderDelayController> delay_controller(
+      RenderDelayController::Create(sample_rate_hz, *render_buffer));
+  std::unique_ptr<EchoRemover> echo_remover(
+      EchoRemover::Create(sample_rate_hz));
+  return new BlockProcessorImpl(sample_rate_hz, std::move(render_buffer),
+                                std::move(delay_controller),
+                                std::move(echo_remover));
+}
+
+BlockProcessor* BlockProcessor::Create(
+    int sample_rate_hz,
+    std::unique_ptr<RenderDelayBuffer> render_buffer,
+    std::unique_ptr<RenderDelayController> delay_controller,
+    std::unique_ptr<EchoRemover> echo_remover) {
+  return new BlockProcessorImpl(sample_rate_hz, std::move(render_buffer),
+                                std::move(delay_controller),
+                                std::move(echo_remover));
 }
 
 }  // namespace webrtc