OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2016 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 | 10 |
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
180 "_" + std::to_string(render_input_sample_rate_hz) + "_" + | 180 "_" + std::to_string(render_input_sample_rate_hz) + "_" + |
181 std::to_string(render_output_sample_rate_hz) + "_" + | 181 std::to_string(render_output_sample_rate_hz) + "_" + |
182 std::to_string(capture_input_sample_rate_hz) + "_" + | 182 std::to_string(capture_input_sample_rate_hz) + "_" + |
183 std::to_string(capture_output_sample_rate_hz) + "Hz_" + | 183 std::to_string(capture_output_sample_rate_hz) + "Hz_" + |
184 std::to_string(num_channels) + "_channels" + "_total", | 184 std::to_string(num_channels) + "_channels" + "_total", |
185 test_description, FormPerformanceMeasureString(total_timer), "us", false); | 185 test_description, FormPerformanceMeasureString(total_timer), "us", false); |
186 } | 186 } |
187 | 187 |
188 } // namespace | 188 } // namespace |
189 | 189 |
190 TEST(LevelControllerPerformanceTest, StandaloneProcessing) { | 190 // TODO(peah): Reactivate once issue 7712 has been resolved. |
| 191 TEST(LevelControllerPerformanceTest, DISABLED_StandaloneProcessing) { |
191 int sample_rates_to_test[] = { | 192 int sample_rates_to_test[] = { |
192 AudioProcessing::kSampleRate8kHz, AudioProcessing::kSampleRate16kHz, | 193 AudioProcessing::kSampleRate8kHz, AudioProcessing::kSampleRate16kHz, |
193 AudioProcessing::kSampleRate32kHz, AudioProcessing::kSampleRate48kHz}; | 194 AudioProcessing::kSampleRate32kHz, AudioProcessing::kSampleRate48kHz}; |
194 for (auto sample_rate : sample_rates_to_test) { | 195 for (auto sample_rate : sample_rates_to_test) { |
195 for (size_t num_channels = 1; num_channels <= 2; ++num_channels) { | 196 for (size_t num_channels = 1; num_channels <= 2; ++num_channels) { |
196 RunStandaloneSubmodule(sample_rate, num_channels); | 197 RunStandaloneSubmodule(sample_rate, num_channels); |
197 } | 198 } |
198 } | 199 } |
199 } | 200 } |
200 | 201 |
(...skipping 11 matching lines...) Expand all Loading... |
212 RunTogetherWithApm(test_name, 48000, 48000, 44100, 44100, num_channels, | 213 RunTogetherWithApm(test_name, 48000, 48000, 44100, 44100, num_channels, |
213 use_mobile_agc, include_default_apm_processing); | 214 use_mobile_agc, include_default_apm_processing); |
214 | 215 |
215 // Then test mono combinations. | 216 // Then test mono combinations. |
216 num_channels = 1; | 217 num_channels = 1; |
217 RunTogetherWithApm(test_name, 48000, 48000, AudioProcessing::kSampleRate48kHz, | 218 RunTogetherWithApm(test_name, 48000, 48000, AudioProcessing::kSampleRate48kHz, |
218 AudioProcessing::kSampleRate48kHz, num_channels, | 219 AudioProcessing::kSampleRate48kHz, num_channels, |
219 use_mobile_agc, include_default_apm_processing); | 220 use_mobile_agc, include_default_apm_processing); |
220 } | 221 } |
221 | 222 |
| 223 // TODO(peah): Reactivate once issue 7712 has been resolved. |
222 #if !defined(WEBRTC_ANDROID) | 224 #if !defined(WEBRTC_ANDROID) |
223 TEST(LevelControllerPerformanceTest, ProcessingViaApm) { | 225 TEST(LevelControllerPerformanceTest, DISABLED_ProcessingViaApm) { |
224 #else | 226 #else |
225 TEST(LevelControllerPerformanceTest, DISABLED_ProcessingViaApm) { | 227 TEST(LevelControllerPerformanceTest, DISABLED_ProcessingViaApm) { |
226 #endif | 228 #endif |
227 // Run without default APM processing and desktop AGC. | 229 // Run without default APM processing and desktop AGC. |
228 TestSomeSampleRatesWithApm("SimpleLevelControlViaApm", false, false); | 230 TestSomeSampleRatesWithApm("SimpleLevelControlViaApm", false, false); |
229 } | 231 } |
230 | 232 |
| 233 // TODO(peah): Reactivate once issue 7712 has been resolved. |
231 #if !defined(WEBRTC_ANDROID) | 234 #if !defined(WEBRTC_ANDROID) |
232 TEST(LevelControllerPerformanceTest, InteractionWithDefaultApm) { | 235 TEST(LevelControllerPerformanceTest, DISABLED_InteractionWithDefaultApm) { |
233 #else | 236 #else |
234 TEST(LevelControllerPerformanceTest, DISABLED_InteractionWithDefaultApm) { | 237 TEST(LevelControllerPerformanceTest, DISABLED_InteractionWithDefaultApm) { |
235 #endif | 238 #endif |
236 bool include_default_apm_processing = true; | 239 bool include_default_apm_processing = true; |
237 TestSomeSampleRatesWithApm("LevelControlAndDefaultDesktopApm", false, | 240 TestSomeSampleRatesWithApm("LevelControlAndDefaultDesktopApm", false, |
238 include_default_apm_processing); | 241 include_default_apm_processing); |
239 TestSomeSampleRatesWithApm("LevelControlAndDefaultMobileApm", true, | 242 TestSomeSampleRatesWithApm("LevelControlAndDefaultMobileApm", true, |
240 include_default_apm_processing); | 243 include_default_apm_processing); |
241 } | 244 } |
242 | 245 |
243 } // namespace webrtc | 246 } // namespace webrtc |
OLD | NEW |