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
This commit is contained in:
bjornv@webrtc.org 2014-06-19 12:14:33 +00:00
parent 077593b805
commit 84f8ec1f9c
2 changed files with 7 additions and 1 deletions

View File

@ -827,7 +827,7 @@ TEST_F(ApmTest, EchoCancellation) {
EXPECT_FALSE(apm_->echo_cancellation()->aec_core() != NULL); EXPECT_FALSE(apm_->echo_cancellation()->aec_core() != NULL);
} }
TEST_F(ApmTest, EchoCancellationReportsCorrectDelays) { TEST_F(ApmTest, DISABLED_EchoCancellationReportsCorrectDelays) {
// Enable AEC only. // Enable AEC only.
EXPECT_EQ(apm_->kNoError, EXPECT_EQ(apm_->kNoError,
apm_->echo_cancellation()->enable_drift_compensation(false)); apm_->echo_cancellation()->enable_drift_compensation(false));

View File

@ -78,6 +78,7 @@ void usage() {
printf(" --no_delay_logging\n"); printf(" --no_delay_logging\n");
printf(" --aec_suppression_level LEVEL [0 - 2]\n"); printf(" --aec_suppression_level LEVEL [0 - 2]\n");
printf(" --extended_filter\n"); printf(" --extended_filter\n");
printf(" --no_reported_delay\n");
printf("\n -aecm Echo control mobile\n"); printf("\n -aecm Echo control mobile\n");
printf(" --aecm_echo_path_in_file FILE\n"); printf(" --aecm_echo_path_in_file FILE\n");
printf(" --aecm_echo_path_out_file FILE\n"); printf(" --aecm_echo_path_out_file FILE\n");
@ -257,6 +258,11 @@ void void_main(int argc, char* argv[]) {
config.Set<DelayCorrection>(new DelayCorrection(true)); config.Set<DelayCorrection>(new DelayCorrection(true));
apm->SetExtraOptions(config); apm->SetExtraOptions(config);
} else if (strcmp(argv[i], "--no_reported_delay") == 0) {
Config config;
config.Set<ReportedDelay>(new ReportedDelay(false));
apm->SetExtraOptions(config);
} else if (strcmp(argv[i], "-aecm") == 0) { } else if (strcmp(argv[i], "-aecm") == 0) {
ASSERT_EQ(apm->kNoError, apm->echo_control_mobile()->Enable(true)); ASSERT_EQ(apm->kNoError, apm->echo_control_mobile()->Enable(true));