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

Unified Diff: media/base/key_systems.cc

Issue 2006113002: Allow hw secured codecs on chromecast (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: New flag, new key system property Created 4 years, 7 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: media/base/key_systems.cc
diff --git a/media/base/key_systems.cc b/media/base/key_systems.cc
index fab743252d9f227af048d2fae5b6f52c493b4548..e5b4376f2b2b5ea589e76cc3c399e04eafd7c1e1 100644
--- a/media/base/key_systems.cc
+++ b/media/base/key_systems.cc
@@ -588,10 +588,10 @@ EmeConfigRule KeySystemsImpl::GetContentTypeConfigRule(
SupportedCodecs key_system_codec_mask =
key_system_iter->second->GetSupportedCodecs();
-#if defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_HW_SECURE_CODEC)
SupportedCodecs key_system_secure_codec_mask =
key_system_iter->second->GetSupportedSecureCodecs();
-#endif // defined(OS_ANDROID)
+#endif // BUILDFLAG(ENABLE_HW_SECURE_CODEC)
// Check that the container is supported by the key system. (This check is
// necessary because |codecs| may be empty.)
@@ -606,7 +606,7 @@ EmeConfigRule KeySystemsImpl::GetContentTypeConfigRule(
SupportedCodecs codec = GetCodecForString(codecs[i]);
if ((codec & key_system_codec_mask & mime_type_codec_mask) == 0)
return EmeConfigRule::NOT_SUPPORTED;
-#if defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_HW_SECURE_CODEC)
// Check whether the codec supports a hardware-secure mode. The goal is to
// prevent mixing of non-hardware-secure codecs with hardware-secure codecs,
// since the mode is fixed at CDM creation.
@@ -617,7 +617,7 @@ EmeConfigRule KeySystemsImpl::GetContentTypeConfigRule(
// that hardware-secure-only codecs actually exist and are useful.
if ((codec & key_system_secure_codec_mask) == 0)
support = EmeConfigRule::HW_SECURE_CODECS_NOT_ALLOWED;
-#endif // defined(OS_ANDROID)
+#endif // BUILDFLAG(ENABLE_HW_SECURE_CODEC)
}
return support;

Powered by Google App Engine
This is Rietveld 408576698