summaryrefslogtreecommitdiffstats
path: root/drm/libdrmframework/plugins/passthru/include
diff options
context:
space:
mode:
authorGloria Wang <gwang@google.com>2010-11-22 10:48:30 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-11-22 10:48:30 -0800
commita7e43c6266fa02a30647d74aa9d348f5cb85b8fb (patch)
treec13e7a94e0ec0771e72f5c83e8ff81cbc433a644 /drm/libdrmframework/plugins/passthru/include
parentf53263a7d580fb550dbc6c8d4f104119beb82ad7 (diff)
parenta2cd44cb5067b4fe98794860690394254d3ac73c (diff)
downloadframeworks_av-a7e43c6266fa02a30647d74aa9d348f5cb85b8fb.zip
frameworks_av-a7e43c6266fa02a30647d74aa9d348f5cb85b8fb.tar.gz
frameworks_av-a7e43c6266fa02a30647d74aa9d348f5cb85b8fb.tar.bz2
Merge "64-bit file size/offset support for DRM framework"
Diffstat (limited to 'drm/libdrmframework/plugins/passthru/include')
-rw-r--r--drm/libdrmframework/plugins/passthru/include/DrmPassthruPlugIn.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/drm/libdrmframework/plugins/passthru/include/DrmPassthruPlugIn.h b/drm/libdrmframework/plugins/passthru/include/DrmPassthruPlugIn.h
index ddb7fd3..9c94e73 100644
--- a/drm/libdrmframework/plugins/passthru/include/DrmPassthruPlugIn.h
+++ b/drm/libdrmframework/plugins/passthru/include/DrmPassthruPlugIn.h
@@ -54,7 +54,7 @@ protected:
status_t onConsumeRights(int uniqueId, DecryptHandle* decryptHandle, int action, bool reserve);
status_t onSetPlaybackStatus(
- int uniqueId, DecryptHandle* decryptHandle, int playbackStatus, int position);
+ int uniqueId, DecryptHandle* decryptHandle, int playbackStatus, int64_t position);
bool onValidateAction(
int uniqueId, const String8& path, int action, const ActionDescription& description);
@@ -72,7 +72,7 @@ protected:
DrmSupportInfo* onGetSupportInfo(int uniqueId);
status_t onOpenDecryptSession(
- int uniqueId, DecryptHandle* decryptHandle, int fd, int offset, int length);
+ int uniqueId, DecryptHandle* decryptHandle, int fd, off64_t offset, off64_t length);
status_t onOpenDecryptSession(
int uniqueId, DecryptHandle* decryptHandle, const char* uri);
@@ -88,7 +88,7 @@ protected:
status_t onFinalizeDecryptUnit(int uniqueId, DecryptHandle* decryptHandle, int decryptUnitId);
ssize_t onPread(int uniqueId, DecryptHandle* decryptHandle,
- void* buffer, ssize_t numBytes, off_t offset);
+ void* buffer, ssize_t numBytes, off64_t offset);
private:
DecryptHandle* openDecryptSessionImpl();