Index: webrtc/modules/audio_processing/aec3/block_processor.h |
diff --git a/webrtc/modules/audio_processing/aec3/block_processor.h b/webrtc/modules/audio_processing/aec3/block_processor.h |
index b84b18df81a24fe1cf7ec6329189a7d67001f04b..8b66b16591fc820b3f40fac0daa69787a6028919 100644 |
--- a/webrtc/modules/audio_processing/aec3/block_processor.h |
+++ b/webrtc/modules/audio_processing/aec3/block_processor.h |
@@ -15,7 +15,9 @@ |
#include <vector> |
#include "webrtc/base/constructormagic.h" |
-#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 { |
@@ -23,12 +25,22 @@ namespace webrtc { |
class BlockProcessor { |
public: |
static BlockProcessor* Create(int sample_rate_hz); |
+ // Only used for testing purposes |
hlundin-webrtc
2017/01/18 13:08:48
End with .
peah-webrtc
2017/01/19 15:33:04
Done.
|
+ 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. |
hlundin-webrtc
2017/01/18 13:08:48
What does it return?
peah-webrtc
2017/01/19 15:33:04
Done.
|
@@ -36,7 +48,7 @@ class BlockProcessor { |
// 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 |