peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 1 | /* |
Gustaf Ullberg | e47433f | 2019-01-24 16:00:57 +0100 | [diff] [blame] | 2 | * Copyright (c) 2018 The WebRTC project authors. All Rights Reserved. |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 3 | * |
| 4 | * Use of this source code is governed by a BSD-style license |
| 5 | * that can be found in the LICENSE file in the root of the source |
| 6 | * tree. An additional intellectual property rights grant can be found |
| 7 | * in the file PATENTS. All contributing project authors may |
| 8 | * be found in the AUTHORS file in the root of the source tree. |
| 9 | */ |
Jonas Olsson | a4d8737 | 2019-07-05 19:08:33 +0200 | [diff] [blame] | 10 | #include "modules/audio_processing/aec3/block_processor.h" |
| 11 | |
Gustaf Ullberg | e47433f | 2019-01-24 16:00:57 +0100 | [diff] [blame] | 12 | #include <stddef.h> |
Jonas Olsson | a4d8737 | 2019-07-05 19:08:33 +0200 | [diff] [blame] | 13 | |
Gustaf Ullberg | e47433f | 2019-01-24 16:00:57 +0100 | [diff] [blame] | 14 | #include <memory> |
Yves Gerey | 988cc08 | 2018-10-23 12:03:01 +0200 | [diff] [blame] | 15 | #include <utility> |
Gustaf Ullberg | e47433f | 2019-01-24 16:00:57 +0100 | [diff] [blame] | 16 | #include <vector> |
Yves Gerey | 988cc08 | 2018-10-23 12:03:01 +0200 | [diff] [blame] | 17 | |
Danil Chapovalov | db9f7ab | 2018-06-19 10:50:11 +0200 | [diff] [blame] | 18 | #include "absl/types/optional.h" |
Gustaf Ullberg | e47433f | 2019-01-24 16:00:57 +0100 | [diff] [blame] | 19 | #include "api/audio/echo_canceller3_config.h" |
| 20 | #include "api/audio/echo_control.h" |
Mirko Bonadei | 92ea95e | 2017-09-15 06:47:31 +0200 | [diff] [blame] | 21 | #include "modules/audio_processing/aec3/aec3_common.h" |
| 22 | #include "modules/audio_processing/aec3/block_processor_metrics.h" |
Yves Gerey | 988cc08 | 2018-10-23 12:03:01 +0200 | [diff] [blame] | 23 | #include "modules/audio_processing/aec3/delay_estimate.h" |
Mirko Bonadei | 92ea95e | 2017-09-15 06:47:31 +0200 | [diff] [blame] | 24 | #include "modules/audio_processing/aec3/echo_path_variability.h" |
Gustaf Ullberg | e47433f | 2019-01-24 16:00:57 +0100 | [diff] [blame] | 25 | #include "modules/audio_processing/aec3/echo_remover.h" |
| 26 | #include "modules/audio_processing/aec3/render_delay_buffer.h" |
| 27 | #include "modules/audio_processing/aec3/render_delay_controller.h" |
Mirko Bonadei | 92ea95e | 2017-09-15 06:47:31 +0200 | [diff] [blame] | 28 | #include "modules/audio_processing/logging/apm_data_dumper.h" |
Steve Anton | 10542f2 | 2019-01-11 09:11:00 -0800 | [diff] [blame] | 29 | #include "rtc_base/atomic_ops.h" |
Yves Gerey | 988cc08 | 2018-10-23 12:03:01 +0200 | [diff] [blame] | 30 | #include "rtc_base/checks.h" |
Per Åhgren | fe9f222 | 2017-09-26 23:33:26 +0200 | [diff] [blame] | 31 | #include "rtc_base/logging.h" |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 32 | |
| 33 | namespace webrtc { |
| 34 | namespace { |
| 35 | |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 36 | enum class BlockProcessorApiCall { kCapture, kRender }; |
| 37 | |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 38 | class BlockProcessorImpl final : public BlockProcessor { |
| 39 | public: |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 40 | BlockProcessorImpl(const EchoCanceller3Config& config, |
| 41 | int sample_rate_hz, |
Per Åhgren | ce202a0 | 2019-09-02 17:01:19 +0200 | [diff] [blame] | 42 | size_t num_render_channels, |
| 43 | size_t num_capture_channels, |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 44 | std::unique_ptr<RenderDelayBuffer> render_buffer, |
| 45 | std::unique_ptr<RenderDelayController> delay_controller, |
| 46 | std::unique_ptr<EchoRemover> echo_remover); |
| 47 | |
Gustaf Ullberg | e47433f | 2019-01-24 16:00:57 +0100 | [diff] [blame] | 48 | BlockProcessorImpl() = delete; |
| 49 | |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 50 | ~BlockProcessorImpl() override; |
| 51 | |
Per Åhgren | ce202a0 | 2019-09-02 17:01:19 +0200 | [diff] [blame] | 52 | void ProcessCapture( |
| 53 | bool echo_path_gain_change, |
| 54 | bool capture_signal_saturation, |
| 55 | std::vector<std::vector<std::vector<float>>>* capture_block) override; |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 56 | |
Per Åhgren | ce202a0 | 2019-09-02 17:01:19 +0200 | [diff] [blame] | 57 | void BufferRender( |
| 58 | const std::vector<std::vector<std::vector<float>>>& block) override; |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 59 | |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 60 | void UpdateEchoLeakageStatus(bool leakage_detected) override; |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 61 | |
Gustaf Ullberg | 332150d | 2017-11-22 14:17:39 +0100 | [diff] [blame] | 62 | void GetMetrics(EchoControl::Metrics* metrics) const override; |
| 63 | |
Per Åhgren | d0fa820 | 2018-04-18 09:35:13 +0200 | [diff] [blame] | 64 | void SetAudioBufferDelay(size_t delay_ms) override; |
| 65 | |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 66 | private: |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 67 | static int instance_count_; |
| 68 | std::unique_ptr<ApmDataDumper> data_dumper_; |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 69 | const EchoCanceller3Config config_; |
| 70 | bool capture_properly_started_ = false; |
| 71 | bool render_properly_started_ = false; |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 72 | const size_t sample_rate_hz_; |
| 73 | std::unique_ptr<RenderDelayBuffer> render_buffer_; |
| 74 | std::unique_ptr<RenderDelayController> delay_controller_; |
| 75 | std::unique_ptr<EchoRemover> echo_remover_; |
peah | e985b3f | 2017-02-28 22:08:53 -0800 | [diff] [blame] | 76 | BlockProcessorMetrics metrics_; |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 77 | RenderDelayBuffer::BufferingEvent render_event_; |
Per Åhgren | c59a576 | 2017-12-11 21:34:19 +0100 | [diff] [blame] | 78 | size_t capture_call_counter_ = 0; |
Danil Chapovalov | db9f7ab | 2018-06-19 10:50:11 +0200 | [diff] [blame] | 79 | absl::optional<DelayEstimate> estimated_delay_; |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 80 | }; |
| 81 | |
| 82 | int BlockProcessorImpl::instance_count_ = 0; |
| 83 | |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 84 | BlockProcessorImpl::BlockProcessorImpl( |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 85 | const EchoCanceller3Config& config, |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 86 | int sample_rate_hz, |
Per Åhgren | ce202a0 | 2019-09-02 17:01:19 +0200 | [diff] [blame] | 87 | size_t num_render_channels, |
| 88 | size_t num_capture_channels, |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 89 | std::unique_ptr<RenderDelayBuffer> render_buffer, |
| 90 | std::unique_ptr<RenderDelayController> delay_controller, |
| 91 | std::unique_ptr<EchoRemover> echo_remover) |
| 92 | : data_dumper_( |
| 93 | new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))), |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 94 | config_(config), |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 95 | sample_rate_hz_(sample_rate_hz), |
| 96 | render_buffer_(std::move(render_buffer)), |
| 97 | delay_controller_(std::move(delay_controller)), |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 98 | echo_remover_(std::move(echo_remover)), |
| 99 | render_event_(RenderDelayBuffer::BufferingEvent::kNone) { |
peah | 2192089 | 2017-02-08 05:08:56 -0800 | [diff] [blame] | 100 | RTC_DCHECK(ValidFullBandRate(sample_rate_hz_)); |
| 101 | } |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 102 | |
| 103 | BlockProcessorImpl::~BlockProcessorImpl() = default; |
| 104 | |
| 105 | void BlockProcessorImpl::ProcessCapture( |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 106 | bool echo_path_gain_change, |
| 107 | bool capture_signal_saturation, |
Per Åhgren | ce202a0 | 2019-09-02 17:01:19 +0200 | [diff] [blame] | 108 | std::vector<std::vector<std::vector<float>>>* capture_block) { |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 109 | RTC_DCHECK(capture_block); |
| 110 | RTC_DCHECK_EQ(NumBandsForRate(sample_rate_hz_), capture_block->size()); |
Per Åhgren | ce202a0 | 2019-09-02 17:01:19 +0200 | [diff] [blame] | 111 | RTC_DCHECK_EQ(kBlockSize, (*capture_block)[0][0].size()); |
Per Åhgren | c59a576 | 2017-12-11 21:34:19 +0100 | [diff] [blame] | 112 | |
| 113 | capture_call_counter_++; |
| 114 | |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 115 | data_dumper_->DumpRaw("aec3_processblock_call_order", |
| 116 | static_cast<int>(BlockProcessorApiCall::kCapture)); |
| 117 | data_dumper_->DumpWav("aec3_processblock_capture_input", kBlockSize, |
Per Åhgren | ce202a0 | 2019-09-02 17:01:19 +0200 | [diff] [blame] | 118 | &(*capture_block)[0][0][0], 16000, 1); |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 119 | |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 120 | if (render_properly_started_) { |
| 121 | if (!capture_properly_started_) { |
| 122 | capture_properly_started_ = true; |
| 123 | render_buffer_->Reset(); |
Gustaf Ullberg | 8f32b6c | 2019-04-05 16:23:50 +0200 | [diff] [blame] | 124 | if (delay_controller_) |
| 125 | delay_controller_->Reset(true); |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 126 | } |
| 127 | } else { |
| 128 | // If no render data has yet arrived, do not process the capture signal. |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 129 | return; |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 130 | } |
| 131 | |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 132 | EchoPathVariability echo_path_variability( |
| 133 | echo_path_gain_change, EchoPathVariability::DelayAdjustment::kNone, |
| 134 | false); |
| 135 | |
| 136 | if (render_event_ == RenderDelayBuffer::BufferingEvent::kRenderOverrun && |
| 137 | render_properly_started_) { |
| 138 | echo_path_variability.delay_change = |
| 139 | EchoPathVariability::DelayAdjustment::kBufferFlush; |
Gustaf Ullberg | 8f32b6c | 2019-04-05 16:23:50 +0200 | [diff] [blame] | 140 | if (delay_controller_) |
| 141 | delay_controller_->Reset(true); |
Per Åhgren | c59a576 | 2017-12-11 21:34:19 +0100 | [diff] [blame] | 142 | RTC_LOG(LS_WARNING) << "Reset due to render buffer overrun at block " |
| 143 | << capture_call_counter_; |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 144 | } |
Gustaf Ullberg | e47433f | 2019-01-24 16:00:57 +0100 | [diff] [blame] | 145 | render_event_ = RenderDelayBuffer::BufferingEvent::kNone; |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 146 | |
| 147 | // Update the render buffers with any newly arrived render blocks and prepare |
| 148 | // the render buffers for reading the render data corresponding to the current |
| 149 | // capture block. |
Gustaf Ullberg | e47433f | 2019-01-24 16:00:57 +0100 | [diff] [blame] | 150 | RenderDelayBuffer::BufferingEvent buffer_event = |
| 151 | render_buffer_->PrepareCaptureProcessing(); |
| 152 | // Reset the delay controller at render buffer underrun. |
| 153 | if (buffer_event == RenderDelayBuffer::BufferingEvent::kRenderUnderrun) { |
Gustaf Ullberg | 8f32b6c | 2019-04-05 16:23:50 +0200 | [diff] [blame] | 154 | if (delay_controller_) |
| 155 | delay_controller_->Reset(false); |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 156 | } |
| 157 | |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 158 | data_dumper_->DumpWav("aec3_processblock_capture_input2", kBlockSize, |
Per Åhgren | ce202a0 | 2019-09-02 17:01:19 +0200 | [diff] [blame] | 159 | &(*capture_block)[0][0][0], 16000, 1); |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 160 | |
Gustaf Ullberg | 8f32b6c | 2019-04-05 16:23:50 +0200 | [diff] [blame] | 161 | bool has_delay_estimator = !config_.delay.use_external_delay_estimator; |
| 162 | if (has_delay_estimator) { |
| 163 | RTC_DCHECK(delay_controller_); |
| 164 | // Compute and apply the render delay required to achieve proper signal |
| 165 | // alignment. |
| 166 | estimated_delay_ = delay_controller_->GetDelay( |
| 167 | render_buffer_->GetDownsampledRenderBuffer(), render_buffer_->Delay(), |
Gustaf Ullberg | ee84d39 | 2019-09-10 09:36:43 +0200 | [diff] [blame^] | 168 | (*capture_block)[0]); |
peah | 4b572d0 | 2017-04-06 16:33:06 -0700 | [diff] [blame] | 169 | |
Gustaf Ullberg | 8f32b6c | 2019-04-05 16:23:50 +0200 | [diff] [blame] | 170 | if (estimated_delay_) { |
| 171 | bool delay_change = |
| 172 | render_buffer_->AlignFromDelay(estimated_delay_->delay); |
| 173 | if (delay_change) { |
Gustaf Ullberg | 940c2b5 | 2019-08-08 15:04:41 +0200 | [diff] [blame] | 174 | RTC_LOG(LS_INFO) << "Delay changed to " << estimated_delay_->delay |
| 175 | << " at block " << capture_call_counter_; |
Gustaf Ullberg | 8f32b6c | 2019-04-05 16:23:50 +0200 | [diff] [blame] | 176 | echo_path_variability.delay_change = |
| 177 | EchoPathVariability::DelayAdjustment::kNewDetectedDelay; |
| 178 | } |
Per Åhgren | c59a576 | 2017-12-11 21:34:19 +0100 | [diff] [blame] | 179 | } |
Gustaf Ullberg | 8f32b6c | 2019-04-05 16:23:50 +0200 | [diff] [blame] | 180 | |
| 181 | echo_path_variability.clock_drift = delay_controller_->HasClockdrift(); |
| 182 | |
| 183 | } else { |
| 184 | render_buffer_->AlignFromExternalDelay(); |
peah | 96b951c | 2017-08-22 10:26:07 -0700 | [diff] [blame] | 185 | } |
peah | 4b572d0 | 2017-04-06 16:33:06 -0700 | [diff] [blame] | 186 | |
| 187 | // Remove the echo from the capture signal. |
Gustaf Ullberg | 8f32b6c | 2019-04-05 16:23:50 +0200 | [diff] [blame] | 188 | if (has_delay_estimator || render_buffer_->HasReceivedBufferDelay()) { |
| 189 | echo_remover_->ProcessCapture( |
| 190 | echo_path_variability, capture_signal_saturation, estimated_delay_, |
| 191 | render_buffer_->GetRenderBuffer(), capture_block); |
| 192 | } |
peah | 4b572d0 | 2017-04-06 16:33:06 -0700 | [diff] [blame] | 193 | |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 194 | // Update the metrics. |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 195 | metrics_.UpdateCapture(false); |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 196 | } |
| 197 | |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 198 | void BlockProcessorImpl::BufferRender( |
Per Åhgren | ce202a0 | 2019-09-02 17:01:19 +0200 | [diff] [blame] | 199 | const std::vector<std::vector<std::vector<float>>>& block) { |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 200 | RTC_DCHECK_EQ(NumBandsForRate(sample_rate_hz_), block.size()); |
Per Åhgren | ce202a0 | 2019-09-02 17:01:19 +0200 | [diff] [blame] | 201 | RTC_DCHECK_EQ(kBlockSize, block[0][0].size()); |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 202 | data_dumper_->DumpRaw("aec3_processblock_call_order", |
| 203 | static_cast<int>(BlockProcessorApiCall::kRender)); |
| 204 | data_dumper_->DumpWav("aec3_processblock_render_input", kBlockSize, |
Per Åhgren | ce202a0 | 2019-09-02 17:01:19 +0200 | [diff] [blame] | 205 | &block[0][0][0], 16000, 1); |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 206 | data_dumper_->DumpWav("aec3_processblock_render_input2", kBlockSize, |
Per Åhgren | ce202a0 | 2019-09-02 17:01:19 +0200 | [diff] [blame] | 207 | &block[0][0][0], 16000, 1); |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 208 | |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 209 | render_event_ = render_buffer_->Insert(block); |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 210 | |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 211 | metrics_.UpdateRender(render_event_ != |
| 212 | RenderDelayBuffer::BufferingEvent::kNone); |
| 213 | |
| 214 | render_properly_started_ = true; |
Gustaf Ullberg | 8f32b6c | 2019-04-05 16:23:50 +0200 | [diff] [blame] | 215 | if (delay_controller_) |
| 216 | delay_controller_->LogRenderCall(); |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 217 | } |
| 218 | |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 219 | void BlockProcessorImpl::UpdateEchoLeakageStatus(bool leakage_detected) { |
| 220 | echo_remover_->UpdateEchoLeakageStatus(leakage_detected); |
| 221 | } |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 222 | |
Gustaf Ullberg | 332150d | 2017-11-22 14:17:39 +0100 | [diff] [blame] | 223 | void BlockProcessorImpl::GetMetrics(EchoControl::Metrics* metrics) const { |
| 224 | echo_remover_->GetMetrics(metrics); |
Per Åhgren | ce202a0 | 2019-09-02 17:01:19 +0200 | [diff] [blame] | 225 | constexpr int block_size_ms = 4; |
Danil Chapovalov | db9f7ab | 2018-06-19 10:50:11 +0200 | [diff] [blame] | 226 | absl::optional<size_t> delay = render_buffer_->Delay(); |
Per Åhgren | c59a576 | 2017-12-11 21:34:19 +0100 | [diff] [blame] | 227 | metrics->delay_ms = delay ? static_cast<int>(*delay) * block_size_ms : 0; |
Gustaf Ullberg | 332150d | 2017-11-22 14:17:39 +0100 | [diff] [blame] | 228 | } |
| 229 | |
Per Åhgren | d0fa820 | 2018-04-18 09:35:13 +0200 | [diff] [blame] | 230 | void BlockProcessorImpl::SetAudioBufferDelay(size_t delay_ms) { |
| 231 | render_buffer_->SetAudioBufferDelay(delay_ms); |
| 232 | } |
| 233 | |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 234 | } // namespace |
| 235 | |
Gustaf Ullberg | bd83b91 | 2017-10-18 12:32:42 +0200 | [diff] [blame] | 236 | BlockProcessor* BlockProcessor::Create(const EchoCanceller3Config& config, |
Per Åhgren | ce202a0 | 2019-09-02 17:01:19 +0200 | [diff] [blame] | 237 | int sample_rate_hz, |
| 238 | size_t num_render_channels, |
| 239 | size_t num_capture_channels) { |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 240 | std::unique_ptr<RenderDelayBuffer> render_buffer( |
Per Åhgren | ce202a0 | 2019-09-02 17:01:19 +0200 | [diff] [blame] | 241 | RenderDelayBuffer::Create(config, sample_rate_hz, num_render_channels)); |
Gustaf Ullberg | 8f32b6c | 2019-04-05 16:23:50 +0200 | [diff] [blame] | 242 | std::unique_ptr<RenderDelayController> delay_controller; |
| 243 | if (!config.delay.use_external_delay_estimator) { |
| 244 | delay_controller.reset( |
| 245 | RenderDelayController::Create(config, sample_rate_hz)); |
| 246 | } |
Per Åhgren | ce202a0 | 2019-09-02 17:01:19 +0200 | [diff] [blame] | 247 | std::unique_ptr<EchoRemover> echo_remover(EchoRemover::Create( |
| 248 | config, sample_rate_hz, num_render_channels, num_capture_channels)); |
| 249 | return Create(config, sample_rate_hz, num_render_channels, |
| 250 | num_capture_channels, std::move(render_buffer), |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 251 | std::move(delay_controller), std::move(echo_remover)); |
| 252 | } |
| 253 | |
| 254 | BlockProcessor* BlockProcessor::Create( |
Gustaf Ullberg | bd83b91 | 2017-10-18 12:32:42 +0200 | [diff] [blame] | 255 | const EchoCanceller3Config& config, |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 256 | int sample_rate_hz, |
Per Åhgren | ce202a0 | 2019-09-02 17:01:19 +0200 | [diff] [blame] | 257 | size_t num_render_channels, |
| 258 | size_t num_capture_channels, |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 259 | std::unique_ptr<RenderDelayBuffer> render_buffer) { |
Gustaf Ullberg | 8f32b6c | 2019-04-05 16:23:50 +0200 | [diff] [blame] | 260 | std::unique_ptr<RenderDelayController> delay_controller; |
| 261 | if (!config.delay.use_external_delay_estimator) { |
| 262 | delay_controller.reset( |
| 263 | RenderDelayController::Create(config, sample_rate_hz)); |
| 264 | } |
Per Åhgren | ce202a0 | 2019-09-02 17:01:19 +0200 | [diff] [blame] | 265 | std::unique_ptr<EchoRemover> echo_remover(EchoRemover::Create( |
| 266 | config, sample_rate_hz, num_render_channels, num_capture_channels)); |
| 267 | return Create(config, sample_rate_hz, num_render_channels, |
| 268 | num_capture_channels, std::move(render_buffer), |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 269 | std::move(delay_controller), std::move(echo_remover)); |
| 270 | } |
| 271 | |
| 272 | BlockProcessor* BlockProcessor::Create( |
Gustaf Ullberg | bd83b91 | 2017-10-18 12:32:42 +0200 | [diff] [blame] | 273 | const EchoCanceller3Config& config, |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 274 | int sample_rate_hz, |
Per Åhgren | ce202a0 | 2019-09-02 17:01:19 +0200 | [diff] [blame] | 275 | size_t num_render_channels, |
| 276 | size_t num_capture_channels, |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 277 | std::unique_ptr<RenderDelayBuffer> render_buffer, |
| 278 | std::unique_ptr<RenderDelayController> delay_controller, |
| 279 | std::unique_ptr<EchoRemover> echo_remover) { |
Per Åhgren | ce202a0 | 2019-09-02 17:01:19 +0200 | [diff] [blame] | 280 | return new BlockProcessorImpl(config, sample_rate_hz, num_render_channels, |
| 281 | num_capture_channels, std::move(render_buffer), |
| 282 | std::move(delay_controller), |
| 283 | std::move(echo_remover)); |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 284 | } |
| 285 | |
| 286 | } // namespace webrtc |