commit 002ef2827257bd0b272cc4f3a30ce1a9adc7971a
author Gustaf Ullberg <gustaf@webrtc.org> Thu Oct 12 15:13:17 2017 +0200
committer Commit Bot <commit-bot@chromium.org> Fri Oct 13 09:03:07 2017 +0000
tree 6024f9199bbc856b734c2e4648ed54ea19f06691
parent 6f09ae20bd3f41eb9ccfab45ca8d039395c007ab

Added EchoControlFactory interface.

The factory for EchoControl is changed from an rtc::Callback1 to an
interface. This avoids using rtc::Callback1 outside of WebRTC.
This also makes the EchoControl factory more similar to other
factories in the code base.

Bug: webrtc:8345
Change-Id: Ie61b9416ed771f8c756326736d17e339eb768469
Reviewed-on: https://webrtc-review.googlesource.com/8900
Reviewed-by: Per Åhgren <peah@webrtc.org>
Commit-Queue: Gustaf Ullberg <gustaf@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20272}

modules/audio_processing/audio_processing_impl.cc

diff --git a/modules/audio_processing/audio_processing_impl.cc b/modules/audio_processing/audio_processing_impl.cc
index c101066..7aaad0a 100644
--- a/modules/audio_processing/audio_processing_impl.cc
+++ b/modules/audio_processing/audio_processing_impl.cc
@@ -309,35 +309,33 @@
 
 AudioProcessing* AudioProcessing::Create() {
   webrtc::Config config;
-  return Create(config, nullptr, rtc::Callback1<EchoControl*, int>(), nullptr);
+  return Create(config, nullptr, nullptr, nullptr);
 }
 
 AudioProcessing* AudioProcessing::Create(const webrtc::Config& config) {
-  return Create(config, nullptr, rtc::Callback1<EchoControl*, int>(), nullptr);
+  return Create(config, nullptr, nullptr, nullptr);
 }
 
 AudioProcessing* AudioProcessing::Create(const webrtc::Config& config,
                                          NonlinearBeamformer* beamformer) {
-  return Create(config, nullptr, rtc::Callback1<EchoControl*, int>(),
-                beamformer);
+  return Create(config, nullptr, nullptr, beamformer);
 }
 
 AudioProcessing* AudioProcessing::Create(
     const webrtc::Config& config,
     std::unique_ptr<PostProcessing> capture_post_processor,
     NonlinearBeamformer* beamformer) {
-  return Create(config, std::move(capture_post_processor),
-                rtc::Callback1<EchoControl*, int>(), beamformer);
+  return Create(config, std::move(capture_post_processor), nullptr, beamformer);
 }
 
 AudioProcessing* AudioProcessing::Create(
     const webrtc::Config& config,
     std::unique_ptr<PostProcessing> capture_post_processor,
-    rtc::Callback1<EchoControl*, int> echo_control_factory,
+    std::unique_ptr<EchoControlFactory> echo_control_factory,
     NonlinearBeamformer* beamformer) {
   AudioProcessingImpl* apm = new rtc::RefCountedObject<AudioProcessingImpl>(
-      config, std::move(capture_post_processor), echo_control_factory,
-      beamformer);
+      config, std::move(capture_post_processor),
+      std::move(echo_control_factory), beamformer);
   if (apm->Initialize() != kNoError) {
     delete apm;
     apm = nullptr;
@@ -347,18 +345,15 @@
 }
 
 AudioProcessingImpl::AudioProcessingImpl(const webrtc::Config& config)
-    : AudioProcessingImpl(config,
-                          nullptr,
-                          rtc::Callback1<EchoControl*, int>(),
-                          nullptr) {}
+    : AudioProcessingImpl(config, nullptr, nullptr, nullptr) {}
 
 AudioProcessingImpl::AudioProcessingImpl(
     const webrtc::Config& config,
     std::unique_ptr<PostProcessing> capture_post_processor,
-    rtc::Callback1<EchoControl*, int> echo_control_factory,
+    std::unique_ptr<EchoControlFactory> echo_control_factory,
     NonlinearBeamformer* beamformer)
     : high_pass_filter_impl_(new HighPassFilterImpl(this)),
-      echo_control_factory_(echo_control_factory),
+      echo_control_factory_(std::move(echo_control_factory)),
       submodule_states_(!!capture_post_processor),
       public_submodules_(new ApmPublicSubmodules()),
       private_submodules_(
@@ -1715,9 +1710,9 @@
 }
 
 void AudioProcessingImpl::InitializeEchoCanceller3() {
-  if (!echo_control_factory_.empty()) {
-    private_submodules_->echo_controller.reset(
-        echo_control_factory_(proc_sample_rate_hz()));
+  if (echo_control_factory_) {
+    private_submodules_->echo_controller =
+        echo_control_factory_->Create(proc_sample_rate_hz());
   } else if (capture_nonlocked_.echo_canceller3_enabled) {
     // TODO(gustaf): Remove once injection is used.
     private_submodules_->echo_controller.reset(new EchoCanceller3(