| 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 <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 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 475 } | 475 } |
| 476 | 476 |
| 477 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoOnly_WebM) { | 477 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoOnly_WebM) { |
| 478 TestSimplePlayback("bear-320x240-v_enc-v.webm", kWebMVP8VideoOnly); | 478 TestSimplePlayback("bear-320x240-v_enc-v.webm", kWebMVP8VideoOnly); |
| 479 } | 479 } |
| 480 | 480 |
| 481 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM) { | 481 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM) { |
| 482 TestSimplePlayback("bear-320x240-av_enc-v.webm", kWebMVorbisAudioVP8Video); | 482 TestSimplePlayback("bear-320x240-av_enc-v.webm", kWebMVorbisAudioVP8Video); |
| 483 } | 483 } |
| 484 | 484 |
| 485 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VP9Video_WebM) { | 485 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VP9Video_WebM_Fullsample) { |
| 486 TestSimplePlayback("bear-320x240-v-vp9_enc-v.webm", kWebMVP9VideoOnly); | 486 TestSimplePlayback("bear-320x240-v-vp9_fullsample_enc-v.webm", |
| 487 kWebMVP9VideoOnly); |
| 488 } |
| 489 |
| 490 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VP9Video_WebM_Subsample) { |
| 491 TestSimplePlayback("bear-320x240-v-vp9_subsample_enc-v.webm", |
| 492 kWebMVP9VideoOnly); |
| 487 } | 493 } |
| 488 | 494 |
| 489 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM_Opus) { | 495 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_AudioOnly_WebM_Opus) { |
| 490 TestSimplePlayback("bear-320x240-opus-a_enc-a.webm", kWebMOpusAudioOnly); | 496 TestSimplePlayback("bear-320x240-opus-a_enc-a.webm", kWebMOpusAudioOnly); |
| 491 } | 497 } |
| 492 | 498 |
| 493 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoAudio_WebM_Opus) { | 499 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoAudio_WebM_Opus) { |
| 494 TestSimplePlayback("bear-320x240-opus-av_enc-av.webm", | 500 TestSimplePlayback("bear-320x240-opus-av_enc-av.webm", |
| 495 kWebMOpusAudioVP9Video); | 501 kWebMOpusAudioVP9Video); |
| 496 } | 502 } |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 657 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadLoadableSession) { | 663 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadLoadableSession) { |
| 658 TestPlaybackCase(kExternalClearKeyKeySystem, kLoadableSession, kEnded); | 664 TestPlaybackCase(kExternalClearKeyKeySystem, kLoadableSession, kEnded); |
| 659 } | 665 } |
| 660 | 666 |
| 661 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadUnknownSession) { | 667 IN_PROC_BROWSER_TEST_F(ECKEncryptedMediaTest, LoadUnknownSession) { |
| 662 TestPlaybackCase(kExternalClearKeyKeySystem, kUnknownSession, | 668 TestPlaybackCase(kExternalClearKeyKeySystem, kUnknownSession, |
| 663 kEmeSessionNotFound); | 669 kEmeSessionNotFound); |
| 664 } | 670 } |
| 665 | 671 |
| 666 #endif // defined(ENABLE_PEPPER_CDMS) | 672 #endif // defined(ENABLE_PEPPER_CDMS) |
| OLD | NEW |