| Index: webrtc/modules/audio_processing/aec3/echo_remover_unittest.cc
|
| diff --git a/webrtc/modules/audio_processing/aec3/echo_remover_unittest.cc b/webrtc/modules/audio_processing/aec3/echo_remover_unittest.cc
|
| index dd43b3737cdaaa755ef5df3b68d1087f6d68a3df..d5ffb667dfffac7db3d3acddfc836f6f40c309b3 100644
|
| --- a/webrtc/modules/audio_processing/aec3/echo_remover_unittest.cc
|
| +++ b/webrtc/modules/audio_processing/aec3/echo_remover_unittest.cc
|
| @@ -45,7 +45,8 @@ std::string ProduceDebugText(int sample_rate_hz, int delay) {
|
| TEST(EchoRemover, BasicApiCalls) {
|
| for (auto rate : {8000, 16000, 32000, 48000}) {
|
| SCOPED_TRACE(ProduceDebugText(rate));
|
| - std::unique_ptr<EchoRemover> remover(EchoRemover::Create(rate));
|
| + std::unique_ptr<EchoRemover> remover(
|
| + EchoRemover::Create(AudioProcessing::Config::EchoCanceller3(), rate));
|
| std::unique_ptr<RenderDelayBuffer> render_buffer(
|
| RenderDelayBuffer::Create(NumBandsForRate(rate)));
|
|
|
| @@ -74,14 +75,17 @@ TEST(EchoRemover, BasicApiCalls) {
|
| // TODO(peah): Re-enable the test once the issue with memory leaks during DEATH
|
| // tests on test bots has been fixed.
|
| TEST(EchoRemover, DISABLED_WrongSampleRate) {
|
| - EXPECT_DEATH(std::unique_ptr<EchoRemover>(EchoRemover::Create(8001)), "");
|
| + EXPECT_DEATH(std::unique_ptr<EchoRemover>(EchoRemover::Create(
|
| + AudioProcessing::Config::EchoCanceller3(), 8001)),
|
| + "");
|
| }
|
|
|
| // Verifies the check for the capture block size.
|
| TEST(EchoRemover, WrongCaptureBlockSize) {
|
| for (auto rate : {8000, 16000, 32000, 48000}) {
|
| SCOPED_TRACE(ProduceDebugText(rate));
|
| - std::unique_ptr<EchoRemover> remover(EchoRemover::Create(rate));
|
| + std::unique_ptr<EchoRemover> remover(
|
| + EchoRemover::Create(AudioProcessing::Config::EchoCanceller3(), rate));
|
| std::unique_ptr<RenderDelayBuffer> render_buffer(
|
| RenderDelayBuffer::Create(NumBandsForRate(rate)));
|
| std::vector<std::vector<float>> capture(
|
| @@ -101,7 +105,8 @@ TEST(EchoRemover, WrongCaptureBlockSize) {
|
| TEST(EchoRemover, DISABLED_WrongCaptureNumBands) {
|
| for (auto rate : {16000, 32000, 48000}) {
|
| SCOPED_TRACE(ProduceDebugText(rate));
|
| - std::unique_ptr<EchoRemover> remover(EchoRemover::Create(rate));
|
| + std::unique_ptr<EchoRemover> remover(
|
| + EchoRemover::Create(AudioProcessing::Config::EchoCanceller3(), rate));
|
| std::unique_ptr<RenderDelayBuffer> render_buffer(
|
| RenderDelayBuffer::Create(NumBandsForRate(rate)));
|
| std::vector<std::vector<float>> capture(
|
| @@ -118,7 +123,8 @@ TEST(EchoRemover, DISABLED_WrongCaptureNumBands) {
|
|
|
| // Verifies the check for non-null capture block.
|
| TEST(EchoRemover, NullCapture) {
|
| - std::unique_ptr<EchoRemover> remover(EchoRemover::Create(8000));
|
| + std::unique_ptr<EchoRemover> remover(
|
| + EchoRemover::Create(AudioProcessing::Config::EchoCanceller3(), 8000));
|
| std::unique_ptr<RenderDelayBuffer> render_buffer(
|
| RenderDelayBuffer::Create(3));
|
| EchoPathVariability echo_path_variability(false, false);
|
| @@ -144,7 +150,8 @@ TEST(EchoRemover, BasicEchoRemoval) {
|
| EchoPathVariability echo_path_variability(false, false);
|
| for (size_t delay_samples : {0, 64, 150, 200, 301}) {
|
| SCOPED_TRACE(ProduceDebugText(rate, delay_samples));
|
| - std::unique_ptr<EchoRemover> remover(EchoRemover::Create(rate));
|
| + std::unique_ptr<EchoRemover> remover(
|
| + EchoRemover::Create(AudioProcessing::Config::EchoCanceller3(), rate));
|
| std::unique_ptr<RenderDelayBuffer> render_buffer(
|
| RenderDelayBuffer::Create(NumBandsForRate(rate)));
|
| std::vector<std::unique_ptr<DelayBuffer<float>>> delay_buffers(x.size());
|
|
|