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

Make naming of APM perf test consistent

Browse Source 
BUG=599953

Review URL: https://codereview.webrtc.org/1853543003

Cr-Commit-Position: refs/heads/master@{#12225}
This commit is contained in:
aluebs
2016-04-04 16:53:37 -07:00
committed by Commit bot
parent 7d06a8cfe4
commit bfedbf9eae
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
webrtc/modules/audio_processing/audio_processing_performance_unittest.cc
View File

@ -47,8 +47,8 @@ enum class SettingsType {
kDefaultApmDesktopAndBeamformer,
kDefaultApmDesktopAndIntelligibilityEnhancer,
kAllSubmodulesTurnedOff,
kDefaultDesktopApmWithoutDelayAgnostic,
kDefaultDesktopApmWithoutExtendedFilter
kDefaultApmDesktopWithoutDelayAgnostic,
kDefaultApmDesktopWithoutExtendedFilter
};
// Variables related to the audio data and formats.
@ -85,8 +85,8 @@ struct SimulationConfig {
#ifndef WEBRTC_ANDROID
const SettingsType desktop_settings[] = {
SettingsType::kDefaultApmDesktop, SettingsType::kAllSubmodulesTurnedOff,
SettingsType::kDefaultDesktopApmWithoutDelayAgnostic,
SettingsType::kDefaultDesktopApmWithoutExtendedFilter};
SettingsType::kDefaultApmDesktopWithoutDelayAgnostic,
SettingsType::kDefaultApmDesktopWithoutExtendedFilter};
const int desktop_sample_rates[] = {8000, 16000, 32000, 48000};
@ -151,11 +151,11 @@ struct SimulationConfig {
case SettingsType::kAllSubmodulesTurnedOff:
description = "AllSubmodulesOff";
break;
case SettingsType::kDefaultDesktopApmWithoutDelayAgnostic:
description = "DefaultDesktopApmWithoutDelayAgnostic";
case SettingsType::kDefaultApmDesktopWithoutDelayAgnostic:
description = "DefaultApmDesktopWithoutDelayAgnostic";
break;
case SettingsType::kDefaultDesktopApmWithoutExtendedFilter:
description = "DefaultDesktopApmWithoutExtendedFilter";
case SettingsType::kDefaultApmDesktopWithoutExtendedFilter:
description = "DefaultApmDesktopWithoutExtendedFilter";
break;
}
return description;
@ -605,7 +605,7 @@ class CallSimulator : public ::testing::TestWithParam<SimulationConfig> {
turn_off_default_apm_runtime_settings(apm_.get());
break;
}
case SettingsType::kDefaultDesktopApmWithoutDelayAgnostic: {
case SettingsType::kDefaultApmDesktopWithoutDelayAgnostic: {
Config config;
config.Set<ExtendedFilter>(new ExtendedFilter(true));
config.Set<DelayAgnostic>(new DelayAgnostic(false));
@ -615,7 +615,7 @@ class CallSimulator : public ::testing::TestWithParam<SimulationConfig> {
apm_->SetExtraOptions(config);
break;
}
case SettingsType::kDefaultDesktopApmWithoutExtendedFilter: {
case SettingsType::kDefaultApmDesktopWithoutExtendedFilter: {
Config config;
config.Set<ExtendedFilter>(new ExtendedFilter(false));
config.Set<DelayAgnostic>(new DelayAgnostic(true));