Adding second layer of the echo canceller 3 functionality.

webrtc/modules/audio_processing/aec3/block_processor.h

 /*
  *  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.
  */
 
 #ifndef WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_H_
 #define WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_H_
 
 #include <memory>
 #include <vector>
 
 #include "webrtc/base/constructormagic.h"

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

Not used in .h file and already included in .cc file. Remove?

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

Done.

-#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h"
+#include "webrtc/modules/audio_processing/aec3/echo_remover.h"
+#include "webrtc/modules/audio_processing/aec3/render_delay_buffer.h"
+#include "webrtc/modules/audio_processing/aec3/render_delay_controller.h"
 
 namespace webrtc {
 
 // Class for performing echo cancellation on 64 sample blocks of audio data.
 class BlockProcessor {
  public:
   static BlockProcessor* Create(int sample_rate_hz);
+  // Only used for testing purposes.
+  static BlockProcessor* Create(
+      int sample_rate_hz,
+      std::unique_ptr<RenderDelayBuffer> render_buffer);
+  static BlockProcessor* Create(
+      int sample_rate_hz,
+      std::unique_ptr<RenderDelayBuffer> render_buffer,
+      std::unique_ptr<RenderDelayController> delay_controller,
+      std::unique_ptr<EchoRemover> echo_remover);
+
   virtual ~BlockProcessor() = default;
 
   // Processes a block of capture data.
   virtual void 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) = 0;
 
-  // Buffers a block of render data supplied by a FrameBlocker object.
+  // Buffers a block of render data supplied by a FrameBlocker object. Returns a
+  // bool indicating whether there was a buffer overrun.

[hlundin-webrtc, 2017/01/20 09:31:44]

Well, it now returns false when overrun did happen.

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

Done.

   virtual bool BufferRender(std::vector<std::vector<float>>* render_block) = 0;
 
   // Reports whether echo leakage has been detected in the echo canceller
   // output.
-  virtual void ReportEchoLeakage(bool leakage_detected) = 0;
+  virtual void UpdateEchoLeakageStatus(bool leakage_detected) = 0;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_AUDIO_PROCESSING_AEC3_BLOCK_PROCESSOR_H_