diff options
| author | Gloria Wang <gwang@google.com> | 2011-05-20 10:57:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-20 10:57:51 -0700 |
| commit | ff2e0968976f26612b34f7a88e6e1e4ed1cd277b (patch) | |
| tree | 8b9754b931fe2c8119e228424362d3e1b0a1836f /media | |
| parent | 5348dc86f3ac3cebebcda271cf990dbcc87f5a7f (diff) | |
| parent | fa6efe7757a41f7125fc49312230283b63618111 (diff) | |
| download | frameworks_av-ff2e0968976f26612b34f7a88e6e1e4ed1cd277b.zip frameworks_av-ff2e0968976f26612b34f7a88e6e1e4ed1cd277b.tar.gz frameworks_av-ff2e0968976f26612b34f7a88e6e1e4ed1cd277b.tar.bz2 | |
am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
* commit 'a6f1104b9d829c636b60b9387e379f9667b5df09':
Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/NuHTTPDataSource.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/media/libstagefright/NuHTTPDataSource.cpp b/media/libstagefright/NuHTTPDataSource.cpp index 62fb732..dd29c84 100644 --- a/media/libstagefright/NuHTTPDataSource.cpp +++ b/media/libstagefright/NuHTTPDataSource.cpp @@ -383,6 +383,13 @@ ssize_t NuHTTPDataSource::readAt(off64_t offset, void *data, size_t size) { Mutex::Autolock autoLock(mLock); + // if it's a DRM container based streaming, call pread() of the DRM plugin + // to get the decrypted data + if (mDecryptHandle != NULL && DecryptApiType::CONTAINER_BASED + == mDecryptHandle->decryptApiType) { + return mDrmManagerClient->pread(mDecryptHandle, data, size, offset); + } + if (offset != mOffset) { String8 host = mHost; String8 path = mPath; |