diff options
| author | Gloria Wang <gwang@google.com> | 2011-03-21 16:53:14 -0700 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2011-03-21 16:53:14 -0700 |
| commit | 4dabc20fa21f78a0bc2f91f772ad449ac8b17028 (patch) | |
| tree | ba929cc3609584be4ca38abdcd807d80d0b6212f /include/drm | |
| parent | 310962976d575c0a97ec7a768e9cca0b2361daea (diff) | |
| download | frameworks_av-4dabc20fa21f78a0bc2f91f772ad449ac8b17028.zip frameworks_av-4dabc20fa21f78a0bc2f91f772ad449ac8b17028.tar.gz frameworks_av-4dabc20fa21f78a0bc2f91f772ad449ac8b17028.tar.bz2 | |
do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624.
Change-Id: If724de60bd6da1becdffc815d5358ffe78629469
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drm_framework_common.h | 16 |
1 files changed, 16 insertions, 0 deletions
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<DrmCopyControl, int> copyControlVector; public: DecryptHandle(): |