zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrections of the render buffering scheme in AEC3 to ensure causality

Browse Source 
This CL modifies the refactored render buffering scheme in AEC3
so that:
-A non-causal state can never occur which means that situations with
 nonrecoverable echo should not occur.
-For a stable audio pipeline with a predefined API call jitter,
 render overruns and underruns can never occur.

Bug: webrtc:8629,chromium:793305
Change-Id: I06ba1c368f92db95274090b08475dd02dbb85145
Reviewed-on: https://webrtc-review.googlesource.com/29861
Commit-Queue: Per Åhgren <peah@webrtc.org>
Reviewed-by: Gustaf Ullberg <gustaf@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#21215}
This commit is contained in:
Per Åhgren
2017-12-11 21:34:19 +01:00
committed by Commit Bot
parent efc5fbd8e0
commit c59a576c86
34 changed files with 535 additions and 408 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
modules/audio_processing/aec3/aec_state_unittest.cc
View File

@ -49,7 +49,7 @@ TEST(AecState, NormalUsage) {
// Verify that linear AEC usability is false when the filter is diverged and
// there is no external delay reported.
state.Update(diverged_filter_frequency_response, impulse_response, true,
rtc::nullopt, render_delay_buffer->GetRenderBuffer(), E2_main,
rtc::nullopt, *render_delay_buffer->GetRenderBuffer(), E2_main,
Y2, x[0], s, false);
EXPECT_FALSE(state.UsableLinearEstimate());
@ -57,7 +57,7 @@ TEST(AecState, NormalUsage) {
std::fill(x[0].begin(), x[0].end(), 101.f);
for (int k = 0; k < 3000; ++k) {
state.Update(converged_filter_frequency_response, impulse_response, true, 2,
render_delay_buffer->GetRenderBuffer(), E2_main, Y2, x[0], s,
*render_delay_buffer->GetRenderBuffer(), E2_main, Y2, x[0], s,
false);
}
EXPECT_TRUE(state.UsableLinearEstimate());
@ -67,7 +67,7 @@ TEST(AecState, NormalUsage) {
state.HandleEchoPathChange(EchoPathVariability(
true, EchoPathVariability::DelayAdjustment::kNone, false));
state.Update(converged_filter_frequency_response, impulse_response, true, 2,
render_delay_buffer->GetRenderBuffer(), E2_main, Y2, x[0], s,
*render_delay_buffer->GetRenderBuffer(), E2_main, Y2, x[0], s,
false);
EXPECT_FALSE(state.UsableLinearEstimate());
@ -76,25 +76,25 @@ TEST(AecState, NormalUsage) {
state.HandleEchoPathChange(EchoPathVariability(
true, EchoPathVariability::DelayAdjustment::kNewDetectedDelay, false));
state.Update(converged_filter_frequency_response, impulse_response, true, 2,
render_delay_buffer->GetRenderBuffer(), E2_main, Y2, x[0], s,
*render_delay_buffer->GetRenderBuffer(), E2_main, Y2, x[0], s,
false);
EXPECT_FALSE(state.ActiveRender());
for (int k = 0; k < 1000; ++k) {
state.Update(converged_filter_frequency_response, impulse_response, true, 2,
render_delay_buffer->GetRenderBuffer(), E2_main, Y2, x[0], s,
*render_delay_buffer->GetRenderBuffer(), E2_main, Y2, x[0], s,
false);
}
EXPECT_TRUE(state.ActiveRender());
// Verify that echo leakage is properly reported.
state.Update(converged_filter_frequency_response, impulse_response, true, 2,
render_delay_buffer->GetRenderBuffer(), E2_main, Y2, x[0], s,
*render_delay_buffer->GetRenderBuffer(), E2_main, Y2, x[0], s,
false);
EXPECT_FALSE(state.EchoLeakageDetected());
state.Update(converged_filter_frequency_response, impulse_response, true, 2,
render_delay_buffer->GetRenderBuffer(), E2_main, Y2, x[0], s,
*render_delay_buffer->GetRenderBuffer(), E2_main, Y2, x[0], s,
true);
EXPECT_TRUE(state.EchoLeakageDetected());
@ -104,19 +104,20 @@ TEST(AecState, NormalUsage) {
}
x[0][0] = 5000.f;
for (size_t k = 0; k < render_delay_buffer->GetRenderBuffer().Buffer().size();
++k) {
for (size_t k = 0;
k < render_delay_buffer->GetRenderBuffer()->Buffer().size(); ++k) {
render_delay_buffer->Insert(x);
if (k == 0) {
render_delay_buffer->Reset();
}
render_delay_buffer->PrepareCaptureCall();
render_delay_buffer->PrepareCaptureProcessing();
render_delay_buffer->GetRenderBuffer()->UpdateSpectralSum();
}
Y2.fill(10.f * 10000.f * 10000.f);
for (size_t k = 0; k < 1000; ++k) {
state.Update(converged_filter_frequency_response, impulse_response, true, 2,
render_delay_buffer->GetRenderBuffer(), E2_main, Y2, x[0], s,
*render_delay_buffer->GetRenderBuffer(), E2_main, Y2, x[0], s,
false);
}
@ -133,7 +134,7 @@ TEST(AecState, NormalUsage) {
Y2.fill(10.f * E2_main[0]);
for (size_t k = 0; k < 1000; ++k) {
state.Update(converged_filter_frequency_response, impulse_response, true, 2,
render_delay_buffer->GetRenderBuffer(), E2_main, Y2, x[0], s,
*render_delay_buffer->GetRenderBuffer(), E2_main, Y2, x[0], s,
false);
}
ASSERT_TRUE(state.UsableLinearEstimate());
@ -154,7 +155,7 @@ TEST(AecState, NormalUsage) {
Y2.fill(5.f * E2_main[0]);
for (size_t k = 0; k < 1000; ++k) {
state.Update(converged_filter_frequency_response, impulse_response, true, 2,
render_delay_buffer->GetRenderBuffer(), E2_main, Y2, x[0], s,
*render_delay_buffer->GetRenderBuffer(), E2_main, Y2, x[0], s,
false);
}
@ -204,7 +205,7 @@ TEST(AecState, ConvergedFilterDelay) {
frequency_response[k][0] = 0.f;
state.HandleEchoPathChange(echo_path_variability);
state.Update(frequency_response, impulse_response, true, rtc::nullopt,
render_delay_buffer->GetRenderBuffer(), E2_main, Y2, x, s,
*render_delay_buffer->GetRenderBuffer(), E2_main, Y2, x, s,
false);
EXPECT_TRUE(k == (kFilterLength - 1) || state.FilterDelay());
if (k != (kFilterLength - 1)) {
@ -243,7 +244,7 @@ TEST(AecState, ExternalDelay) {
state.HandleEchoPathChange(EchoPathVariability(
false, EchoPathVariability::DelayAdjustment::kNone, false));
state.Update(frequency_response, impulse_response, true, k * kBlockSize + 5,
render_delay_buffer->GetRenderBuffer(), E2_main, Y2, x, s,
*render_delay_buffer->GetRenderBuffer(), E2_main, Y2, x, s,
false);
EXPECT_TRUE(state.ExternalDelay());
EXPECT_EQ(k, state.ExternalDelay());
@ -254,7 +255,7 @@ TEST(AecState, ExternalDelay) {
state.HandleEchoPathChange(EchoPathVariability(
false, EchoPathVariability::DelayAdjustment::kNone, false));
state.Update(frequency_response, impulse_response, true, rtc::nullopt,
render_delay_buffer->GetRenderBuffer(), E2_main, Y2, x, s,
*render_delay_buffer->GetRenderBuffer(), E2_main, Y2, x, s,
false);
EXPECT_FALSE(state.ExternalDelay());
}