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

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

Issue 1016483002: Don't attempt playback if not possible (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move check Created 5 years, 9 months 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 | 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "base/win/windows_version.h" 9 #include "base/win/windows_version.h"
10 #include "chrome/browser/media/media_browsertest.h" 10 #include "chrome/browser/media/media_browsertest.h"
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 const std::string& media_type) { 409 const std::string& media_type) {
410 RunSimpleEncryptedMediaTest(encrypted_media, 410 RunSimpleEncryptedMediaTest(encrypted_media,
411 media_type, 411 media_type,
412 CurrentKeySystem(), 412 CurrentKeySystem(),
413 CurrentSourceType(), 413 CurrentSourceType(),
414 CurrentEmeVersion()); 414 CurrentEmeVersion());
415 } 415 }
416 416
417 void TestMultiplePlayback(const std::string& encrypted_media, 417 void TestMultiplePlayback(const std::string& encrypted_media,
418 const std::string& media_type) { 418 const std::string& media_type) {
419 DCHECK(IsPlayBackPossible(CurrentKeySystem()));
419 RunEncryptedMediaTest(kDefaultEmePlayer, encrypted_media, media_type, 420 RunEncryptedMediaTest(kDefaultEmePlayer, encrypted_media, media_type,
420 CurrentKeySystem(), CurrentSourceType(), 421 CurrentKeySystem(), CurrentSourceType(),
421 CurrentEmeVersion(), kNoSessionToLoad, false, 422 CurrentEmeVersion(), kNoSessionToLoad, false,
422 PlayTwice::YES, kEnded); 423 PlayTwice::YES, kEnded);
423 } 424 }
424 425
425 void RunInvalidResponseTest() { 426 void RunInvalidResponseTest() {
426 RunEncryptedMediaTest(kDefaultEmePlayer, "bear-320x240-av_enc-av.webm", 427 RunEncryptedMediaTest(kDefaultEmePlayer, "bear-320x240-av_enc-av.webm",
427 kWebMAudioVideo, CurrentKeySystem(), 428 kWebMAudioVideo, CurrentKeySystem(),
428 CurrentSourceType(), CurrentEmeVersion(), 429 CurrentSourceType(), CurrentEmeVersion(),
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
568 569
569 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoAudio_WebM_Opus) { 570 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoAudio_WebM_Opus) {
570 TestSimplePlayback("bear-320x240-opus-av_enc-av.webm", kWebMAudioVideo); 571 TestSimplePlayback("bear-320x240-opus-av_enc-av.webm", kWebMAudioVideo);
571 } 572 }
572 573
573 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM_Opus) { 574 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM_Opus) {
574 TestSimplePlayback("bear-320x240-opus-av_enc-v.webm", kWebMAudioVideo); 575 TestSimplePlayback("bear-320x240-opus-av_enc-v.webm", kWebMAudioVideo);
575 } 576 }
576 577
577 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_Multiple_VideoAudio_WebM) { 578 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_Multiple_VideoAudio_WebM) {
579 if (!IsPlayBackPossible(CurrentKeySystem())) {
580 DVLOG(0) << "Skipping test - Playback_Multiple test requires playback.";
581 return;
582 }
578 TestMultiplePlayback("bear-320x240-av_enc-av.webm", kWebMAudioVideo); 583 TestMultiplePlayback("bear-320x240-av_enc-av.webm", kWebMAudioVideo);
579 } 584 }
580 585
581 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, InvalidResponseKeyError) { 586 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, InvalidResponseKeyError) {
582 RunInvalidResponseTest(); 587 RunInvalidResponseTest();
583 } 588 }
584 589
585 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) { 590 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, ConfigChangeVideo) {
586 if (CurrentSourceType() != MSE || !IsMSESupported()) { 591 if (CurrentSourceType() != MSE || !IsMSESupported()) {
587 DVLOG(0) << "Skipping test - ConfigChange test requires MSE."; 592 DVLOG(0) << "Skipping test - ConfigChange test requires MSE.";
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
709 714
710 IN_PROC_BROWSER_TEST_F(ECKPrefixedEncryptedMediaTest, LoadLoadableSession) { 715 IN_PROC_BROWSER_TEST_F(ECKPrefixedEncryptedMediaTest, LoadLoadableSession) {
711 TestPlaybackCase(kLoadableSession, kEnded); 716 TestPlaybackCase(kLoadableSession, kEnded);
712 } 717 }
713 718
714 IN_PROC_BROWSER_TEST_F(ECKPrefixedEncryptedMediaTest, LoadUnknownSession) { 719 IN_PROC_BROWSER_TEST_F(ECKPrefixedEncryptedMediaTest, LoadUnknownSession) {
715 // TODO(xhwang): Add a specific error for this failure, e.g. kSessionNotFound. 720 // TODO(xhwang): Add a specific error for this failure, e.g. kSessionNotFound.
716 TestPlaybackCase(kUnknownSession, kEmeKeyError); 721 TestPlaybackCase(kUnknownSession, kEmeKeyError);
717 } 722 }
718 #endif // defined(ENABLE_PEPPER_CDMS) 723 #endif // defined(ENABLE_PEPPER_CDMS)
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698