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

Unified Diff: media/base/android/media_drm_bridge.h

Issue 930413003: MediaDrm: Only apply Widevine security levels to the Widevine key system. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add creation and SetSecurityLevel tests. Created 5 years, 10 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/android/media_drm_bridge.h
diff --git a/media/base/android/media_drm_bridge.h b/media/base/android/media_drm_bridge.h
index e774470ac2ebb75a83925381aa63ac5759d47a0e..06716dfa6cf6e02de6fdd787e00ce3c6f08ed215 100644
--- a/media/base/android/media_drm_bridge.h
+++ b/media/base/android/media_drm_bridge.h
@@ -27,6 +27,7 @@ class MediaPlayerManager;
// This class provides DRM services for android EME implementation.
class MEDIA_EXPORT MediaDrmBridge : public BrowserCdm {
public:
+ // TODO(ddorwin): These are specific to Widevine. http://crbug.com/459400
enum SecurityLevel {
SECURITY_LEVEL_NONE = 0,
SECURITY_LEVEL_1 = 1,
@@ -42,9 +43,6 @@ class MEDIA_EXPORT MediaDrmBridge : public BrowserCdm {
// to check IsAvailable() explicitly before calling them.
static bool IsAvailable();
- static bool IsSecurityLevelSupported(const std::string& key_system,
- SecurityLevel security_level);
-
// Checks whether |key_system| is supported.
static bool IsKeySystemSupported(const std::string& key_system);
@@ -58,8 +56,6 @@ class MEDIA_EXPORT MediaDrmBridge : public BrowserCdm {
const std::string& key_system,
const std::string& container_mime_type);
- static bool IsSecureDecoderRequired(SecurityLevel security_level);
-
static bool RegisterMediaDrmBridge(JNIEnv* env);
// Returns a MediaDrmBridge instance if |key_system| is supported, or a NULL
@@ -191,6 +187,8 @@ class MEDIA_EXPORT MediaDrmBridge : public BrowserCdm {
const SessionErrorCB& session_error_cb,
const SessionKeysChangeCB& session_keys_change_cb);
+ static bool IsSecureDecoderRequired(SecurityLevel security_level);
+
// Get the security level of the media.
SecurityLevel GetSecurityLevel();

Powered by Google App Engine
This is Rietveld 408576698