This CL simplifies the buffering of render data. Instead of making assumptions about the worst possible platform, it leverages recent improvements in the delay estimator to quickly adapt when the conditions change. Pros: - No capture delay, delay is found ~200 ms faster. - Cleaner code that makes the concept of delay more clear. - Allows for removal of one matched filter because of the jitter headroom removal. Cons: - Delay estimator needs to re-adapt when the call jitter increases. The code can be deactivated by a kill switch. When the kill switch is pulled the CL is bit exact. Bug: webrtc:9726,chromium:895338 Change-Id: Ie2f9c8c5ce5b5a4510b4bdb95db2b970b57cd5d0 Reviewed-on: https://webrtc-review.googlesource.com/c/96920 Commit-Queue: Gustaf Ullberg <gustaf@webrtc.org> Reviewed-by: Per Åhgren <peah@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25169}
199 lines
6.9 KiB
C++
199 lines
6.9 KiB
C++
/*
|
|
* Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
#include "modules/audio_processing/aec3/render_delay_controller.h"
|
|
|
|
#include <algorithm>
|
|
#include <memory>
|
|
#include <numeric>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include "api/audio/echo_canceller3_config.h"
|
|
#include "modules/audio_processing/aec3/aec3_common.h"
|
|
#include "modules/audio_processing/aec3/echo_path_delay_estimator.h"
|
|
#include "modules/audio_processing/aec3/render_delay_controller_metrics.h"
|
|
#include "rtc_base/atomicops.h"
|
|
#include "rtc_base/constructormagic.h"
|
|
#include "rtc_base/logging.h"
|
|
#include "system_wrappers/include/field_trial.h"
|
|
|
|
namespace webrtc {
|
|
|
|
namespace {
|
|
|
|
class RenderDelayControllerImpl2 final : public RenderDelayController {
|
|
public:
|
|
RenderDelayControllerImpl2(const EchoCanceller3Config& config,
|
|
int sample_rate_hz);
|
|
~RenderDelayControllerImpl2() override;
|
|
void Reset() override;
|
|
void LogRenderCall() override;
|
|
absl::optional<DelayEstimate> GetDelay(
|
|
const DownsampledRenderBuffer& render_buffer,
|
|
size_t render_delay_buffer_delay,
|
|
const absl::optional<int>& echo_remover_delay,
|
|
rtc::ArrayView<const float> capture) override;
|
|
|
|
private:
|
|
static int instance_count_;
|
|
std::unique_ptr<ApmDataDumper> data_dumper_;
|
|
const int delay_headroom_blocks_;
|
|
const int hysteresis_limit_1_blocks_;
|
|
const int hysteresis_limit_2_blocks_;
|
|
absl::optional<DelayEstimate> delay_;
|
|
EchoPathDelayEstimator delay_estimator_;
|
|
RenderDelayControllerMetrics metrics_;
|
|
absl::optional<DelayEstimate> delay_samples_;
|
|
size_t capture_call_counter_ = 0;
|
|
int delay_change_counter_ = 0;
|
|
RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RenderDelayControllerImpl2);
|
|
};
|
|
|
|
DelayEstimate ComputeBufferDelay(
|
|
const absl::optional<DelayEstimate>& current_delay,
|
|
int delay_headroom_blocks,
|
|
int hysteresis_limit_1_blocks,
|
|
int hysteresis_limit_2_blocks,
|
|
DelayEstimate estimated_delay) {
|
|
// The below division is not exact and the truncation is intended.
|
|
const int echo_path_delay_blocks = estimated_delay.delay >> kBlockSizeLog2;
|
|
|
|
// Compute the buffer delay increase required to achieve the desired latency.
|
|
size_t new_delay_blocks =
|
|
std::max(echo_path_delay_blocks - delay_headroom_blocks, 0);
|
|
|
|
// Add hysteresis.
|
|
if (current_delay) {
|
|
size_t current_delay_blocks = current_delay->delay;
|
|
if (new_delay_blocks > current_delay_blocks) {
|
|
if (new_delay_blocks <=
|
|
current_delay_blocks + hysteresis_limit_1_blocks) {
|
|
new_delay_blocks = current_delay_blocks;
|
|
}
|
|
} else if (new_delay_blocks < current_delay_blocks) {
|
|
size_t hysteresis_limit = std::max(
|
|
static_cast<int>(current_delay_blocks) - hysteresis_limit_2_blocks,
|
|
0);
|
|
if (new_delay_blocks >= hysteresis_limit) {
|
|
new_delay_blocks = current_delay_blocks;
|
|
}
|
|
}
|
|
}
|
|
|
|
DelayEstimate new_delay = estimated_delay;
|
|
new_delay.delay = new_delay_blocks;
|
|
return new_delay;
|
|
}
|
|
|
|
int RenderDelayControllerImpl2::instance_count_ = 0;
|
|
|
|
RenderDelayControllerImpl2::RenderDelayControllerImpl2(
|
|
const EchoCanceller3Config& config,
|
|
int sample_rate_hz)
|
|
: data_dumper_(
|
|
new ApmDataDumper(rtc::AtomicOps::Increment(&instance_count_))),
|
|
delay_headroom_blocks_(
|
|
static_cast<int>(config.delay.delay_headroom_blocks)),
|
|
hysteresis_limit_1_blocks_(
|
|
static_cast<int>(config.delay.hysteresis_limit_1_blocks)),
|
|
hysteresis_limit_2_blocks_(
|
|
static_cast<int>(config.delay.hysteresis_limit_2_blocks)),
|
|
delay_estimator_(data_dumper_.get(), config) {
|
|
RTC_DCHECK(ValidFullBandRate(sample_rate_hz));
|
|
delay_estimator_.LogDelayEstimationProperties(sample_rate_hz, 0);
|
|
}
|
|
|
|
RenderDelayControllerImpl2::~RenderDelayControllerImpl2() = default;
|
|
|
|
void RenderDelayControllerImpl2::Reset() {
|
|
delay_ = absl::nullopt;
|
|
delay_samples_ = absl::nullopt;
|
|
delay_estimator_.Reset(false);
|
|
delay_change_counter_ = 0;
|
|
}
|
|
|
|
void RenderDelayControllerImpl2::LogRenderCall() {}
|
|
|
|
absl::optional<DelayEstimate> RenderDelayControllerImpl2::GetDelay(
|
|
const DownsampledRenderBuffer& render_buffer,
|
|
size_t render_delay_buffer_delay,
|
|
const absl::optional<int>& echo_remover_delay,
|
|
rtc::ArrayView<const float> capture) {
|
|
RTC_DCHECK_EQ(kBlockSize, capture.size());
|
|
++capture_call_counter_;
|
|
|
|
auto delay_samples = delay_estimator_.EstimateDelay(render_buffer, capture);
|
|
|
|
// Overrule the delay estimator delay if the echo remover reports a delay.
|
|
if (echo_remover_delay) {
|
|
int total_echo_remover_delay_samples =
|
|
(render_delay_buffer_delay + *echo_remover_delay) * kBlockSize;
|
|
delay_samples = DelayEstimate(DelayEstimate::Quality::kRefined,
|
|
total_echo_remover_delay_samples);
|
|
}
|
|
|
|
if (delay_samples) {
|
|
// TODO(peah): Refactor the rest of the code to assume a kRefined estimate
|
|
// quality.
|
|
RTC_DCHECK(DelayEstimate::Quality::kRefined == delay_samples->quality);
|
|
if (!delay_samples_ || delay_samples->delay != delay_samples_->delay) {
|
|
delay_change_counter_ = 0;
|
|
}
|
|
if (delay_samples_) {
|
|
delay_samples_->blocks_since_last_change =
|
|
delay_samples_->delay == delay_samples->delay
|
|
? delay_samples_->blocks_since_last_change + 1
|
|
: 0;
|
|
delay_samples_->blocks_since_last_update = 0;
|
|
delay_samples_->delay = delay_samples->delay;
|
|
delay_samples_->quality = delay_samples->quality;
|
|
} else {
|
|
delay_samples_ = delay_samples;
|
|
}
|
|
} else {
|
|
if (delay_samples_) {
|
|
++delay_samples_->blocks_since_last_change;
|
|
++delay_samples_->blocks_since_last_update;
|
|
}
|
|
}
|
|
|
|
if (delay_change_counter_ < 2 * kNumBlocksPerSecond) {
|
|
++delay_change_counter_;
|
|
}
|
|
|
|
if (delay_samples_) {
|
|
// Compute the render delay buffer delay.
|
|
delay_ = ComputeBufferDelay(delay_, delay_headroom_blocks_,
|
|
hysteresis_limit_1_blocks_,
|
|
hysteresis_limit_2_blocks_, *delay_samples_);
|
|
}
|
|
|
|
metrics_.Update(delay_samples_ ? absl::optional<size_t>(delay_samples_->delay)
|
|
: absl::nullopt,
|
|
delay_ ? delay_->delay : 0, 0);
|
|
|
|
data_dumper_->DumpRaw("aec3_render_delay_controller_delay",
|
|
delay_samples ? delay_samples->delay : 0);
|
|
data_dumper_->DumpRaw("aec3_render_delay_controller_buffer_delay",
|
|
delay_ ? delay_->delay : 0);
|
|
|
|
return delay_;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
RenderDelayController* RenderDelayController::Create2(
|
|
const EchoCanceller3Config& config,
|
|
int sample_rate_hz) {
|
|
return new RenderDelayControllerImpl2(config, sample_rate_hz);
|
|
}
|
|
|
|
} // namespace webrtc
|