commit a3e73df3b402f1ebdbef7c8a8e3111d852e7bd35
author James Dong <jdong@google.com> Thu May 26 12:00:51 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 26 12:00:51 2011 -0700
tree 21beb6a24cbe9dd6d914d183bcef57902f732e96
parent 2de4113c10975648ad9d1cffa45847870a0d01b3
parent 515e855eae78aa495da58356486aaa666cb57fd1

Merge "Extract embedded cover art (aka poster frame) in mp4 files"

media/libstagefright/NuHTTPDataSource.cpp

diff --git a/media/libstagefright/NuHTTPDataSource.cpp b/media/libstagefright/NuHTTPDataSource.cpp
index ce30fc8..821ba9b 100644
--- a/media/libstagefright/NuHTTPDataSource.cpp
+++ b/media/libstagefright/NuHTTPDataSource.cpp
@@ -392,13 +392,6 @@
 
     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;