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, |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 42 | std::unique_ptr<RenderDelayBuffer> render_buffer, |
| 43 | std::unique_ptr<RenderDelayController> delay_controller, |
| 44 | std::unique_ptr<EchoRemover> echo_remover); |
| 45 | |
Gustaf Ullberg | e47433f | 2019-01-24 16:00:57 +0100 | [diff] [blame] | 46 | BlockProcessorImpl() = delete; |
| 47 | |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 48 | ~BlockProcessorImpl() override; |
| 49 | |
Per Åhgren | d112c75 | 2019-09-02 13:56:56 +0000 | [diff] [blame] | 50 | void ProcessCapture(bool echo_path_gain_change, |
| 51 | bool capture_signal_saturation, |
| 52 | std::vector<std::vector<float>>* capture_block) override; |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 53 | |
Per Åhgren | d112c75 | 2019-09-02 13:56:56 +0000 | [diff] [blame] | 54 | void BufferRender(const std::vector<std::vector<float>>& block) override; |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 55 | |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 56 | void UpdateEchoLeakageStatus(bool leakage_detected) override; |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 57 | |
Gustaf Ullberg | 332150d | 2017-11-22 14:17:39 +0100 | [diff] [blame] | 58 | void GetMetrics(EchoControl::Metrics* metrics) const override; |
| 59 | |
Per Åhgren | d0fa820 | 2018-04-18 09:35:13 +0200 | [diff] [blame] | 60 | void SetAudioBufferDelay(size_t delay_ms) override; |
| 61 | |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 62 | private: |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 63 | static int instance_count_; |
| 64 | std::unique_ptr<ApmDataDumper> data_dumper_; |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 65 | const EchoCanceller3Config config_; |
| 66 | bool capture_properly_started_ = false; |
| 67 | bool render_properly_started_ = false; |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 68 | const size_t sample_rate_hz_; |
| 69 | std::unique_ptr<RenderDelayBuffer> render_buffer_; |
| 70 | std::unique_ptr<RenderDelayController> delay_controller_; |
| 71 | std::unique_ptr<EchoRemover> echo_remover_; |
peah | e985b3f | 2017-02-28 22:08:53 -0800 | [diff] [blame] | 72 | BlockProcessorMetrics metrics_; |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 73 | RenderDelayBuffer::BufferingEvent render_event_; |
Per Åhgren | c59a576 | 2017-12-11 21:34:19 +0100 | [diff] [blame] | 74 | size_t capture_call_counter_ = 0; |
Danil Chapovalov | db9f7ab | 2018-06-19 10:50:11 +0200 | [diff] [blame] | 75 | absl::optional<DelayEstimate> estimated_delay_; |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 76 | }; |
| 77 | |
| 78 | int BlockProcessorImpl::instance_count_ = 0; |
| 79 | |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 80 | BlockProcessorImpl::BlockProcessorImpl( |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 81 | const EchoCanceller3Config& config, |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 82 | int sample_rate_hz, |
| 83 | std::unique_ptr<RenderDelayBuffer> render_buffer, |
| 84 | std::unique_ptr<RenderDelayController> delay_controller, |
| 85 | std::unique_ptr<EchoRemover> echo_remover) |
| 86 | : data_dumper_( |
| 87 | new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))), |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 88 | config_(config), |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 89 | sample_rate_hz_(sample_rate_hz), |
| 90 | render_buffer_(std::move(render_buffer)), |
| 91 | delay_controller_(std::move(delay_controller)), |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 92 | echo_remover_(std::move(echo_remover)), |
| 93 | render_event_(RenderDelayBuffer::BufferingEvent::kNone) { |
peah | 2192089 | 2017-02-08 05:08:56 -0800 | [diff] [blame] | 94 | RTC_DCHECK(ValidFullBandRate(sample_rate_hz_)); |
| 95 | } |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 96 | |
| 97 | BlockProcessorImpl::~BlockProcessorImpl() = default; |
| 98 | |
| 99 | void BlockProcessorImpl::ProcessCapture( |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 100 | bool echo_path_gain_change, |
| 101 | bool capture_signal_saturation, |
Per Åhgren | d112c75 | 2019-09-02 13:56:56 +0000 | [diff] [blame] | 102 | std::vector<std::vector<float>>* capture_block) { |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 103 | RTC_DCHECK(capture_block); |
| 104 | RTC_DCHECK_EQ(NumBandsForRate(sample_rate_hz_), capture_block->size()); |
Per Åhgren | d112c75 | 2019-09-02 13:56:56 +0000 | [diff] [blame] | 105 | RTC_DCHECK_EQ(kBlockSize, (*capture_block)[0].size()); |
Per Åhgren | c59a576 | 2017-12-11 21:34:19 +0100 | [diff] [blame] | 106 | |
| 107 | capture_call_counter_++; |
| 108 | |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 109 | data_dumper_->DumpRaw("aec3_processblock_call_order", |
| 110 | static_cast<int>(BlockProcessorApiCall::kCapture)); |
| 111 | data_dumper_->DumpWav("aec3_processblock_capture_input", kBlockSize, |
Per Åhgren | d112c75 | 2019-09-02 13:56:56 +0000 | [diff] [blame] | 112 | &(*capture_block)[0][0], |
| 113 | LowestBandRate(sample_rate_hz_), 1); |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 114 | |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 115 | if (render_properly_started_) { |
| 116 | if (!capture_properly_started_) { |
| 117 | capture_properly_started_ = true; |
| 118 | render_buffer_->Reset(); |
Gustaf Ullberg | 8f32b6c | 2019-04-05 16:23:50 +0200 | [diff] [blame] | 119 | if (delay_controller_) |
| 120 | delay_controller_->Reset(true); |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 121 | } |
| 122 | } else { |
| 123 | // If no render data has yet arrived, do not process the capture signal. |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 124 | return; |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 125 | } |
| 126 | |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 127 | EchoPathVariability echo_path_variability( |
| 128 | echo_path_gain_change, EchoPathVariability::DelayAdjustment::kNone, |
| 129 | false); |
| 130 | |
| 131 | if (render_event_ == RenderDelayBuffer::BufferingEvent::kRenderOverrun && |
| 132 | render_properly_started_) { |
| 133 | echo_path_variability.delay_change = |
| 134 | EchoPathVariability::DelayAdjustment::kBufferFlush; |
Gustaf Ullberg | 8f32b6c | 2019-04-05 16:23:50 +0200 | [diff] [blame] | 135 | if (delay_controller_) |
| 136 | delay_controller_->Reset(true); |
Per Åhgren | c59a576 | 2017-12-11 21:34:19 +0100 | [diff] [blame] | 137 | RTC_LOG(LS_WARNING) << "Reset due to render buffer overrun at block " |
| 138 | << capture_call_counter_; |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 139 | } |
Gustaf Ullberg | e47433f | 2019-01-24 16:00:57 +0100 | [diff] [blame] | 140 | render_event_ = RenderDelayBuffer::BufferingEvent::kNone; |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 141 | |
| 142 | // Update the render buffers with any newly arrived render blocks and prepare |
| 143 | // the render buffers for reading the render data corresponding to the current |
| 144 | // capture block. |
Gustaf Ullberg | e47433f | 2019-01-24 16:00:57 +0100 | [diff] [blame] | 145 | RenderDelayBuffer::BufferingEvent buffer_event = |
| 146 | render_buffer_->PrepareCaptureProcessing(); |
| 147 | // Reset the delay controller at render buffer underrun. |
| 148 | if (buffer_event == RenderDelayBuffer::BufferingEvent::kRenderUnderrun) { |
Gustaf Ullberg | 8f32b6c | 2019-04-05 16:23:50 +0200 | [diff] [blame] | 149 | if (delay_controller_) |
| 150 | delay_controller_->Reset(false); |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 151 | } |
| 152 | |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 153 | data_dumper_->DumpWav("aec3_processblock_capture_input2", kBlockSize, |
Per Åhgren | d112c75 | 2019-09-02 13:56:56 +0000 | [diff] [blame] | 154 | &(*capture_block)[0][0], |
| 155 | LowestBandRate(sample_rate_hz_), 1); |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 156 | |
Gustaf Ullberg | 8f32b6c | 2019-04-05 16:23:50 +0200 | [diff] [blame] | 157 | bool has_delay_estimator = !config_.delay.use_external_delay_estimator; |
| 158 | if (has_delay_estimator) { |
| 159 | RTC_DCHECK(delay_controller_); |
| 160 | // Compute and apply the render delay required to achieve proper signal |
| 161 | // alignment. |
| 162 | estimated_delay_ = delay_controller_->GetDelay( |
| 163 | render_buffer_->GetDownsampledRenderBuffer(), render_buffer_->Delay(), |
Per Åhgren | d112c75 | 2019-09-02 13:56:56 +0000 | [diff] [blame] | 164 | (*capture_block)[0]); |
peah | 4b572d0 | 2017-04-06 16:33:06 -0700 | [diff] [blame] | 165 | |
Gustaf Ullberg | 8f32b6c | 2019-04-05 16:23:50 +0200 | [diff] [blame] | 166 | if (estimated_delay_) { |
| 167 | bool delay_change = |
| 168 | render_buffer_->AlignFromDelay(estimated_delay_->delay); |
| 169 | if (delay_change) { |
Gustaf Ullberg | 940c2b5 | 2019-08-08 15:04:41 +0200 | [diff] [blame] | 170 | RTC_LOG(LS_INFO) << "Delay changed to " << estimated_delay_->delay |
| 171 | << " at block " << capture_call_counter_; |
Gustaf Ullberg | 8f32b6c | 2019-04-05 16:23:50 +0200 | [diff] [blame] | 172 | echo_path_variability.delay_change = |
| 173 | EchoPathVariability::DelayAdjustment::kNewDetectedDelay; |
| 174 | } |
Per Åhgren | c59a576 | 2017-12-11 21:34:19 +0100 | [diff] [blame] | 175 | } |
Gustaf Ullberg | 8f32b6c | 2019-04-05 16:23:50 +0200 | [diff] [blame] | 176 | |
| 177 | echo_path_variability.clock_drift = delay_controller_->HasClockdrift(); |
| 178 | |
| 179 | } else { |
| 180 | render_buffer_->AlignFromExternalDelay(); |
peah | 96b951c | 2017-08-22 10:26:07 -0700 | [diff] [blame] | 181 | } |
peah | 4b572d0 | 2017-04-06 16:33:06 -0700 | [diff] [blame] | 182 | |
| 183 | // Remove the echo from the capture signal. |
Gustaf Ullberg | 8f32b6c | 2019-04-05 16:23:50 +0200 | [diff] [blame] | 184 | if (has_delay_estimator || render_buffer_->HasReceivedBufferDelay()) { |
| 185 | echo_remover_->ProcessCapture( |
| 186 | echo_path_variability, capture_signal_saturation, estimated_delay_, |
| 187 | render_buffer_->GetRenderBuffer(), capture_block); |
| 188 | } |
peah | 4b572d0 | 2017-04-06 16:33:06 -0700 | [diff] [blame] | 189 | |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 190 | // Update the metrics. |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 191 | metrics_.UpdateCapture(false); |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 192 | } |
| 193 | |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 194 | void BlockProcessorImpl::BufferRender( |
Per Åhgren | d112c75 | 2019-09-02 13:56:56 +0000 | [diff] [blame] | 195 | const std::vector<std::vector<float>>& block) { |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 196 | RTC_DCHECK_EQ(NumBandsForRate(sample_rate_hz_), block.size()); |
Per Åhgren | d112c75 | 2019-09-02 13:56:56 +0000 | [diff] [blame] | 197 | RTC_DCHECK_EQ(kBlockSize, block[0].size()); |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 198 | data_dumper_->DumpRaw("aec3_processblock_call_order", |
| 199 | static_cast<int>(BlockProcessorApiCall::kRender)); |
| 200 | data_dumper_->DumpWav("aec3_processblock_render_input", kBlockSize, |
Per Åhgren | d112c75 | 2019-09-02 13:56:56 +0000 | [diff] [blame] | 201 | &block[0][0], LowestBandRate(sample_rate_hz_), 1); |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 202 | data_dumper_->DumpWav("aec3_processblock_render_input2", kBlockSize, |
Per Åhgren | d112c75 | 2019-09-02 13:56:56 +0000 | [diff] [blame] | 203 | &block[0][0], LowestBandRate(sample_rate_hz_), 1); |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 204 | |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 205 | render_event_ = render_buffer_->Insert(block); |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 206 | |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 207 | metrics_.UpdateRender(render_event_ != |
| 208 | RenderDelayBuffer::BufferingEvent::kNone); |
| 209 | |
| 210 | render_properly_started_ = true; |
Gustaf Ullberg | 8f32b6c | 2019-04-05 16:23:50 +0200 | [diff] [blame] | 211 | if (delay_controller_) |
| 212 | delay_controller_->LogRenderCall(); |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 213 | } |
| 214 | |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 215 | void BlockProcessorImpl::UpdateEchoLeakageStatus(bool leakage_detected) { |
| 216 | echo_remover_->UpdateEchoLeakageStatus(leakage_detected); |
| 217 | } |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 218 | |
Gustaf Ullberg | 332150d | 2017-11-22 14:17:39 +0100 | [diff] [blame] | 219 | void BlockProcessorImpl::GetMetrics(EchoControl::Metrics* metrics) const { |
| 220 | echo_remover_->GetMetrics(metrics); |
Per Åhgren | d112c75 | 2019-09-02 13:56:56 +0000 | [diff] [blame] | 221 | const int block_size_ms = sample_rate_hz_ == 8000 ? 8 : 4; |
Danil Chapovalov | db9f7ab | 2018-06-19 10:50:11 +0200 | [diff] [blame] | 222 | absl::optional<size_t> delay = render_buffer_->Delay(); |
Per Åhgren | c59a576 | 2017-12-11 21:34:19 +0100 | [diff] [blame] | 223 | metrics->delay_ms = delay ? static_cast<int>(*delay) * block_size_ms : 0; |
Gustaf Ullberg | 332150d | 2017-11-22 14:17:39 +0100 | [diff] [blame] | 224 | } |
| 225 | |
Per Åhgren | d0fa820 | 2018-04-18 09:35:13 +0200 | [diff] [blame] | 226 | void BlockProcessorImpl::SetAudioBufferDelay(size_t delay_ms) { |
| 227 | render_buffer_->SetAudioBufferDelay(delay_ms); |
| 228 | } |
| 229 | |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 230 | } // namespace |
| 231 | |
Gustaf Ullberg | bd83b91 | 2017-10-18 12:32:42 +0200 | [diff] [blame] | 232 | BlockProcessor* BlockProcessor::Create(const EchoCanceller3Config& config, |
Per Åhgren | d112c75 | 2019-09-02 13:56:56 +0000 | [diff] [blame] | 233 | int sample_rate_hz) { |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 234 | std::unique_ptr<RenderDelayBuffer> render_buffer( |
Per Åhgren | d112c75 | 2019-09-02 13:56:56 +0000 | [diff] [blame] | 235 | RenderDelayBuffer::Create(config, sample_rate_hz)); |
Gustaf Ullberg | 8f32b6c | 2019-04-05 16:23:50 +0200 | [diff] [blame] | 236 | std::unique_ptr<RenderDelayController> delay_controller; |
| 237 | if (!config.delay.use_external_delay_estimator) { |
| 238 | delay_controller.reset( |
| 239 | RenderDelayController::Create(config, sample_rate_hz)); |
| 240 | } |
Per Åhgren | d112c75 | 2019-09-02 13:56:56 +0000 | [diff] [blame] | 241 | std::unique_ptr<EchoRemover> echo_remover( |
| 242 | EchoRemover::Create(config, sample_rate_hz)); |
| 243 | return Create(config, sample_rate_hz, std::move(render_buffer), |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 244 | std::move(delay_controller), std::move(echo_remover)); |
| 245 | } |
| 246 | |
| 247 | BlockProcessor* BlockProcessor::Create( |
Gustaf Ullberg | bd83b91 | 2017-10-18 12:32:42 +0200 | [diff] [blame] | 248 | const EchoCanceller3Config& config, |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 249 | int sample_rate_hz, |
| 250 | std::unique_ptr<RenderDelayBuffer> render_buffer) { |
Gustaf Ullberg | 8f32b6c | 2019-04-05 16:23:50 +0200 | [diff] [blame] | 251 | std::unique_ptr<RenderDelayController> delay_controller; |
| 252 | if (!config.delay.use_external_delay_estimator) { |
| 253 | delay_controller.reset( |
| 254 | RenderDelayController::Create(config, sample_rate_hz)); |
| 255 | } |
Per Åhgren | d112c75 | 2019-09-02 13:56:56 +0000 | [diff] [blame] | 256 | std::unique_ptr<EchoRemover> echo_remover( |
| 257 | EchoRemover::Create(config, sample_rate_hz)); |
| 258 | return Create(config, sample_rate_hz, std::move(render_buffer), |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 259 | std::move(delay_controller), std::move(echo_remover)); |
| 260 | } |
| 261 | |
| 262 | BlockProcessor* BlockProcessor::Create( |
Gustaf Ullberg | bd83b91 | 2017-10-18 12:32:42 +0200 | [diff] [blame] | 263 | const EchoCanceller3Config& config, |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 264 | int sample_rate_hz, |
| 265 | std::unique_ptr<RenderDelayBuffer> render_buffer, |
| 266 | std::unique_ptr<RenderDelayController> delay_controller, |
| 267 | std::unique_ptr<EchoRemover> echo_remover) { |
Per Åhgren | d112c75 | 2019-09-02 13:56:56 +0000 | [diff] [blame] | 268 | return new BlockProcessorImpl( |
| 269 | config, sample_rate_hz, std::move(render_buffer), |
| 270 | std::move(delay_controller), std::move(echo_remover)); |
peah | d026354 | 2017-01-03 04:20:34 -0800 | [diff] [blame] | 271 | } |
| 272 | |
| 273 | } // namespace webrtc |