Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(195)

Side by Side Diff: chrome/browser/media/webrtc/webrtc_video_quality_browsertest.cc

Issue 2464743002: Revert of Disable flaky WebRTC tests. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/media/webrtc/webrtc_perf_browsertest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 std::unique_ptr<base::Environment> environment_; 335 std::unique_ptr<base::Environment> environment_;
336 base::FilePath webrtc_reference_video_y4m_; 336 base::FilePath webrtc_reference_video_y4m_;
337 base::ScopedTempDir temp_working_dir_; 337 base::ScopedTempDir temp_working_dir_;
338 }; 338 };
339 339
340 INSTANTIATE_TEST_CASE_P( 340 INSTANTIATE_TEST_CASE_P(
341 WebRtcVideoQualityBrowserTests, 341 WebRtcVideoQualityBrowserTests,
342 WebRtcVideoQualityBrowserTest, 342 WebRtcVideoQualityBrowserTest,
343 testing::ValuesIn(kVideoConfigurations)); 343 testing::ValuesIn(kVideoConfigurations));
344 344
345 // Video quality tests are flaky on Windows. See http://crbug.com/webrtc/6484.
346 #if defined(OS_WIN)
347 #define MAYBE_TestVideoQualityVp8 DISABLED_TestVideoQualityVp8
348 #define MAYBE_TestVideoQualityVp9 DISABLED_TestVideoQualityVp9
349 #define MAYBE_TestVideoQualityH264 DISABLED_TestVideoQualityH264
350 #else
351 #define MAYBE_TestVideoQualityVp8 MANUAL_TestVideoQualityVp8
352 #define MAYBE_TestVideoQualityVp9 MANUAL_TestVideoQualityVp9
353 #define MAYBE_TestVideoQualityH264 MANUAL_TestVideoQualityH264
354 #endif
355
356 IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest, 345 IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest,
357 MAYBE_TestVideoQualityVp8) { 346 MANUAL_TestVideoQualityVp8) {
358 TestVideoQuality("VP8"); 347 TestVideoQuality("VP8");
359 } 348 }
360 349
361 IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest, 350 IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest,
362 MAYBE_TestVideoQualityVp9) { 351 MANUAL_TestVideoQualityVp9) {
363 TestVideoQuality("VP9"); 352 TestVideoQuality("VP9");
364 } 353 }
365 354
366 #if BUILDFLAG(RTC_USE_H264) 355 #if BUILDFLAG(RTC_USE_H264)
367 356
368 IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest, 357 IN_PROC_BROWSER_TEST_P(WebRtcVideoQualityBrowserTest,
369 MAYBE_TestVideoQualityH264) { 358 MANUAL_TestVideoQualityH264) {
370 // Only run test if run-time feature corresponding to |rtc_use_h264| is on. 359 // Only run test if run-time feature corresponding to |rtc_use_h264| is on.
371 if (!base::FeatureList::IsEnabled(content::kWebRtcH264WithOpenH264FFmpeg)) { 360 if (!base::FeatureList::IsEnabled(content::kWebRtcH264WithOpenH264FFmpeg)) {
372 LOG(WARNING) << "Run-time feature WebRTC-H264WithOpenH264FFmpeg disabled. " 361 LOG(WARNING) << "Run-time feature WebRTC-H264WithOpenH264FFmpeg disabled. "
373 "Skipping WebRtcVideoQualityBrowserTest.MANUAL_TestVideoQualityH264 " 362 "Skipping WebRtcVideoQualityBrowserTest.MANUAL_TestVideoQualityH264 "
374 "(test \"OK\")"; 363 "(test \"OK\")";
375 return; 364 return;
376 } 365 }
377 TestVideoQuality("H264"); 366 TestVideoQuality("H264");
378 } 367 }
379 368
380 #endif // BUILDFLAG(RTC_USE_H264) 369 #endif // BUILDFLAG(RTC_USE_H264)
OLDNEW
« no previous file with comments | « chrome/browser/media/webrtc/webrtc_perf_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698