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

Unified Diff: chrome/browser/media/encrypted_media_supported_types_browsertest.cc

Issue 1837963004: Make CanPlayType return "probably" for HI10P h264 videos. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments addressed Created 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/media/encrypted_media_supported_types_browsertest.cc
diff --git a/chrome/browser/media/encrypted_media_supported_types_browsertest.cc b/chrome/browser/media/encrypted_media_supported_types_browsertest.cc
index 22150c3e0cdb0b5f10fd2fe83a4e5a226e107774..7b92cd95b56042f928c2d2cac9c1fd70a353c287 100644
--- a/chrome/browser/media/encrypted_media_supported_types_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_supported_types_browsertest.cc
@@ -56,6 +56,7 @@ const char kSuccessResult[] = "success";
const char kUnsupportedResult[] = "Unsupported keySystem";
const char kNoMatchResult[] =
"None of the requested configurations were supported.";
+const char kFailure[] = "failure";
#define EXPECT_SUCCESS(test) EXPECT_EQ(kSuccessResult, test)
#define EXPECT_UNKNOWN_KEYSYSTEM(test) EXPECT_EQ(kUnsupportedResult, test)
@@ -109,8 +110,9 @@ class EncryptedMediaSupportedTypesTest : public InProcessBrowserTest {
audio_mp4_codecs_.push_back("mp4a.40.2");
- video_mp4_codecs_.push_back("avc1.4D400C");
- video_mp4_codecs_.push_back("avc3.64001F");
+ video_mp4_codecs_.push_back("avc1.42001E"); // Baseline profile.
+ video_mp4_codecs_.push_back("avc1.4D400C"); // Main profile.
+ video_mp4_codecs_.push_back("avc3.64001F"); // High profile.
// Extended codecs are used, so make sure generic ones fail. These will be
// tested against all initDataTypes as they should always fail to be
@@ -194,6 +196,7 @@ class EncryptedMediaSupportedTypesTest : public InProcessBrowserTest {
base::ASCIIToUTF16(kSuccessResult));
title_watcher.AlsoWaitForTitle(base::ASCIIToUTF16(kUnsupportedResult));
title_watcher.AlsoWaitForTitle(base::ASCIIToUTF16(kNoMatchResult));
+ title_watcher.AlsoWaitForTitle(base::ASCIIToUTF16(kFailure));
EXPECT_TRUE(content::ExecuteScript(contents, command));
base::string16 result = title_watcher.WaitAndGetTitle();
return base::UTF16ToASCII(result);
@@ -614,6 +617,12 @@ IN_PROC_BROWSER_TEST_F(EncryptedMediaSupportedTypesWidevineTest, Video_MP4) {
EXPECT_WV_PROPRIETARY(AreCodecsSupportedByKeySystem(
kVideoMP4MimeType, video_mp4_codecs(), kWidevine));
+ // High 10-bit Profile is not supported through WideVine.
jrummell 2016/04/01 00:52:52 Should you do a similar test for Clearkey/External
hubbe 2016/04/04 22:01:49 Done.
+ CodecVector hi10_codec;
+ hi10_codec.push_back("avc1.6E001E");
+ EXPECT_WV_NO_MATCH(AreCodecsSupportedByKeySystem(
+ kVideoMP4MimeType, hi10_codec, kWidevine));
+
// Non-video MP4 codecs.
EXPECT_WV_NO_MATCH(AreCodecsSupportedByKeySystem(
kVideoMP4MimeType, audio_mp4_codecs(), kWidevine));

Powered by Google App Engine
This is Rietveld 408576698