Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include "base/base64.h" | 7 #include "base/base64.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/environment.h" | 9 #include "base/environment.h" |
| 10 #include "base/files/file.h" | 10 #include "base/files/file.h" |
| (...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 350 } | 350 } |
| 351 | 351 |
| 352 IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest, | 352 IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest, |
| 353 MANUAL_TestVideoQualityVp9) { | 353 MANUAL_TestVideoQualityVp9) { |
| 354 base::ThreadRestrictions::ScopedAllowIO allow_io; | 354 base::ThreadRestrictions::ScopedAllowIO allow_io; |
| 355 TestVideoQuality("VP9"); | 355 TestVideoQuality("VP9"); |
| 356 } | 356 } |
| 357 | 357 |
| 358 #if BUILDFLAG(RTC_USE_H264) | 358 #if BUILDFLAG(RTC_USE_H264) |
| 359 | 359 |
| 360 // TODO(philipel): Remove disable condition when H264 flakyness has been | |
| 361 // investigated (crbug.com/722746). | |
| 362 #if defined(OS_WIN) | |
| 363 #define MAYBE_TestVideoQualityH264 DISABLED_TestVideoQualityH264 | |
|
tommi (sloooow) - chröme
2017/05/18 11:45:42
nit: we don't indent #defines.
| |
| 364 #else | |
| 365 #define MAYBE_TestVideoQualityH264 MANUAL_TestVideoQualityH264 | |
| 366 #endif | |
| 360 IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest, | 367 IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest, |
| 361 MANUAL_TestVideoQualityH264) { | 368 MAYBE_TestVideoQualityH264) { |
| 362 base::ThreadRestrictions::ScopedAllowIO allow_io; | 369 base::ThreadRestrictions::ScopedAllowIO allow_io; |
| 363 // Only run test if run-time feature corresponding to |rtc_use_h264| is on. | 370 // Only run test if run-time feature corresponding to |rtc_use_h264| is on. |
| 364 if (!base::FeatureList::IsEnabled(content::kWebRtcH264WithOpenH264FFmpeg)) { | 371 if (!base::FeatureList::IsEnabled(content::kWebRtcH264WithOpenH264FFmpeg)) { |
| 365 LOG(WARNING) << "Run-time feature WebRTC-H264WithOpenH264FFmpeg disabled. " | 372 LOG(WARNING) << "Run-time feature WebRTC-H264WithOpenH264FFmpeg disabled. " |
| 366 "Skipping WebRtcVideoQualityBrowserTest.MANUAL_TestVideoQualityH264 " | 373 "Skipping WebRtcVideoQualityBrowserTest.MANUAL_TestVideoQualityH264 " |
| 367 "(test \"OK\")"; | 374 "(test \"OK\")"; |
| 368 return; | 375 return; |
| 369 } | 376 } |
| 370 TestVideoQuality("H264"); | 377 TestVideoQuality("H264"); |
| 371 } | 378 } |
| 372 | 379 |
| 373 #endif // BUILDFLAG(RTC_USE_H264) | 380 #endif // BUILDFLAG(RTC_USE_H264) |
| OLD | NEW |