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

Side by Side Diff: chrome/browser/media/encrypted_media_browsertest.cc

Issue 2452523004: Always count rendered frames; fixes drop flakiness. (Closed)
Patch Set: Revert zero-check from OnLastFrameDropped(). Add test. 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 | « no previous file | media/filters/video_renderer_algorithm.cc » ('j') | 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 <memory> 5 #include <memory>
6 #include <utility> 6 #include <utility>
7 7
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 } 508 }
509 509
510 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) { 510 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) {
511 if (!IsPlayBackPossible(CurrentKeySystem())) { 511 if (!IsPlayBackPossible(CurrentKeySystem())) {
512 DVLOG(0) << "Skipping test - ConfigChange test requires video playback."; 512 DVLOG(0) << "Skipping test - ConfigChange test requires video playback.";
513 return; 513 return;
514 } 514 }
515 TestConfigChange(); 515 TestConfigChange();
516 } 516 }
517 517
518 // Flaky on Windows. http://crbug.com/655630 518 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameSizeChangeVideo) {
519 #if defined(OS_WIN)
520 #define MAYBE_FrameSizeChangeVideo DISABLED_FrameSizeChangeVideo
521 #else
522 #define MAYBE_FrameSizeChangeVideo FrameSizeChangeVideo
523 #endif
524 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, MAYBE_FrameSizeChangeVideo) {
525 if (!IsPlayBackPossible(CurrentKeySystem())) { 519 if (!IsPlayBackPossible(CurrentKeySystem())) {
526 DVLOG(0) << "Skipping test - FrameSizeChange test requires video playback."; 520 DVLOG(0) << "Skipping test - FrameSizeChange test requires video playback.";
527 return; 521 return;
528 } 522 }
529 TestFrameSizeChange(); 523 TestFrameSizeChange();
530 } 524 }
531 525
532 #if defined(USE_PROPRIETARY_CODECS) 526 #if defined(USE_PROPRIETARY_CODECS)
533 // Crashes on Mac only. http://crbug.com/621857 527 // Crashes on Mac only. http://crbug.com/621857
534 #if defined(OS_MACOSX) 528 #if defined(OS_MACOSX)
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
655 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadLoadableSession) { 649 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadLoadableSession) {
656 TestPlaybackCase(kExternalClearKeyKeySystem, kLoadableSession, kEnded); 650 TestPlaybackCase(kExternalClearKeyKeySystem, kLoadableSession, kEnded);
657 } 651 }
658 652
659 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadUnknownSession) { 653 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadUnknownSession) {
660 TestPlaybackCase(kExternalClearKeyKeySystem, kUnknownSession, 654 TestPlaybackCase(kExternalClearKeyKeySystem, kUnknownSession,
661 kEmeSessionNotFound); 655 kEmeSessionNotFound);
662 } 656 }
663 657
664 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS) 658 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
OLDNEW
« no previous file with comments | « no previous file | media/filters/video_renderer_algorithm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698