summaryrefslogtreecommitdiff
path: root/drm/common/DrmEngineBase.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/common/DrmEngineBase.cpp
parent18439bee6f8b525abe3f1fac69bc4cea184e1565 (diff)
parent5fc3edb13edb058f14e6550d295ce3e50e5ebf8c (diff)
Merge "64-bit file size/offset support for DRM framework"
Diffstat (limited to 'drm/common/DrmEngineBase.cpp')
-rw-r--r--drm/common/DrmEngineBase.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/drm/common/DrmEngineBase.cpp b/drm/common/DrmEngineBase.cpp
index 10c64ee45441..98a9ecee3b54 100644
--- a/drm/common/DrmEngineBase.cpp
+++ b/drm/common/DrmEngineBase.cpp
@@ -80,7 +80,7 @@ status_t DrmEngineBase::consumeRights(
}
status_t DrmEngineBase::setPlaybackStatus(
- int uniqueId, DecryptHandle* decryptHandle, int playbackStatus, int position) {
+ int uniqueId, DecryptHandle* decryptHandle, int playbackStatus, int64_t position) {
return onSetPlaybackStatus(uniqueId, decryptHandle, playbackStatus, position);
}
@@ -116,7 +116,7 @@ DrmSupportInfo* DrmEngineBase::getSupportInfo(int uniqueId) {
}
status_t DrmEngineBase::openDecryptSession(
- int uniqueId, DecryptHandle* decryptHandle, int fd, int offset, int length) {
+ int uniqueId, DecryptHandle* decryptHandle, int fd, off64_t offset, off64_t length) {
return onOpenDecryptSession(uniqueId, decryptHandle, fd, offset, length);
}
@@ -146,7 +146,7 @@ status_t DrmEngineBase::finalizeDecryptUnit(
}
ssize_t DrmEngineBase::pread(
- int uniqueId, DecryptHandle* decryptHandle, void* buffer, ssize_t numBytes, off_t offset) {
+ int uniqueId, DecryptHandle* decryptHandle, void* buffer, ssize_t numBytes, off64_t offset) {
return onPread(uniqueId, decryptHandle, buffer, numBytes, offset);
}