Add a new API on DRM Framework for streaming

In case of DRM streaming, decrypt session can start just after
receiving the header, and it doesn't need to wait for the entire
content. However, current API of DRM framework only accepts file
handle or URI. With this new API, DRM session can start
without waiting for the entire content.

Changes are made by SEMC and Sony.

Change-Id: I74375fe127df636067f1c300ea91654ba3d1aa3c
This commit is contained in:
Kei Takahashi
2012-01-18 17:10:19 +09:00
committed by Jean-Baptiste Queru
parent cf0bf78c28
commit cba7b32d8f
13 changed files with 172 additions and 0 deletions

View File

@@ -652,6 +652,33 @@ DecryptHandle* BpDrmManagerService::openDecryptSession(
return handle;
}
DecryptHandle* BpDrmManagerService::openDecryptSession(
int uniqueId, const DrmBuffer& buf, const String8& mimeType) {
ALOGV("Entering BpDrmManagerService::openDecryptSession");
Parcel data, reply;
data.writeInterfaceToken(IDrmManagerService::getInterfaceDescriptor());
data.writeInt32(uniqueId);
if (buf.data != NULL && buf.length > 0) {
data.writeInt32(buf.length);
data.write(buf.data, buf.length);
} else {
data.writeInt32(0);
}
data.writeString8(mimeType);
remote()->transact(OPEN_DECRYPT_SESSION_FOR_STREAMING, data, &reply);
DecryptHandle* handle = NULL;
if (0 != reply.dataAvail()) {
handle = new DecryptHandle();
readDecryptHandleFromParcelData(handle, reply);
} else {
ALOGV("no decryptHandle is generated in service side");
}
return handle;
}
status_t BpDrmManagerService::closeDecryptSession(int uniqueId, DecryptHandle* decryptHandle) {
ALOGV("closeDecryptSession");
Parcel data, reply;
@@ -1312,6 +1339,30 @@ status_t BnDrmManagerService::onTransact(
return DRM_NO_ERROR;
}
case OPEN_DECRYPT_SESSION_FOR_STREAMING:
{
ALOGV("BnDrmManagerService::onTransact :OPEN_DECRYPT_SESSION_FOR_STREAMING");
CHECK_INTERFACE(IDrmManagerService, data, reply);
const int uniqueId = data.readInt32();
const int bufferSize = data.readInt32();
DrmBuffer buf((bufferSize > 0) ? (char *)data.readInplace(bufferSize) : NULL,
bufferSize);
const String8 mimeType(data.readString8());
DecryptHandle* handle = openDecryptSession(uniqueId, buf, mimeType);
if (handle != NULL) {
writeDecryptHandleToParcelData(handle, reply);
clearDecryptHandle(handle);
delete handle;
handle = NULL;
} else {
ALOGV("NULL decryptHandle is returned");
}
return DRM_NO_ERROR;
}
case CLOSE_DECRYPT_SESSION:
{
ALOGV("BnDrmManagerService::onTransact :CLOSE_DECRYPT_SESSION");