peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (c) 2017 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/render_delay_controller.h" |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 11 | |
| 12 | #include <algorithm> |
| 13 | #include <memory> |
Per Åhgren | 4712776 | 2018-02-13 12:59:33 +0100 | [diff] [blame] | 14 | #include <numeric> |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 15 | #include <string> |
| 16 | #include <vector> |
| 17 | |
Gustaf Ullberg | 3646f97 | 2018-02-14 15:19:04 +0100 | [diff] [blame] | 18 | #include "api/audio/echo_canceller3_config.h" |
Mirko Bonadei | 92ea95e | 2017-09-15 06:47:31 +0200 | [diff] [blame] | 19 | #include "modules/audio_processing/aec3/aec3_common.h" |
| 20 | #include "modules/audio_processing/aec3/echo_path_delay_estimator.h" |
| 21 | #include "modules/audio_processing/aec3/render_delay_controller_metrics.h" |
Per Åhgren | 39f491e | 2018-02-22 00:39:23 +0100 | [diff] [blame] | 22 | #include "modules/audio_processing/aec3/skew_estimator.h" |
Mirko Bonadei | 92ea95e | 2017-09-15 06:47:31 +0200 | [diff] [blame] | 23 | #include "rtc_base/atomicops.h" |
| 24 | #include "rtc_base/constructormagic.h" |
Per Åhgren | d8243fa | 2018-02-22 17:51:39 +0100 | [diff] [blame] | 25 | #include "rtc_base/logging.h" |
Per Åhgren | 2d9a3b1 | 2018-05-17 17:24:29 +0200 | [diff] [blame] | 26 | #include "system_wrappers/include/field_trial.h" |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 27 | |
| 28 | namespace webrtc { |
| 29 | |
| 30 | namespace { |
| 31 | |
Per Åhgren | 2d9a3b1 | 2018-05-17 17:24:29 +0200 | [diff] [blame] | 32 | int GetSkewHysteresis(const EchoCanceller3Config& config) { |
| 33 | if (field_trial::IsEnabled("WebRTC-Aec3EnforceSkewHysteresis1")) { |
| 34 | return 1; |
| 35 | } |
| 36 | if (field_trial::IsEnabled("WebRTC-Aec3EnforceSkewHysteresis2")) { |
| 37 | return 2; |
| 38 | } |
| 39 | |
| 40 | return static_cast<int>(config.delay.skew_hysteresis_blocks); |
| 41 | } |
| 42 | |
Gustaf Ullberg | d7b0c46 | 2018-10-04 12:59:24 +0200 | [diff] [blame^] | 43 | bool UseOffsetBlocks() { |
| 44 | return field_trial::IsEnabled("WebRTC-Aec3UseOffsetBlocks"); |
| 45 | } |
| 46 | |
Per Åhgren | 4712776 | 2018-02-13 12:59:33 +0100 | [diff] [blame] | 47 | constexpr int kSkewHistorySizeLog2 = 8; |
| 48 | |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 49 | class RenderDelayControllerImpl final : public RenderDelayController { |
| 50 | public: |
Gustaf Ullberg | bd83b91 | 2017-10-18 12:32:42 +0200 | [diff] [blame] | 51 | RenderDelayControllerImpl(const EchoCanceller3Config& config, |
Per Åhgren | c59a576 | 2017-12-11 21:34:19 +0100 | [diff] [blame] | 52 | int non_causal_offset, |
Gustaf Ullberg | bd83b91 | 2017-10-18 12:32:42 +0200 | [diff] [blame] | 53 | int sample_rate_hz); |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 54 | ~RenderDelayControllerImpl() override; |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 55 | void Reset() override; |
Per Åhgren | 4712776 | 2018-02-13 12:59:33 +0100 | [diff] [blame] | 56 | void LogRenderCall() override; |
Danil Chapovalov | db9f7ab | 2018-06-19 10:50:11 +0200 | [diff] [blame] | 57 | absl::optional<DelayEstimate> GetDelay( |
Per Åhgren | a76ef9d | 2018-01-25 07:01:34 +0100 | [diff] [blame] | 58 | const DownsampledRenderBuffer& render_buffer, |
Per Åhgren | 5c532d3 | 2018-03-22 00:29:25 +0100 | [diff] [blame] | 59 | size_t render_delay_buffer_delay, |
Danil Chapovalov | db9f7ab | 2018-06-19 10:50:11 +0200 | [diff] [blame] | 60 | const absl::optional<int>& echo_remover_delay, |
Per Åhgren | a76ef9d | 2018-01-25 07:01:34 +0100 | [diff] [blame] | 61 | rtc::ArrayView<const float> capture) override; |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 62 | |
| 63 | private: |
| 64 | static int instance_count_; |
| 65 | std::unique_ptr<ApmDataDumper> data_dumper_; |
Per Åhgren | d84b3d1 | 2018-01-12 14:47:11 +0100 | [diff] [blame] | 66 | const int delay_headroom_blocks_; |
| 67 | const int hysteresis_limit_1_blocks_; |
| 68 | const int hysteresis_limit_2_blocks_; |
Per Åhgren | 8447e91 | 2018-02-28 13:28:34 +0100 | [diff] [blame] | 69 | const int skew_hysteresis_blocks_; |
Gustaf Ullberg | d7b0c46 | 2018-10-04 12:59:24 +0200 | [diff] [blame^] | 70 | const bool use_offset_blocks_; |
Danil Chapovalov | db9f7ab | 2018-06-19 10:50:11 +0200 | [diff] [blame] | 71 | absl::optional<DelayEstimate> delay_; |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 72 | EchoPathDelayEstimator delay_estimator_; |
Per Åhgren | c59a576 | 2017-12-11 21:34:19 +0100 | [diff] [blame] | 73 | std::vector<float> delay_buf_; |
| 74 | int delay_buf_index_ = 0; |
peah | e985b3f | 2017-02-28 22:08:53 -0800 | [diff] [blame] | 75 | RenderDelayControllerMetrics metrics_; |
Per Åhgren | 4712776 | 2018-02-13 12:59:33 +0100 | [diff] [blame] | 76 | SkewEstimator skew_estimator_; |
Danil Chapovalov | db9f7ab | 2018-06-19 10:50:11 +0200 | [diff] [blame] | 77 | absl::optional<DelayEstimate> delay_samples_; |
| 78 | absl::optional<int> skew_; |
Per Åhgren | d8243fa | 2018-02-22 17:51:39 +0100 | [diff] [blame] | 79 | int previous_offset_blocks_ = 0; |
| 80 | int skew_shift_reporting_counter_ = 0; |
| 81 | size_t capture_call_counter_ = 0; |
Per Åhgren | 4712776 | 2018-02-13 12:59:33 +0100 | [diff] [blame] | 82 | int delay_change_counter_ = 0; |
| 83 | size_t soft_reset_counter_ = 0; |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 84 | RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RenderDelayControllerImpl); |
| 85 | }; |
| 86 | |
Per Åhgren | 4712776 | 2018-02-13 12:59:33 +0100 | [diff] [blame] | 87 | DelayEstimate ComputeBufferDelay( |
Danil Chapovalov | db9f7ab | 2018-06-19 10:50:11 +0200 | [diff] [blame] | 88 | const absl::optional<DelayEstimate>& current_delay, |
Per Åhgren | a76ef9d | 2018-01-25 07:01:34 +0100 | [diff] [blame] | 89 | int delay_headroom_blocks, |
| 90 | int hysteresis_limit_1_blocks, |
| 91 | int hysteresis_limit_2_blocks, |
Per Åhgren | 4712776 | 2018-02-13 12:59:33 +0100 | [diff] [blame] | 92 | int offset_blocks, |
Per Åhgren | a76ef9d | 2018-01-25 07:01:34 +0100 | [diff] [blame] | 93 | DelayEstimate estimated_delay) { |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 94 | // The below division is not exact and the truncation is intended. |
Per Åhgren | a76ef9d | 2018-01-25 07:01:34 +0100 | [diff] [blame] | 95 | const int echo_path_delay_blocks = estimated_delay.delay >> kBlockSizeLog2; |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 96 | |
| 97 | // Compute the buffer delay increase required to achieve the desired latency. |
Per Åhgren | 4712776 | 2018-02-13 12:59:33 +0100 | [diff] [blame] | 98 | size_t new_delay_blocks = std::max( |
| 99 | echo_path_delay_blocks + offset_blocks - delay_headroom_blocks, 0); |
Per Åhgren | a76ef9d | 2018-01-25 07:01:34 +0100 | [diff] [blame] | 100 | |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 101 | // Add hysteresis. |
Per Åhgren | c59a576 | 2017-12-11 21:34:19 +0100 | [diff] [blame] | 102 | if (current_delay) { |
Per Åhgren | a76ef9d | 2018-01-25 07:01:34 +0100 | [diff] [blame] | 103 | size_t current_delay_blocks = current_delay->delay; |
| 104 | if (new_delay_blocks > current_delay_blocks) { |
| 105 | if (new_delay_blocks <= |
| 106 | current_delay_blocks + hysteresis_limit_1_blocks) { |
| 107 | new_delay_blocks = current_delay_blocks; |
Per Åhgren | d84b3d1 | 2018-01-12 14:47:11 +0100 | [diff] [blame] | 108 | } |
Per Åhgren | a76ef9d | 2018-01-25 07:01:34 +0100 | [diff] [blame] | 109 | } else if (new_delay_blocks < current_delay_blocks) { |
Per Åhgren | d84b3d1 | 2018-01-12 14:47:11 +0100 | [diff] [blame] | 110 | size_t hysteresis_limit = std::max( |
Per Åhgren | a76ef9d | 2018-01-25 07:01:34 +0100 | [diff] [blame] | 111 | static_cast<int>(current_delay_blocks) - hysteresis_limit_2_blocks, |
| 112 | 0); |
| 113 | if (new_delay_blocks >= hysteresis_limit) { |
| 114 | new_delay_blocks = current_delay_blocks; |
Per Åhgren | d84b3d1 | 2018-01-12 14:47:11 +0100 | [diff] [blame] | 115 | } |
Per Åhgren | c59a576 | 2017-12-11 21:34:19 +0100 | [diff] [blame] | 116 | } |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 117 | } |
| 118 | |
Per Åhgren | 3ab308f | 2018-02-21 08:46:03 +0100 | [diff] [blame] | 119 | DelayEstimate new_delay = estimated_delay; |
| 120 | new_delay.delay = new_delay_blocks; |
| 121 | return new_delay; |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 122 | } |
| 123 | |
| 124 | int RenderDelayControllerImpl::instance_count_ = 0; |
| 125 | |
peah | 4fed3c0 | 2017-08-30 06:58:44 -0700 | [diff] [blame] | 126 | RenderDelayControllerImpl::RenderDelayControllerImpl( |
Gustaf Ullberg | bd83b91 | 2017-10-18 12:32:42 +0200 | [diff] [blame] | 127 | const EchoCanceller3Config& config, |
Per Åhgren | c59a576 | 2017-12-11 21:34:19 +0100 | [diff] [blame] | 128 | int non_causal_offset, |
peah | 4fed3c0 | 2017-08-30 06:58:44 -0700 | [diff] [blame] | 129 | int sample_rate_hz) |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 130 | : data_dumper_( |
| 131 | new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))), |
Per Åhgren | d84b3d1 | 2018-01-12 14:47:11 +0100 | [diff] [blame] | 132 | delay_headroom_blocks_( |
| 133 | static_cast<int>(config.delay.delay_headroom_blocks)), |
| 134 | hysteresis_limit_1_blocks_( |
| 135 | static_cast<int>(config.delay.hysteresis_limit_1_blocks)), |
| 136 | hysteresis_limit_2_blocks_( |
| 137 | static_cast<int>(config.delay.hysteresis_limit_2_blocks)), |
Per Åhgren | 2d9a3b1 | 2018-05-17 17:24:29 +0200 | [diff] [blame] | 138 | skew_hysteresis_blocks_(GetSkewHysteresis(config)), |
Gustaf Ullberg | d7b0c46 | 2018-10-04 12:59:24 +0200 | [diff] [blame^] | 139 | use_offset_blocks_(UseOffsetBlocks()), |
Per Åhgren | 8ba5861 | 2017-12-01 23:01:44 +0100 | [diff] [blame] | 140 | delay_estimator_(data_dumper_.get(), config), |
Per Åhgren | 39f491e | 2018-02-22 00:39:23 +0100 | [diff] [blame] | 141 | delay_buf_(kBlockSize * non_causal_offset, 0.f), |
| 142 | skew_estimator_(kSkewHistorySizeLog2) { |
peah | 2192089 | 2017-02-08 05:08:56 -0800 | [diff] [blame] | 143 | RTC_DCHECK(ValidFullBandRate(sample_rate_hz)); |
Per Åhgren | 38e2d95 | 2017-11-17 14:54:28 +0100 | [diff] [blame] | 144 | delay_estimator_.LogDelayEstimationProperties(sample_rate_hz, |
Per Åhgren | c59a576 | 2017-12-11 21:34:19 +0100 | [diff] [blame] | 145 | delay_buf_.size()); |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 146 | } |
| 147 | |
| 148 | RenderDelayControllerImpl::~RenderDelayControllerImpl() = default; |
| 149 | |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 150 | void RenderDelayControllerImpl::Reset() { |
Danil Chapovalov | db9f7ab | 2018-06-19 10:50:11 +0200 | [diff] [blame] | 151 | delay_ = absl::nullopt; |
| 152 | delay_samples_ = absl::nullopt; |
| 153 | skew_ = absl::nullopt; |
Per Åhgren | d8243fa | 2018-02-22 17:51:39 +0100 | [diff] [blame] | 154 | previous_offset_blocks_ = 0; |
Per Åhgren | c59a576 | 2017-12-11 21:34:19 +0100 | [diff] [blame] | 155 | std::fill(delay_buf_.begin(), delay_buf_.end(), 0.f); |
Per Åhgren | 4712776 | 2018-02-13 12:59:33 +0100 | [diff] [blame] | 156 | delay_estimator_.Reset(false); |
| 157 | skew_estimator_.Reset(); |
| 158 | delay_change_counter_ = 0; |
| 159 | soft_reset_counter_ = 0; |
| 160 | } |
| 161 | |
| 162 | void RenderDelayControllerImpl::LogRenderCall() { |
| 163 | skew_estimator_.LogRenderCall(); |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 164 | } |
| 165 | |
Danil Chapovalov | db9f7ab | 2018-06-19 10:50:11 +0200 | [diff] [blame] | 166 | absl::optional<DelayEstimate> RenderDelayControllerImpl::GetDelay( |
peah | cf02cf1 | 2017-04-05 14:18:07 -0700 | [diff] [blame] | 167 | const DownsampledRenderBuffer& render_buffer, |
Per Åhgren | 5c532d3 | 2018-03-22 00:29:25 +0100 | [diff] [blame] | 168 | size_t render_delay_buffer_delay, |
Danil Chapovalov | db9f7ab | 2018-06-19 10:50:11 +0200 | [diff] [blame] | 169 | const absl::optional<int>& echo_remover_delay, |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 170 | rtc::ArrayView<const float> capture) { |
| 171 | RTC_DCHECK_EQ(kBlockSize, capture.size()); |
Per Åhgren | d8243fa | 2018-02-22 17:51:39 +0100 | [diff] [blame] | 172 | ++capture_call_counter_; |
Per Åhgren | 930021d | 2017-09-15 07:32:53 +0200 | [diff] [blame] | 173 | |
Per Åhgren | c59a576 | 2017-12-11 21:34:19 +0100 | [diff] [blame] | 174 | // Estimate the delay with a delayed capture. |
| 175 | RTC_DCHECK_LT(delay_buf_index_ + kBlockSize - 1, delay_buf_.size()); |
| 176 | rtc::ArrayView<const float> capture_delayed(&delay_buf_[delay_buf_index_], |
| 177 | kBlockSize); |
| 178 | auto delay_samples = |
| 179 | delay_estimator_.EstimateDelay(render_buffer, capture_delayed); |
| 180 | |
Per Åhgren | 5c532d3 | 2018-03-22 00:29:25 +0100 | [diff] [blame] | 181 | // Overrule the delay estimator delay if the echo remover reports a delay. |
| 182 | if (echo_remover_delay) { |
| 183 | int total_echo_remover_delay_samples = |
| 184 | (render_delay_buffer_delay + *echo_remover_delay) * kBlockSize; |
| 185 | delay_samples = DelayEstimate(DelayEstimate::Quality::kRefined, |
| 186 | total_echo_remover_delay_samples); |
| 187 | } |
| 188 | |
Per Åhgren | 930021d | 2017-09-15 07:32:53 +0200 | [diff] [blame] | 189 | std::copy(capture.begin(), capture.end(), |
Per Åhgren | c59a576 | 2017-12-11 21:34:19 +0100 | [diff] [blame] | 190 | delay_buf_.begin() + delay_buf_index_); |
| 191 | delay_buf_index_ = (delay_buf_index_ + kBlockSize) % delay_buf_.size(); |
Per Åhgren | 930021d | 2017-09-15 07:32:53 +0200 | [diff] [blame] | 192 | |
Per Åhgren | 4712776 | 2018-02-13 12:59:33 +0100 | [diff] [blame] | 193 | // Compute the latest skew update. |
Danil Chapovalov | db9f7ab | 2018-06-19 10:50:11 +0200 | [diff] [blame] | 194 | absl::optional<int> skew = skew_estimator_.GetSkewFromCapture(); |
Per Åhgren | 4712776 | 2018-02-13 12:59:33 +0100 | [diff] [blame] | 195 | |
Per Åhgren | c59a576 | 2017-12-11 21:34:19 +0100 | [diff] [blame] | 196 | if (delay_samples) { |
Per Åhgren | 5c532d3 | 2018-03-22 00:29:25 +0100 | [diff] [blame] | 197 | // TODO(peah): Refactor the rest of the code to assume a kRefined estimate |
| 198 | // quality. |
| 199 | RTC_DCHECK(DelayEstimate::Quality::kRefined == delay_samples->quality); |
Per Åhgren | 4712776 | 2018-02-13 12:59:33 +0100 | [diff] [blame] | 200 | if (!delay_samples_ || delay_samples->delay != delay_samples_->delay) { |
| 201 | delay_change_counter_ = 0; |
| 202 | } |
Per Åhgren | 3ab308f | 2018-02-21 08:46:03 +0100 | [diff] [blame] | 203 | if (delay_samples_) { |
| 204 | delay_samples_->blocks_since_last_change = |
| 205 | delay_samples_->delay == delay_samples->delay |
| 206 | ? delay_samples_->blocks_since_last_change + 1 |
| 207 | : 0; |
| 208 | delay_samples_->blocks_since_last_update = 0; |
| 209 | delay_samples_->delay = delay_samples->delay; |
| 210 | delay_samples_->quality = delay_samples->quality; |
| 211 | } else { |
| 212 | delay_samples_ = delay_samples; |
| 213 | } |
| 214 | } else { |
| 215 | if (delay_samples_) { |
| 216 | ++delay_samples_->blocks_since_last_change; |
| 217 | ++delay_samples_->blocks_since_last_update; |
| 218 | } |
Per Åhgren | 930021d | 2017-09-15 07:32:53 +0200 | [diff] [blame] | 219 | } |
peah | e985b3f | 2017-02-28 22:08:53 -0800 | [diff] [blame] | 220 | |
Per Åhgren | 4712776 | 2018-02-13 12:59:33 +0100 | [diff] [blame] | 221 | if (delay_change_counter_ < 2 * kNumBlocksPerSecond) { |
| 222 | ++delay_change_counter_; |
| 223 | // If a new delay estimate is recently obtained, store the skew for that. |
| 224 | skew_ = skew; |
| 225 | } else { |
| 226 | // A reliable skew should have been obtained after 2 seconds. |
| 227 | RTC_DCHECK(skew_); |
| 228 | RTC_DCHECK(skew); |
| 229 | } |
| 230 | |
| 231 | ++soft_reset_counter_; |
| 232 | int offset_blocks = 0; |
| 233 | if (skew_ && skew && delay_samples_ && |
| 234 | delay_samples_->quality == DelayEstimate::Quality::kRefined) { |
| 235 | // Compute the skew offset and add a margin. |
| 236 | offset_blocks = *skew_ - *skew; |
Per Åhgren | 8447e91 | 2018-02-28 13:28:34 +0100 | [diff] [blame] | 237 | if (abs(offset_blocks) <= skew_hysteresis_blocks_) { |
| 238 | offset_blocks = 0; |
| 239 | } else if (soft_reset_counter_ > 10 * kNumBlocksPerSecond) { |
Per Åhgren | 4712776 | 2018-02-13 12:59:33 +0100 | [diff] [blame] | 240 | // Soft reset the delay estimator if there is a significant offset |
| 241 | // detected. |
| 242 | delay_estimator_.Reset(true); |
| 243 | soft_reset_counter_ = 0; |
| 244 | } |
| 245 | } |
Gustaf Ullberg | d7b0c46 | 2018-10-04 12:59:24 +0200 | [diff] [blame^] | 246 | if (!use_offset_blocks_) |
| 247 | offset_blocks = 0; |
Per Åhgren | 4712776 | 2018-02-13 12:59:33 +0100 | [diff] [blame] | 248 | |
Per Åhgren | d8243fa | 2018-02-22 17:51:39 +0100 | [diff] [blame] | 249 | // Log any changes in the skew. |
| 250 | skew_shift_reporting_counter_ = |
| 251 | std::max(0, skew_shift_reporting_counter_ - 1); |
Danil Chapovalov | db9f7ab | 2018-06-19 10:50:11 +0200 | [diff] [blame] | 252 | absl::optional<int> skew_shift = |
Per Åhgren | d8243fa | 2018-02-22 17:51:39 +0100 | [diff] [blame] | 253 | skew_shift_reporting_counter_ == 0 && |
| 254 | previous_offset_blocks_ != offset_blocks |
Danil Chapovalov | db9f7ab | 2018-06-19 10:50:11 +0200 | [diff] [blame] | 255 | ? absl::optional<int>(offset_blocks - previous_offset_blocks_) |
| 256 | : absl::nullopt; |
Per Åhgren | d8243fa | 2018-02-22 17:51:39 +0100 | [diff] [blame] | 257 | previous_offset_blocks_ = offset_blocks; |
| 258 | if (skew_shift) { |
| 259 | RTC_LOG(LS_WARNING) << "API call skew shift of " << *skew_shift |
| 260 | << " blocks detected at capture block " |
| 261 | << capture_call_counter_; |
| 262 | skew_shift_reporting_counter_ = 3 * kNumBlocksPerSecond; |
| 263 | } |
| 264 | |
Per Åhgren | 4712776 | 2018-02-13 12:59:33 +0100 | [diff] [blame] | 265 | if (delay_samples_) { |
| 266 | // Compute the render delay buffer delay. |
| 267 | delay_ = ComputeBufferDelay( |
| 268 | delay_, delay_headroom_blocks_, hysteresis_limit_1_blocks_, |
| 269 | hysteresis_limit_2_blocks_, offset_blocks, *delay_samples_); |
| 270 | } |
| 271 | |
Danil Chapovalov | db9f7ab | 2018-06-19 10:50:11 +0200 | [diff] [blame] | 272 | metrics_.Update(delay_samples_ ? absl::optional<size_t>(delay_samples_->delay) |
| 273 | : absl::nullopt, |
Per Åhgren | d8243fa | 2018-02-22 17:51:39 +0100 | [diff] [blame] | 274 | delay_ ? delay_->delay : 0, skew_shift); |
Per Åhgren | 4712776 | 2018-02-13 12:59:33 +0100 | [diff] [blame] | 275 | |
Per Åhgren | c59a576 | 2017-12-11 21:34:19 +0100 | [diff] [blame] | 276 | data_dumper_->DumpRaw("aec3_render_delay_controller_delay", |
Per Åhgren | a76ef9d | 2018-01-25 07:01:34 +0100 | [diff] [blame] | 277 | delay_samples ? delay_samples->delay : 0); |
Per Åhgren | c59a576 | 2017-12-11 21:34:19 +0100 | [diff] [blame] | 278 | data_dumper_->DumpRaw("aec3_render_delay_controller_buffer_delay", |
Per Åhgren | a76ef9d | 2018-01-25 07:01:34 +0100 | [diff] [blame] | 279 | delay_ ? delay_->delay : 0); |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 280 | |
Per Åhgren | 4712776 | 2018-02-13 12:59:33 +0100 | [diff] [blame] | 281 | data_dumper_->DumpRaw("aec3_render_delay_controller_new_skew", |
| 282 | skew ? *skew : 0); |
| 283 | data_dumper_->DumpRaw("aec3_render_delay_controller_old_skew", |
| 284 | skew_ ? *skew_ : 0); |
| 285 | data_dumper_->DumpRaw("aec3_render_delay_controller_offset", offset_blocks); |
| 286 | |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 287 | return delay_; |
| 288 | } |
| 289 | |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 290 | } // namespace |
| 291 | |
peah | 4fed3c0 | 2017-08-30 06:58:44 -0700 | [diff] [blame] | 292 | RenderDelayController* RenderDelayController::Create( |
Gustaf Ullberg | bd83b91 | 2017-10-18 12:32:42 +0200 | [diff] [blame] | 293 | const EchoCanceller3Config& config, |
Per Åhgren | c59a576 | 2017-12-11 21:34:19 +0100 | [diff] [blame] | 294 | int non_causal_offset, |
peah | 4fed3c0 | 2017-08-30 06:58:44 -0700 | [diff] [blame] | 295 | int sample_rate_hz) { |
Per Åhgren | c59a576 | 2017-12-11 21:34:19 +0100 | [diff] [blame] | 296 | return new RenderDelayControllerImpl(config, non_causal_offset, |
| 297 | sample_rate_hz); |
peah | 69221db | 2017-01-27 03:28:19 -0800 | [diff] [blame] | 298 | } |
| 299 | |
| 300 | } // namespace webrtc |