summaryrefslogtreecommitdiffstats
path: root/include/drm
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2011-03-20 10:25:16 -0700
committerGloria Wang <gwang@google.com>2011-03-21 13:50:04 -0700
commit1da9aa606096e14985924e8433a087d04f68ea22 (patch)
treec1044319fcfc114f8459bb1abac1aa75c9e3d80f /include/drm
parentc8a8472a0205dd698c8d81bf7e09026ca1013d1e (diff)
downloadframeworks_av-1da9aa606096e14985924e8433a087d04f68ea22.zip
frameworks_av-1da9aa606096e14985924e8433a087d04f68ea22.tar.gz
frameworks_av-1da9aa606096e14985924e8433a087d04f68ea22.tar.bz2
Fix for 4084554.
DRM framework support for enabling/disabling copy control settings from a DRM plugin Change-Id: I6529695cc4adbab2b9a63708bb459e3b77e07564
Diffstat (limited to 'include/drm')
-rw-r--r--include/drm/drm_framework_common.h16
1 files changed, 16 insertions, 0 deletions
diff --git a/include/drm/drm_framework_common.h b/include/drm/drm_framework_common.h
index 3ad0330..35d417b 100644
--- a/include/drm/drm_framework_common.h
+++ b/include/drm/drm_framework_common.h
@@ -44,6 +44,17 @@ enum {
};
/**
+ * copy control settings used in DecryptHandle::copyControlVector
+ */
+enum DrmCopyControl {
+ DRM_COPY_CONTROL_BASE = 1000,
+ // the key used to set the value for HDCP
+ // if the associated value is 1, then HDCP is required
+ // otherwise, HDCP is not required
+ DRM_COPY_CONTROL_HDCP = DRM_COPY_CONTROL_BASE
+};
+
+/**
* Defines DRM Buffer
*/
class DrmBuffer {
@@ -280,6 +291,11 @@ public:
* e.g. size of memory to be allocated to get the decrypted content.
*/
DecryptInfo* decryptInfo;
+ /**
+ * Defines a vector for the copy control settings sent from the DRM plugin
+ * to the player
+ */
+ KeyedVector<DrmCopyControl, int> copyControlVector;
public:
DecryptHandle():