debaa442ed
This CL corrects the behavior in AEC3 during buffer overruns and underruns in three ways. 1) When there is no render signal available (due to a buffering issues, a zero block is inserted instead of the previous render block. This avoids the same block being repeatedly inserted when there are many back-to-back calls. 2) The internal counters in the main adaptive filter gain are also reset when the filter is reset. 3) The internal counters in the shadow adaptive filter gain are reset when the filter is reset. BUG=chromium:717920,webrtc:7559 Review-Url: https://codereview.webrtc.org/2862533002 Cr-Commit-Position: refs/heads/master@{#17991}
110 lines
3.8 KiB
C++
110 lines
3.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 "webrtc/modules/audio_processing/aec3/subtractor.h"
|
|
|
|
#include <algorithm>
|
|
|
|
#include "webrtc/base/array_view.h"
|
|
#include "webrtc/base/checks.h"
|
|
#include "webrtc/modules/audio_processing/logging/apm_data_dumper.h"
|
|
|
|
namespace webrtc {
|
|
|
|
namespace {
|
|
|
|
void PredictionError(const Aec3Fft& fft,
|
|
const FftData& S,
|
|
rtc::ArrayView<const float> y,
|
|
std::array<float, kBlockSize>* e,
|
|
FftData* E) {
|
|
std::array<float, kFftLength> s;
|
|
fft.Ifft(S, &s);
|
|
constexpr float kScale = 1.0f / kFftLengthBy2;
|
|
std::transform(y.begin(), y.end(), s.begin() + kFftLengthBy2, e->begin(),
|
|
[&](float a, float b) { return a - b * kScale; });
|
|
std::for_each(e->begin(), e->end(), [](float& a) {
|
|
a = std::max(std::min(a, 32767.0f), -32768.0f);
|
|
});
|
|
fft.ZeroPaddedFft(*e, E);
|
|
}
|
|
} // namespace
|
|
|
|
Subtractor::Subtractor(ApmDataDumper* data_dumper,
|
|
Aec3Optimization optimization)
|
|
: fft_(),
|
|
data_dumper_(data_dumper),
|
|
optimization_(optimization),
|
|
main_filter_(kAdaptiveFilterLength, optimization, data_dumper_),
|
|
shadow_filter_(kAdaptiveFilterLength, optimization, data_dumper_) {
|
|
RTC_DCHECK(data_dumper_);
|
|
}
|
|
|
|
Subtractor::~Subtractor() {}
|
|
|
|
void Subtractor::HandleEchoPathChange(
|
|
const EchoPathVariability& echo_path_variability) {
|
|
if (echo_path_variability.delay_change) {
|
|
main_filter_.HandleEchoPathChange();
|
|
shadow_filter_.HandleEchoPathChange();
|
|
G_main_.HandleEchoPathChange();
|
|
G_shadow_.HandleEchoPathChange();
|
|
}
|
|
}
|
|
|
|
void Subtractor::Process(const RenderBuffer& render_buffer,
|
|
const rtc::ArrayView<const float> capture,
|
|
const RenderSignalAnalyzer& render_signal_analyzer,
|
|
const AecState& aec_state,
|
|
SubtractorOutput* output) {
|
|
RTC_DCHECK_EQ(kBlockSize, capture.size());
|
|
rtc::ArrayView<const float> y = capture;
|
|
FftData& E_main = output->E_main;
|
|
FftData E_shadow;
|
|
std::array<float, kBlockSize>& e_main = output->e_main;
|
|
std::array<float, kBlockSize>& e_shadow = output->e_shadow;
|
|
|
|
FftData S;
|
|
FftData& G = S;
|
|
|
|
// Form the output of the main filter.
|
|
main_filter_.Filter(render_buffer, &S);
|
|
PredictionError(fft_, S, y, &e_main, &E_main);
|
|
|
|
// Form the output of the shadow filter.
|
|
shadow_filter_.Filter(render_buffer, &S);
|
|
PredictionError(fft_, S, y, &e_shadow, &E_shadow);
|
|
|
|
// Compute spectra for future use.
|
|
E_main.Spectrum(optimization_, &output->E2_main);
|
|
E_shadow.Spectrum(optimization_, &output->E2_shadow);
|
|
|
|
// Update the main filter.
|
|
G_main_.Compute(render_buffer, render_signal_analyzer, *output, main_filter_,
|
|
aec_state.SaturatedCapture(), &G);
|
|
main_filter_.Adapt(render_buffer, G);
|
|
data_dumper_->DumpRaw("aec3_subtractor_G_main", G.re);
|
|
data_dumper_->DumpRaw("aec3_subtractor_G_main", G.im);
|
|
|
|
// Update the shadow filter.
|
|
G_shadow_.Compute(render_buffer, render_signal_analyzer, E_shadow,
|
|
shadow_filter_.SizePartitions(),
|
|
aec_state.SaturatedCapture(), &G);
|
|
shadow_filter_.Adapt(render_buffer, G);
|
|
|
|
data_dumper_->DumpRaw("aec3_subtractor_G_shadow", G.re);
|
|
data_dumper_->DumpRaw("aec3_subtractor_G_shadow", G.im);
|
|
|
|
main_filter_.DumpFilter("aec3_subtractor_H_main");
|
|
shadow_filter_.DumpFilter("aec3_subtractor_H_shadow");
|
|
}
|
|
|
|
} // namespace webrtc
|