summaryrefslogtreecommitdiff
path: root/drm/drmserver/DrmManager.cpp
diff options
context:
space:
mode:
author Gloria Wang <gwang@google.com> 2010-11-22 10:48:30 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2010-11-22 10:48:30 -0800
commit83d97c8c7ddff9374f876bef48758414a7775cb1 (patch)
tree8c34611cbbd6c2e84c886ed86d8bed154f39fc33 /drm/drmserver/DrmManager.cpp
parent18439bee6f8b525abe3f1fac69bc4cea184e1565 (diff)
parent5fc3edb13edb058f14e6550d295ce3e50e5ebf8c (diff)
Merge "64-bit file size/offset support for DRM framework"
Diffstat (limited to 'drm/drmserver/DrmManager.cpp')
-rw-r--r--drm/drmserver/DrmManager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/drm/drmserver/DrmManager.cpp b/drm/drmserver/DrmManager.cpp
index 35e62f3bc4ee..8da817669a79 100644
--- a/drm/drmserver/DrmManager.cpp
+++ b/drm/drmserver/DrmManager.cpp
@@ -258,7 +258,7 @@ status_t DrmManager::consumeRights(
}
status_t DrmManager::setPlaybackStatus(
- int uniqueId, DecryptHandle* decryptHandle, int playbackStatus, int position) {
+ int uniqueId, DecryptHandle* decryptHandle, int playbackStatus, int64_t position) {
status_t result = DRM_ERROR_UNKNOWN;
if (mDecryptSessionMap.indexOfKey(decryptHandle->decryptId) != NAME_NOT_FOUND) {
IDrmEngine* drmEngine = mDecryptSessionMap.valueFor(decryptHandle->decryptId);
@@ -370,7 +370,7 @@ status_t DrmManager::getAllSupportInfo(
return DRM_NO_ERROR;
}
-DecryptHandle* DrmManager::openDecryptSession(int uniqueId, int fd, int offset, int length) {
+DecryptHandle* DrmManager::openDecryptSession(int uniqueId, int fd, off64_t offset, off64_t length) {
Mutex::Autolock _l(mDecryptLock);
status_t result = DRM_ERROR_CANNOT_HANDLE;
Vector<String8> plugInIdList = mPlugInManager.getPlugInIdList();
@@ -470,7 +470,7 @@ status_t DrmManager::finalizeDecryptUnit(
}
ssize_t DrmManager::pread(int uniqueId, DecryptHandle* decryptHandle,
- void* buffer, ssize_t numBytes, off_t offset) {
+ void* buffer, ssize_t numBytes, off64_t offset) {
ssize_t result = DECRYPT_FILE_ERROR;
if (mDecryptSessionMap.indexOfKey(decryptHandle->decryptId) != NAME_NOT_FOUND) {