mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-14 14:20:45 +01:00
895ae9a0cd
This CL significantly improves the response time of the AEC3 delay estimator to audio buffer issues. The CL adds ensures that the delay estimator correlators reacts to buffer issues from the zero state which is much faster than if it has already achieved a state matching a previous alignment. The CL has been extensively tested on offline recordings. Bug: webrtc:9023, chromium:822245 Change-Id: Ic149b9429e592d4c3535eb8432582f435a1b4745 Reviewed-on: https://webrtc-review.googlesource.com/62081 Commit-Queue: Per Åhgren <peah@webrtc.org> Reviewed-by: Ivo Creusen <ivoc@webrtc.org> Cr-Commit-Position: refs/heads/master@{#22461}
105 lines
4 KiB
C++
105 lines
4 KiB
C++
/*
|
|
* Copyright (c) 2017 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/echo_path_delay_estimator.h"
|
|
|
|
#include <algorithm>
|
|
#include <array>
|
|
|
|
#include "api/audio/echo_canceller3_config.h"
|
|
#include "modules/audio_processing/aec3/aec3_common.h"
|
|
#include "modules/audio_processing/logging/apm_data_dumper.h"
|
|
#include "rtc_base/checks.h"
|
|
|
|
namespace webrtc {
|
|
|
|
EchoPathDelayEstimator::EchoPathDelayEstimator(
|
|
ApmDataDumper* data_dumper,
|
|
const EchoCanceller3Config& config)
|
|
: data_dumper_(data_dumper),
|
|
down_sampling_factor_(config.delay.down_sampling_factor),
|
|
sub_block_size_(down_sampling_factor_ != 0
|
|
? kBlockSize / down_sampling_factor_
|
|
: kBlockSize),
|
|
capture_decimator_(down_sampling_factor_),
|
|
matched_filter_(data_dumper_,
|
|
DetectOptimization(),
|
|
sub_block_size_,
|
|
kMatchedFilterWindowSizeSubBlocks,
|
|
config.delay.num_filters,
|
|
kMatchedFilterAlignmentShiftSizeSubBlocks,
|
|
config.render_levels.poor_excitation_render_limit),
|
|
matched_filter_lag_aggregator_(data_dumper_,
|
|
matched_filter_.GetMaxFilterLag()) {
|
|
RTC_DCHECK(data_dumper);
|
|
RTC_DCHECK(down_sampling_factor_ > 0);
|
|
}
|
|
|
|
EchoPathDelayEstimator::~EchoPathDelayEstimator() = default;
|
|
|
|
void EchoPathDelayEstimator::Reset(bool soft_reset) {
|
|
if (!soft_reset) {
|
|
matched_filter_lag_aggregator_.Reset();
|
|
}
|
|
matched_filter_.Reset();
|
|
old_aggregated_lag_ = rtc::nullopt;
|
|
consistent_estimate_counter_ = 0;
|
|
}
|
|
|
|
rtc::Optional<DelayEstimate> EchoPathDelayEstimator::EstimateDelay(
|
|
const DownsampledRenderBuffer& render_buffer,
|
|
rtc::ArrayView<const float> capture) {
|
|
RTC_DCHECK_EQ(kBlockSize, capture.size());
|
|
|
|
std::array<float, kBlockSize> downsampled_capture_data;
|
|
rtc::ArrayView<float> downsampled_capture(downsampled_capture_data.data(),
|
|
sub_block_size_);
|
|
data_dumper_->DumpWav("aec3_capture_decimator_input", capture.size(),
|
|
capture.data(), 16000, 1);
|
|
capture_decimator_.Decimate(capture, downsampled_capture);
|
|
data_dumper_->DumpWav("aec3_capture_decimator_output",
|
|
downsampled_capture.size(), downsampled_capture.data(),
|
|
16000 / down_sampling_factor_, 1);
|
|
matched_filter_.Update(render_buffer, downsampled_capture);
|
|
|
|
rtc::Optional<DelayEstimate> aggregated_matched_filter_lag =
|
|
matched_filter_lag_aggregator_.Aggregate(
|
|
matched_filter_.GetLagEstimates());
|
|
|
|
// TODO(peah): Move this logging outside of this class once EchoCanceller3
|
|
// development is done.
|
|
data_dumper_->DumpRaw(
|
|
"aec3_echo_path_delay_estimator_delay",
|
|
aggregated_matched_filter_lag
|
|
? static_cast<int>(aggregated_matched_filter_lag->delay *
|
|
down_sampling_factor_)
|
|
: -1);
|
|
|
|
// Return the detected delay in samples as the aggregated matched filter lag
|
|
// compensated by the down sampling factor for the signal being correlated.
|
|
if (aggregated_matched_filter_lag) {
|
|
aggregated_matched_filter_lag->delay *= down_sampling_factor_;
|
|
}
|
|
|
|
if (old_aggregated_lag_ && aggregated_matched_filter_lag &&
|
|
old_aggregated_lag_->delay == aggregated_matched_filter_lag->delay) {
|
|
++consistent_estimate_counter_;
|
|
} else {
|
|
consistent_estimate_counter_ = 0;
|
|
}
|
|
old_aggregated_lag_ = aggregated_matched_filter_lag;
|
|
constexpr size_t kNumBlocksPerSecondBy2 = kNumBlocksPerSecond / 2;
|
|
if (consistent_estimate_counter_ > kNumBlocksPerSecondBy2) {
|
|
Reset(true);
|
|
}
|
|
|
|
return aggregated_matched_filter_lag;
|
|
}
|
|
|
|
} // namespace webrtc
|