summaryrefslogtreecommitdiffstats
path: root/drm/libdrmframework/plugins/common/include/IDrmEngine.h
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2012-01-12 16:56:58 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-01-12 16:56:58 -0800
commitb5c6ff59930a4f7b7efbcfac143fd4aed4315cb9 (patch)
tree46e68851f9af64e7c6c1ad32f443dcdfc022ec43 /drm/libdrmframework/plugins/common/include/IDrmEngine.h
parentdc89357810976556d20483c7fe161b68ed4d2acf (diff)
parentd1ba6ed94543b6d2af666e01f4ffd29412511400 (diff)
downloadframeworks_base-b5c6ff59930a4f7b7efbcfac143fd4aed4315cb9.zip
frameworks_base-b5c6ff59930a4f7b7efbcfac143fd4aed4315cb9.tar.gz
frameworks_base-b5c6ff59930a4f7b7efbcfac143fd4aed4315cb9.tar.bz2
Merge "Separate sniffing from session initialization"
Diffstat (limited to 'drm/libdrmframework/plugins/common/include/IDrmEngine.h')
-rw-r--r--drm/libdrmframework/plugins/common/include/IDrmEngine.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/drm/libdrmframework/plugins/common/include/IDrmEngine.h b/drm/libdrmframework/plugins/common/include/IDrmEngine.h
index 77460f6..dcf5977 100644
--- a/drm/libdrmframework/plugins/common/include/IDrmEngine.h
+++ b/drm/libdrmframework/plugins/common/include/IDrmEngine.h
@@ -320,11 +320,14 @@ public:
* @param[in] fd File descriptor of the protected content to be decrypted
* @param[in] offset Start position of the content
* @param[in] length The length of the protected content
+ * @param[in] mime Mime type of the protected content if it is
+ * not NULL or empty
* @return
* DRM_ERROR_CANNOT_HANDLE for failure and DRM_NO_ERROR for success
*/
virtual status_t openDecryptSession(
- int uniqueId, DecryptHandle* decryptHandle, int fd, off64_t offset, off64_t length) = 0;
+ int uniqueId, DecryptHandle* decryptHandle,
+ int fd, off64_t offset, off64_t length, const char* mime) = 0;
/**
* Open the decrypt session to decrypt the given protected content
@@ -332,11 +335,14 @@ public:
* @param[in] uniqueId Unique identifier for a session
* @param[in] decryptHandle Handle for the current decryption session
* @param[in] uri Path of the protected content to be decrypted
+ * @param[in] mime Mime type of the protected content if it is
+ * not NULL or empty
* @return
* DRM_ERROR_CANNOT_HANDLE for failure and DRM_NO_ERROR for success
*/
virtual status_t openDecryptSession(
- int uniqueId, DecryptHandle* decryptHandle, const char* uri) = 0;
+ int uniqueId, DecryptHandle* decryptHandle,
+ const char* uri, const char* mime) = 0;
/**
* Close the decrypt session for the given handle