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

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: negative test for encrypted video added 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..321ae6c4a971b323d6be11c1c990ea0af910296b 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)
@@ -194,6 +195,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 +616,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.
+ CodecVector tmp;
ddorwin 2016/03/31 22:31:12 hi10_codec or something like that
hubbe 2016/04/01 00:20:58 Done.
+ tmp.push_back("avc3.6E001E");
ddorwin 2016/03/31 22:31:11 Is there a reason to use avc3 here?
hubbe 2016/04/01 00:20:58 No, honestly I don't actually know what the differ
ddorwin 2016/04/01 00:36:42 It's just more common, so there is usually a reaso
hubbe 2016/04/04 22:01:49 Acknowledged.
+ EXPECT_WV_NO_MATCH(AreCodecsSupportedByKeySystem(
+ kVideoMP4MimeType, tmp, kWidevine));
+
// Non-video MP4 codecs.
EXPECT_WV_NO_MATCH(AreCodecsSupportedByKeySystem(
kVideoMP4MimeType, audio_mp4_codecs(), kWidevine));

Powered by Google App Engine
This is Rietveld 408576698