Commit 60a1663c authored by John Rummell's avatar John Rummell Committed by Commit Bot

[eme] Add browser_test for all key systems playing 'cbcs' content

Now that Widevine should support 'cbcs' content, add a regular
EncryptedMediaTest that attempts to play 'cbcs' content with MSE.
This leaves the previous test that tests only ECK, as it checks
different CDM interface versions.

BUG=658026
TEST=new browser_tests pass

Change-Id: I954a5d78747458c69ff08f7c3c847ab717559b84
Reviewed-on: https://chromium-review.googlesource.com/1062950Reviewed-by: default avatarXiaohan Wang <xhwang@chromium.org>
Commit-Queue: John Rummell <jrummell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#560351}
parent a7f95fad
...@@ -676,6 +676,19 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoOnly_MP4_MDAT) { ...@@ -676,6 +676,19 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoOnly_MP4_MDAT) {
TestSimplePlayback("bear-640x360-v_frag-cenc-mdat.mp4", kMp4Avc1VideoOnly); TestSimplePlayback("bear-640x360-v_frag-cenc-mdat.mp4", kMp4Avc1VideoOnly);
} }
IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_Encryption_CBCS) {
if (CurrentSourceType() != SrcType::MSE) {
DVLOG(0) << "Skipping test; Can only play MP4 encrypted streams by MSE.";
return;
}
#if BUILDFLAG(ENABLE_CBCS_ENCRYPTION_SCHEME)
TestSimplePlayback("bear-640x360-v_frag-cbcs.mp4", kMp4Avc1VideoOnly);
#else
DVLOG(0) << "Skipping test; 'cbcs' decryption not supported.";
#endif
}
IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, IN_PROC_BROWSER_TEST_P(EncryptedMediaTest,
Playback_EncryptedVideo_MP4_ClearAudio_WEBM) { Playback_EncryptedVideo_MP4_ClearAudio_WEBM) {
TestDifferentContainers(EncryptedContainer::ENCRYPTED_MP4, TestDifferentContainers(EncryptedContainer::ENCRYPTED_MP4,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment