commit dbfd055d51b51b7a6f412155c2391666efbb638a
author Gloria Wang <gwang@google.com> Fri May 20 10:57:51 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri May 20 10:57:51 2011 -0700
tree e0cb04fbfa58ab3e3cfd72db6042d23043f79721
parent d9435bcecc820c8715d8b6b920fd43042418a1e9
parent a6f1104b9d829c636b60b9387e379f9667b5df09

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.

media/libstagefright/NuHTTPDataSource.cpp

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 @@
 
     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;