mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-15 23:01:21 +01:00
bd83b914c3
The struct containing the config for AEC3 is removed from AudioProcessing::Config and is put in a new struct called EchoCanceller3Config. AEC3 should no longer be activated through AudioProcessing::ApplyConfig. Instead an EchoCanceller3Factory can be injected at AudioProcessing creation. Bug: webrtc:8346 Change-Id: I27e3592e675eec3632a60c45d9e0d12514c2c567 Reviewed-on: https://webrtc-review.googlesource.com/11420 Reviewed-by: Per Åhgren <peah@webrtc.org> Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org> Commit-Queue: Gustaf Ullberg <gustaf@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20342}
77 lines
2.8 KiB
C++
77 lines
2.8 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 "modules/audio_processing/aec3/aec3_common.h"
|
|
#include "modules/audio_processing/include/audio_processing.h"
|
|
#include "modules/audio_processing/logging/apm_data_dumper.h"
|
|
#include "rtc_base/checks.h"
|
|
|
|
namespace webrtc {
|
|
|
|
namespace {
|
|
|
|
constexpr int kDownSamplingFactor = 4;
|
|
} // namespace
|
|
|
|
EchoPathDelayEstimator::EchoPathDelayEstimator(
|
|
ApmDataDumper* data_dumper,
|
|
const EchoCanceller3Config& config)
|
|
: data_dumper_(data_dumper),
|
|
matched_filter_(data_dumper_,
|
|
DetectOptimization(),
|
|
kMatchedFilterWindowSizeSubBlocks,
|
|
kNumMatchedFilters,
|
|
kMatchedFilterAlignmentShiftSizeSubBlocks,
|
|
config.render_levels.poor_excitation_render_limit),
|
|
matched_filter_lag_aggregator_(data_dumper_) {
|
|
RTC_DCHECK(data_dumper);
|
|
}
|
|
|
|
EchoPathDelayEstimator::~EchoPathDelayEstimator() = default;
|
|
|
|
void EchoPathDelayEstimator::Reset() {
|
|
matched_filter_lag_aggregator_.Reset();
|
|
matched_filter_.Reset();
|
|
}
|
|
|
|
rtc::Optional<size_t> EchoPathDelayEstimator::EstimateDelay(
|
|
const DownsampledRenderBuffer& render_buffer,
|
|
rtc::ArrayView<const float> capture) {
|
|
RTC_DCHECK_EQ(kBlockSize, capture.size());
|
|
|
|
std::array<float, kSubBlockSize> downsampled_capture;
|
|
capture_decimator_.Decimate(capture, downsampled_capture);
|
|
matched_filter_.Update(render_buffer, downsampled_capture);
|
|
|
|
rtc::Optional<size_t> 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 *
|
|
kDownSamplingFactor)
|
|
: -1);
|
|
|
|
// Return the detected delay in samples as the aggregated matched filter lag
|
|
// compensated by the down sampling factor for the signal being correlated.
|
|
return aggregated_matched_filter_lag
|
|
? rtc::Optional<size_t>(*aggregated_matched_filter_lag *
|
|
kDownSamplingFactor)
|
|
: rtc::Optional<size_t>();
|
|
}
|
|
|
|
} // namespace webrtc
|