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