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

Redesign of the render buffering in AEC3

Browse Source 
This CL centralizes the render buffering in AEC3 so that all render
buffers are updated and synchronized/aligned with the render alignment
buffer.

Bug: webrtc:8597, chromium:790905
Change-Id: I8a94e5c1f27316b6100b420eec9652ea31c1a91d
Reviewed-on: https://webrtc-review.googlesource.com/25680
Commit-Queue: Per Åhgren <peah@webrtc.org>
Reviewed-by: Gustaf Ullberg <gustaf@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20989}
This commit is contained in:
Per Åhgren
2017-12-01 23:01:44 +01:00
committed by Commit Bot
parent f388803265
commit 8ba5861f7e
55 changed files with 1213 additions and 804 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
modules/audio_processing/aec3/render_delay_buffer_unittest.cc
View File

@ -30,49 +30,50 @@ std::string ProduceDebugText(int sample_rate_hz) {
return ss.str();
}
constexpr size_t kDownSamplingFactor = 4;
constexpr size_t kNumMatchedFilters = 4;
} // namespace
// Verifies that the buffer overflow is correctly reported.
TEST(RenderDelayBuffer, BufferOverflow) {
const EchoCanceller3Config config;
for (auto rate : {8000, 16000, 32000, 48000}) {
SCOPED_TRACE(ProduceDebugText(rate));
std::unique_ptr<RenderDelayBuffer> delay_buffer(RenderDelayBuffer::Create(
NumBandsForRate(rate), kDownSamplingFactor,
GetDownSampledBufferSize(kDownSamplingFactor, kNumMatchedFilters),
GetRenderDelayBufferSize(kDownSamplingFactor, kNumMatchedFilters)));
std::unique_ptr<RenderDelayBuffer> delay_buffer(
RenderDelayBuffer::Create(config, NumBandsForRate(rate)));
std::vector<std::vector<float>> block_to_insert(
NumBandsForRate(rate), std::vector<float>(kBlockSize, 0.f));
for (size_t k = 0; k < kMaxApiCallsJitterBlocks; ++k) {
EXPECT_TRUE(delay_buffer->Insert(block_to_insert));
for (size_t k = 0; k < 10; ++k) {
EXPECT_EQ(RenderDelayBuffer::BufferingEvent::kNone,
delay_buffer->Insert(block_to_insert));
}
EXPECT_FALSE(delay_buffer->Insert(block_to_insert));
for (size_t k = 0; k < 1000; ++k) {
delay_buffer->Insert(block_to_insert);
}
EXPECT_EQ(RenderDelayBuffer::BufferingEvent::kRenderOverrun,
delay_buffer->Insert(block_to_insert));
}
}
// Verifies that the check for available block works.
TEST(RenderDelayBuffer, AvailableBlock) {
constexpr size_t kNumBands = 1;
std::unique_ptr<RenderDelayBuffer> delay_buffer(RenderDelayBuffer::Create(
kNumBands, kDownSamplingFactor,
GetDownSampledBufferSize(kDownSamplingFactor, kNumMatchedFilters),
GetRenderDelayBufferSize(kDownSamplingFactor, kNumMatchedFilters)));
std::unique_ptr<RenderDelayBuffer> delay_buffer(
RenderDelayBuffer::Create(EchoCanceller3Config(), kNumBands));
std::vector<std::vector<float>> input_block(
kNumBands, std::vector<float>(kBlockSize, 1.f));
EXPECT_TRUE(delay_buffer->Insert(input_block));
delay_buffer->UpdateBuffers();
EXPECT_EQ(RenderDelayBuffer::BufferingEvent::kNone,
delay_buffer->Insert(input_block));
delay_buffer->PrepareCaptureCall();
}
// Verifies the SetDelay method.
TEST(RenderDelayBuffer, SetDelay) {
std::unique_ptr<RenderDelayBuffer> delay_buffer(RenderDelayBuffer::Create(
1, kDownSamplingFactor,
GetDownSampledBufferSize(kDownSamplingFactor, kNumMatchedFilters),
GetRenderDelayBufferSize(kDownSamplingFactor, kNumMatchedFilters)));
EXPECT_EQ(0u, delay_buffer->Delay());
for (size_t delay = 0; delay < 20; ++delay) {
EchoCanceller3Config config;
std::unique_ptr<RenderDelayBuffer> delay_buffer(
RenderDelayBuffer::Create(config, 1));
EXPECT_EQ(config.delay.min_echo_path_delay_blocks, delay_buffer->Delay());
for (size_t delay = config.delay.min_echo_path_delay_blocks + 1; delay < 20;
++delay) {
delay_buffer->SetDelay(delay);
EXPECT_EQ(delay, delay_buffer->Delay());
}
@ -84,10 +85,8 @@ TEST(RenderDelayBuffer, SetDelay) {
// TODO(peah): Re-enable the test once the issue with memory leaks during DEATH
// tests on test bots has been fixed.
TEST(RenderDelayBuffer, DISABLED_WrongDelay) {
std::unique_ptr<RenderDelayBuffer> delay_buffer(RenderDelayBuffer::Create(
3, kDownSamplingFactor,
GetDownSampledBufferSize(kDownSamplingFactor, kNumMatchedFilters),
GetRenderDelayBufferSize(kDownSamplingFactor, kNumMatchedFilters)));
std::unique_ptr<RenderDelayBuffer> delay_buffer(
RenderDelayBuffer::Create(EchoCanceller3Config(), 3));
EXPECT_DEATH(delay_buffer->SetDelay(21), "");
}
@ -96,9 +95,7 @@ TEST(RenderDelayBuffer, WrongNumberOfBands) {
for (auto rate : {16000, 32000, 48000}) {
SCOPED_TRACE(ProduceDebugText(rate));
std::unique_ptr<RenderDelayBuffer> delay_buffer(RenderDelayBuffer::Create(
NumBandsForRate(rate), kDownSamplingFactor,
GetDownSampledBufferSize(kDownSamplingFactor, kNumMatchedFilters),
GetRenderDelayBufferSize(kDownSamplingFactor, kNumMatchedFilters)));
EchoCanceller3Config(), NumBandsForRate(rate)));
std::vector<std::vector<float>> block_to_insert(
NumBandsForRate(rate < 48000 ? rate + 16000 : 16000),
std::vector<float>(kBlockSize, 0.f));
@ -110,10 +107,8 @@ TEST(RenderDelayBuffer, WrongNumberOfBands) {
TEST(RenderDelayBuffer, WrongBlockLength) {
for (auto rate : {8000, 16000, 32000, 48000}) {
SCOPED_TRACE(ProduceDebugText(rate));
std::unique_ptr<RenderDelayBuffer> delay_buffer(RenderDelayBuffer::Create(
3, kDownSamplingFactor,
GetDownSampledBufferSize(kDownSamplingFactor, kNumMatchedFilters),
GetRenderDelayBufferSize(kDownSamplingFactor, kNumMatchedFilters)));
std::unique_ptr<RenderDelayBuffer> delay_buffer(
RenderDelayBuffer::Create(EchoCanceller3Config(), 3));
std::vector<std::vector<float>> block_to_insert(
NumBandsForRate(rate), std::vector<float>(kBlockSize - 1, 0.f));
EXPECT_DEATH(delay_buffer->Insert(block_to_insert), "");