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

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

Issue 1909313002: Support HEVC through EME (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CR feedback Created 4 years, 6 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
« no previous file with comments | « no previous file | chromecast/chromecast.gyp » ('j') | chromecast/chromecast.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ac0f1461f91d6b85d8c550287646899dac26dea0..2e960087c96e8a28ae53eefccb6163b5c4925d27 100644
--- a/chrome/browser/media/encrypted_media_supported_types_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_supported_types_browsertest.cc
@@ -123,6 +123,14 @@ class EncryptedMediaSupportedTypesTest : public InProcessBrowserTest {
video_mp4_hi10p_codecs_.push_back("avc1.6E001E"); // Hi10P profile
+#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
+ video_mp4_codecs_.push_back("hvc1.1.6.L93.B0");
+ video_mp4_codecs_.push_back("hev1.1.6.L93.B0");
+#else
+ invalid_codecs_.push_back("hvc1.1.6.L93.B0");
+ invalid_codecs_.push_back("hev1.1.6.L93.B0");
+#endif
+
// Extended codecs are used, so make sure generic ones fail. These will be
// tested against all initDataTypes as they should always fail to be
// supported.
@@ -135,6 +143,12 @@ class EncryptedMediaSupportedTypesTest : public InProcessBrowserTest {
invalid_codecs_.push_back("mp4a");
invalid_codecs_.push_back("avc2");
invalid_codecs_.push_back("foo");
+
+ // We only support proper long-form HEVC codec ids.
+ invalid_codecs_.push_back("hev1");
+ invalid_codecs_.push_back("hev1.");
+ invalid_codecs_.push_back("hvc1");
+ invalid_codecs_.push_back("hvc1.");
}
typedef std::vector<std::string> CodecVector;
« no previous file with comments | « no previous file | chromecast/chromecast.gyp » ('j') | chromecast/chromecast.gyp » ('J')

Powered by Google App Engine
This is Rietveld 408576698