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 | 10 |
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
191 }; | 191 }; |
192 | 192 |
193 auto add_aec_settings = [](const std::vector<TestConfig>& in) { | 193 auto add_aec_settings = [](const std::vector<TestConfig>& in) { |
194 std::vector<TestConfig> out; | 194 std::vector<TestConfig> out; |
195 AecType aec_types[] = { | 195 AecType aec_types[] = { |
196 AecType::BasicWebRtcAecSettings, AecType::AecTurnedOff, | 196 AecType::BasicWebRtcAecSettings, AecType::AecTurnedOff, |
197 AecType::BasicWebRtcAecSettingsWithExtentedFilter, | 197 AecType::BasicWebRtcAecSettingsWithExtentedFilter, |
198 AecType::BasicWebRtcAecSettingsWithDelayAgnosticAec, | 198 AecType::BasicWebRtcAecSettingsWithDelayAgnosticAec, |
199 AecType::BasicWebRtcAecSettingsWithAecMobile}; | 199 AecType::BasicWebRtcAecSettingsWithAecMobile}; |
200 for (auto test_config : in) { | 200 for (auto test_config : in) { |
201 for (auto aec_type : aec_types) { | 201 // Due to a VisualStudio 2015 compiler issue, the internal loop |
202 test_config.aec_type = aec_type; | 202 // variable here cannot override a previously defined name. |
| 203 // In other words "type" cannot be named "aec_type" here. |
| 204 // https://connect.microsoft.com/VisualStudio/feedback/details/2291755 |
| 205 for (auto type : aec_types) { |
| 206 test_config.aec_type = type; |
203 out.push_back(test_config); | 207 out.push_back(test_config); |
204 } | 208 } |
205 } | 209 } |
206 return out; | 210 return out; |
207 }; | 211 }; |
208 | 212 |
209 auto add_settings_scheme = [](const std::vector<TestConfig>& in) { | 213 auto add_settings_scheme = [](const std::vector<TestConfig>& in) { |
210 std::vector<TestConfig> out; | 214 std::vector<TestConfig> out; |
211 RuntimeParameterSettingScheme schemes[] = { | 215 RuntimeParameterSettingScheme schemes[] = { |
212 RuntimeParameterSettingScheme::SparseStreamMetadataChangeScheme, | 216 RuntimeParameterSettingScheme::SparseStreamMetadataChangeScheme, |
(...skipping 911 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1124 DISABLED_AudioProcessingImplLockExtensive, | 1128 DISABLED_AudioProcessingImplLockExtensive, |
1125 AudioProcessingImplLockTest, | 1129 AudioProcessingImplLockTest, |
1126 ::testing::ValuesIn(TestConfig::GenerateExtensiveTestConfigs())); | 1130 ::testing::ValuesIn(TestConfig::GenerateExtensiveTestConfigs())); |
1127 | 1131 |
1128 INSTANTIATE_TEST_CASE_P( | 1132 INSTANTIATE_TEST_CASE_P( |
1129 AudioProcessingImplLockBrief, | 1133 AudioProcessingImplLockBrief, |
1130 AudioProcessingImplLockTest, | 1134 AudioProcessingImplLockTest, |
1131 ::testing::ValuesIn(TestConfig::GenerateBriefTestConfigs())); | 1135 ::testing::ValuesIn(TestConfig::GenerateBriefTestConfigs())); |
1132 | 1136 |
1133 } // namespace webrtc | 1137 } // namespace webrtc |
OLD | NEW |