diff options
| author | James Dong <jdong@google.com> | 2011-05-25 14:54:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-25 14:54:19 -0700 |
| commit | a2b2c9f9661a54e431430b029ce76332c6914f0b (patch) | |
| tree | 03316709fbe93720a1c21c298ecaa5d2a81bc2d9 /media | |
| parent | b1d713703b00dc972ceb2a655d5bac72381f303d (diff) | |
| parent | f29f13077582425c242a36565bd71130fedf3cd0 (diff) | |
| download | frameworks_av-a2b2c9f9661a54e431430b029ce76332c6914f0b.zip frameworks_av-a2b2c9f9661a54e431430b029ce76332c6914f0b.tar.gz frameworks_av-a2b2c9f9661a54e431430b029ce76332c6914f0b.tar.bz2 | |
am c1ded373: Merge "Revert "Use pread() to get the decrypted data for container based DRM file."" into honeycomb-mr2
* commit 'c1ded373951f8bd489401e93f2dd512ff9705a49':
Revert "Use pread() to get the decrypted data for container based DRM file."
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/NuHTTPDataSource.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/media/libstagefright/NuHTTPDataSource.cpp b/media/libstagefright/NuHTTPDataSource.cpp index dd29c84..62fb732 100644 --- a/media/libstagefright/NuHTTPDataSource.cpp +++ b/media/libstagefright/NuHTTPDataSource.cpp @@ -383,13 +383,6 @@ 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; |