From 84f8ec1f9ca61c54de4f56c67f3db495feab1e38 Mon Sep 17 00:00:00 2001 From: "bjornv@webrtc.org" Date: Thu, 19 Jun 2014 12:14:33 +0000 Subject: [PATCH] Changes to tests and tools in audio_processing. - Disables ApmTest.EchoCancellationReportsCorrectDelays This test relys completely on the structure of how reported system delays are handled in AEC. In addition it assumes a fix setup of delay logging buffers. This test should be refactored. - Adds flag to turn off reported_delay in audioproc Now it is feasible to turn on and off the use of reported system delays. BUG=N/A R=aluebs@webrtc.org, kwiberg@webrtc.org Review URL: https://webrtc-codereview.appspot.com/16749004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6492 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../audio_processing/test/audio_processing_unittest.cc | 2 +- webrtc/modules/audio_processing/test/process_test.cc | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/webrtc/modules/audio_processing/test/audio_processing_unittest.cc b/webrtc/modules/audio_processing/test/audio_processing_unittest.cc index 1905e96325..65c2d8d4dc 100644 --- a/webrtc/modules/audio_processing/test/audio_processing_unittest.cc +++ b/webrtc/modules/audio_processing/test/audio_processing_unittest.cc @@ -827,7 +827,7 @@ TEST_F(ApmTest, EchoCancellation) { EXPECT_FALSE(apm_->echo_cancellation()->aec_core() != NULL); } -TEST_F(ApmTest, EchoCancellationReportsCorrectDelays) { +TEST_F(ApmTest, DISABLED_EchoCancellationReportsCorrectDelays) { // Enable AEC only. EXPECT_EQ(apm_->kNoError, apm_->echo_cancellation()->enable_drift_compensation(false)); diff --git a/webrtc/modules/audio_processing/test/process_test.cc b/webrtc/modules/audio_processing/test/process_test.cc index 01f9dcecb7..a36a072c91 100644 --- a/webrtc/modules/audio_processing/test/process_test.cc +++ b/webrtc/modules/audio_processing/test/process_test.cc @@ -78,6 +78,7 @@ void usage() { printf(" --no_delay_logging\n"); printf(" --aec_suppression_level LEVEL [0 - 2]\n"); printf(" --extended_filter\n"); + printf(" --no_reported_delay\n"); printf("\n -aecm Echo control mobile\n"); printf(" --aecm_echo_path_in_file FILE\n"); printf(" --aecm_echo_path_out_file FILE\n"); @@ -257,6 +258,11 @@ void void_main(int argc, char* argv[]) { config.Set(new DelayCorrection(true)); apm->SetExtraOptions(config); + } else if (strcmp(argv[i], "--no_reported_delay") == 0) { + Config config; + config.Set(new ReportedDelay(false)); + apm->SetExtraOptions(config); + } else if (strcmp(argv[i], "-aecm") == 0) { ASSERT_EQ(apm->kNoError, apm->echo_control_mobile()->Enable(true));