mirror of
https://github.com/mollyim/webrtc.git
synced 2025-05-17 07:37:51 +01:00
b20b93796f
This CL refactors the code in AEC3 that analyzes how well the adaptive filter performs. The purpose of this is both to simplify code that is more complex than needed and also to pave the wave for the upcoming CLs that softens the echo suppression during doubletalk. The main changes are that: -The shadow adaptive filter is now never analyzed. This turned out to never affect the output in the recordings it was tested on. -The convergence analysis was moved to the aec state code. The changes are bitexact on all testcases where they have been tested on. Bug: webrtc:8671 Change-Id: If76b669565325c8eb4d11d1178a7e20306da9a26 Reviewed-on: https://webrtc-review.googlesource.com/87430 Commit-Queue: Per Åhgren <peah@webrtc.org> Reviewed-by: Sam Zackrisson <saza@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23958}
110 lines
3.9 KiB
C++
110 lines
3.9 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/residual_echo_estimator.h"
|
|
|
|
#include "api/audio/echo_canceller3_config.h"
|
|
#include "modules/audio_processing/aec3/aec3_fft.h"
|
|
#include "modules/audio_processing/aec3/aec_state.h"
|
|
#include "modules/audio_processing/aec3/render_delay_buffer.h"
|
|
#include "modules/audio_processing/test/echo_canceller_test_tools.h"
|
|
#include "rtc_base/random.h"
|
|
#include "test/gtest.h"
|
|
|
|
namespace webrtc {
|
|
|
|
#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
|
|
|
|
// Verifies that the check for non-null output residual echo power works.
|
|
TEST(ResidualEchoEstimator, NullResidualEchoPowerOutput) {
|
|
EchoCanceller3Config config;
|
|
AecState aec_state(config);
|
|
std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
|
|
RenderDelayBuffer::Create(config, 3));
|
|
std::vector<std::array<float, kFftLengthBy2Plus1>> H2;
|
|
std::array<float, kFftLengthBy2Plus1> S2_linear;
|
|
std::array<float, kFftLengthBy2Plus1> Y2;
|
|
EXPECT_DEATH(ResidualEchoEstimator(EchoCanceller3Config{})
|
|
.Estimate(aec_state, *render_delay_buffer->GetRenderBuffer(),
|
|
S2_linear, Y2, nullptr),
|
|
"");
|
|
}
|
|
|
|
#endif
|
|
|
|
// TODO(peah): This test is broken in the sense that it not at all tests what it
|
|
// seems to test. Enable the test once that is adressed.
|
|
TEST(ResidualEchoEstimator, DISABLED_BasicTest) {
|
|
EchoCanceller3Config config;
|
|
config.ep_strength.default_len = 0.f;
|
|
config.delay.min_echo_path_delay_blocks = 0;
|
|
ResidualEchoEstimator estimator(config);
|
|
AecState aec_state(config);
|
|
std::unique_ptr<RenderDelayBuffer> render_delay_buffer(
|
|
RenderDelayBuffer::Create(config, 3));
|
|
|
|
std::array<float, kFftLengthBy2Plus1> E2_main;
|
|
std::array<float, kFftLengthBy2Plus1> E2_shadow;
|
|
std::array<float, kFftLengthBy2Plus1> S2_linear;
|
|
std::array<float, kFftLengthBy2Plus1> S2_fallback;
|
|
std::array<float, kFftLengthBy2Plus1> Y2;
|
|
std::array<float, kFftLengthBy2Plus1> R2;
|
|
EchoPathVariability echo_path_variability(
|
|
false, EchoPathVariability::DelayAdjustment::kNone, false);
|
|
std::vector<std::vector<float>> x(3, std::vector<float>(kBlockSize, 0.f));
|
|
std::vector<std::array<float, kFftLengthBy2Plus1>> H2(10);
|
|
Random random_generator(42U);
|
|
SubtractorOutput output;
|
|
std::array<float, kBlockSize> y;
|
|
Aec3Fft fft;
|
|
absl::optional<DelayEstimate> delay_estimate;
|
|
|
|
for (auto& H2_k : H2) {
|
|
H2_k.fill(0.01f);
|
|
}
|
|
H2[2].fill(10.f);
|
|
H2[2][0] = 0.1f;
|
|
|
|
std::vector<float> h(GetTimeDomainLength(config.filter.main.length_blocks),
|
|
0.f);
|
|
|
|
output.Reset();
|
|
output.s_main.fill(100.f);
|
|
y.fill(0.f);
|
|
|
|
constexpr float kLevel = 10.f;
|
|
E2_shadow.fill(kLevel);
|
|
E2_main.fill(kLevel);
|
|
S2_linear.fill(kLevel);
|
|
S2_fallback.fill(kLevel);
|
|
Y2.fill(kLevel);
|
|
|
|
for (int k = 0; k < 1993; ++k) {
|
|
RandomizeSampleVector(&random_generator, x[0]);
|
|
std::for_each(x[0].begin(), x[0].end(), [](float& a) { a /= 30.f; });
|
|
render_delay_buffer->Insert(x);
|
|
if (k == 0) {
|
|
render_delay_buffer->Reset();
|
|
}
|
|
render_delay_buffer->PrepareCaptureProcessing();
|
|
|
|
aec_state.HandleEchoPathChange(echo_path_variability);
|
|
aec_state.Update(delay_estimate, H2, h,
|
|
*render_delay_buffer->GetRenderBuffer(), E2_main, Y2,
|
|
output, y);
|
|
|
|
estimator.Estimate(aec_state, *render_delay_buffer->GetRenderBuffer(),
|
|
S2_linear, Y2, &R2);
|
|
}
|
|
std::for_each(R2.begin(), R2.end(),
|
|
[&](float a) { EXPECT_NEAR(kLevel, a, 0.1f); });
|
|
}
|
|
|
|
} // namespace webrtc
|