Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 #include "webrtc/modules/audio_processing/audio_processing_impl.h" | 10 #include "webrtc/modules/audio_processing/audio_processing_impl.h" |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 89 SettingsType::kDefaultApmDesktopWithoutExtendedFilter}; | 89 SettingsType::kDefaultApmDesktopWithoutExtendedFilter}; |
| 90 | 90 |
| 91 const int desktop_sample_rates[] = {8000, 16000, 32000, 48000}; | 91 const int desktop_sample_rates[] = {8000, 16000, 32000, 48000}; |
| 92 | 92 |
| 93 for (auto sample_rate : desktop_sample_rates) { | 93 for (auto sample_rate : desktop_sample_rates) { |
| 94 for (auto settings : desktop_settings) { | 94 for (auto settings : desktop_settings) { |
| 95 simulation_configs.push_back(SimulationConfig(sample_rate, settings)); | 95 simulation_configs.push_back(SimulationConfig(sample_rate, settings)); |
| 96 } | 96 } |
| 97 } | 97 } |
| 98 | 98 |
| 99 #if (WEBRTC_INTELLIGIBILITY_ENHANCER == 1) | |
|
ivoc
2016/08/31 08:45:45
Does this work if the flag is not set at all? Or i
peah-webrtc
2016/08/31 12:42:46
That is a very good point! I put it like this in o
| |
| 99 const SettingsType intelligibility_enhancer_settings[] = { | 100 const SettingsType intelligibility_enhancer_settings[] = { |
| 100 SettingsType::kDefaultApmDesktopAndIntelligibilityEnhancer}; | 101 SettingsType::kDefaultApmDesktopAndIntelligibilityEnhancer}; |
| 101 | 102 |
| 102 const int intelligibility_enhancer_sample_rates[] = {8000, 16000, 32000, | 103 const int intelligibility_enhancer_sample_rates[] = {8000, 16000, 32000, |
| 103 48000}; | 104 48000}; |
| 104 | 105 |
| 105 for (auto sample_rate : intelligibility_enhancer_sample_rates) { | 106 for (auto sample_rate : intelligibility_enhancer_sample_rates) { |
| 106 for (auto settings : intelligibility_enhancer_settings) { | 107 for (auto settings : intelligibility_enhancer_settings) { |
| 107 simulation_configs.push_back(SimulationConfig(sample_rate, settings)); | 108 simulation_configs.push_back(SimulationConfig(sample_rate, settings)); |
| 108 } | 109 } |
| 109 } | 110 } |
| 111 #endif | |
| 110 | 112 |
| 111 const SettingsType beamformer_settings[] = { | 113 const SettingsType beamformer_settings[] = { |
| 112 SettingsType::kDefaultApmDesktopAndBeamformer}; | 114 SettingsType::kDefaultApmDesktopAndBeamformer}; |
| 113 | 115 |
| 114 const int beamformer_sample_rates[] = {8000, 16000, 32000, 48000}; | 116 const int beamformer_sample_rates[] = {8000, 16000, 32000, 48000}; |
| 115 | 117 |
| 116 for (auto sample_rate : beamformer_sample_rates) { | 118 for (auto sample_rate : beamformer_sample_rates) { |
| 117 for (auto settings : beamformer_settings) { | 119 for (auto settings : beamformer_settings) { |
| 118 simulation_configs.push_back(SimulationConfig(sample_rate, settings)); | 120 simulation_configs.push_back(SimulationConfig(sample_rate, settings)); |
| 119 } | 121 } |
| (...skipping 588 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 708 // Run test and verify that it did not time out. | 710 // Run test and verify that it did not time out. |
| 709 EXPECT_EQ(kEventSignaled, Run()); | 711 EXPECT_EQ(kEventSignaled, Run()); |
| 710 } | 712 } |
| 711 | 713 |
| 712 INSTANTIATE_TEST_CASE_P( | 714 INSTANTIATE_TEST_CASE_P( |
| 713 AudioProcessingPerformanceTest, | 715 AudioProcessingPerformanceTest, |
| 714 CallSimulator, | 716 CallSimulator, |
| 715 ::testing::ValuesIn(SimulationConfig::GenerateSimulationConfigs())); | 717 ::testing::ValuesIn(SimulationConfig::GenerateSimulationConfigs())); |
| 716 | 718 |
| 717 } // namespace webrtc | 719 } // namespace webrtc |
| OLD | NEW |