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

Unified Diff: media/base/eme_constants.h

Issue 1137993004: Revert of Restrict use of hardware-secure codecs based on the RendererPreference. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@setsecurity
Patch Set: Created 5 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
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | media/base/key_systems.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/eme_constants.h
diff --git a/media/base/eme_constants.h b/media/base/eme_constants.h
index 55ba254802ad65ffc9cbde37960386b46e309714..6d6399d60174ce060c331e2353a5f10bd9055488 100644
--- a/media/base/eme_constants.h
+++ b/media/base/eme_constants.h
@@ -129,14 +129,15 @@
// The configuration option is supported if both a distinctive identifier and
// persistent state are available.
IDENTIFIER_AND_PERSISTENCE_REQUIRED,
- // The configuration option prevents use of hardware-secure codecs.
- // This rule only has meaning on platforms that distinguish hardware-secure
- // codecs (ie. Android).
+#if defined(OS_ANDROID)
+ // The configuration option is supported if no hardware-secure codecs are used
+ // (as they would be for video if secure surfaces are enabled).
SECURE_CODECS_NOT_ALLOWED,
- // The configuration option is supported if hardware-secure codecs are used.
- // This rule only has meaning on platforms that distinguish hardware-secure
- // codecs (ie. Android).
+ // The configuration option is supported if only hardware-secure codecs are
+ // used. This implies that secure surfaces (hole-punching) are required for
+ // video.
SECURE_CODECS_REQUIRED,
+#endif // defined(OS_ANDROID)
// The configuration option is supported without conditions.
SUPPORTED,
};
« no previous file with comments | « content/renderer/render_frame_impl.cc ('k') | media/base/key_systems.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698