diff options
| author | Gloria Wang <gwang@google.com> | 2011-05-20 11:02:31 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-20 11:02:31 -0700 |
| commit | 4d8ceada09441f43a98f5c7dadde9192e7d6abf9 (patch) | |
| tree | ca436d9833cb77b160af28ecfc455533fc758b66 /media | |
| parent | 3bec9cc27a4b87be644533d5fe44358dde399d49 (diff) | |
| parent | dbfd055d51b51b7a6f412155c2391666efbb638a (diff) | |
| download | frameworks_base-4d8ceada09441f43a98f5c7dadde9192e7d6abf9.zip frameworks_base-4d8ceada09441f43a98f5c7dadde9192e7d6abf9.tar.gz frameworks_base-4d8ceada09441f43a98f5c7dadde9192e7d6abf9.tar.bz2 | |
am dbfd055d: am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
* commit 'dbfd055d51b51b7a6f412155c2391666efbb638a':
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; |