From 4dabc20fa21f78a0bc2f91f772ad449ac8b17028 Mon Sep 17 00:00:00 2001 From: Gloria Wang Date: Mon, 21 Mar 2011 16:53:14 -0700 Subject: do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624. Change-Id: If724de60bd6da1becdffc815d5358ffe78629469 --- include/drm/drm_framework_common.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'include/drm') diff --git a/include/drm/drm_framework_common.h b/include/drm/drm_framework_common.h index 1758cdd..e8ec953 100644 --- a/include/drm/drm_framework_common.h +++ b/include/drm/drm_framework_common.h @@ -43,6 +43,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 { @@ -279,6 +290,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 copyControlVector; public: DecryptHandle(): -- cgit v1.1