commit 1e1bcaae46b7901f095bc244d554692146deccf2
author Dongwon Kang <dwkang@google.com> Wed Aug 01 12:44:46 2018 -0700
committer Dongwon Kang <dwkang@google.com> Fri Aug 03 19:18:15 2018 +0000
tree 899fb78a5c207c1d7bc5617ceee53a8d46150d0b
parent 978dcac6101c416158ca234e6ef01baa861bbcd0

MediaPlayer2: Remove libdrmframework.so dependency.

libdrmframework.so is being used in FileSource and MediaHTTP
for Forward Lock DRM use case.
This change removes this dependency from MediaPlayer2 by adding
ClearFileSource and ClearMediaHTTP.
Forward Lock DRM use case will be covered by MediaPlayer1.

Test: build & MediaPlayerTest & DrmTest
Bug: 111406958
Change-Id: I5cf51b2d6f477e8fa8950ac931c0142491baa747

media/libmediaplayer2/nuplayer2/GenericSource2.cpp

diff --git a/media/libmediaplayer2/nuplayer2/GenericSource2.cpp b/media/libmediaplayer2/nuplayer2/GenericSource2.cpp
index 196b103..a6d88a2 100644
--- a/media/libmediaplayer2/nuplayer2/GenericSource2.cpp
+++ b/media/libmediaplayer2/nuplayer2/GenericSource2.cpp
@@ -34,7 +34,7 @@
 #include <media/stagefright/foundation/ABuffer.h>
 #include <media/stagefright/foundation/ADebug.h>
 #include <media/stagefright/foundation/AMessage.h>
-#include <media/stagefright/DataSourceFactory.h>
+#include <media/stagefright/ClearDataSourceFactory.h>
 #include <media/stagefright/InterfaceUtils.h>
 #include <media/stagefright/MediaBuffer.h>
 #include <media/stagefright/MediaClock.h>
@@ -368,7 +368,7 @@
             String8 contentType;
 
             if (!strncasecmp("http://", uri, 7) || !strncasecmp("https://", uri, 8)) {
-                mHttpSource = DataSourceFactory::CreateMediaHTTP(mHTTPService);
+                mHttpSource = ClearDataSourceFactory::CreateMediaHTTP(mHTTPService);
                 if (mHttpSource == NULL) {
                     ALOGE("Failed to create http source!");
                     notifyPreparedAndCleanup(UNKNOWN_ERROR);
@@ -378,7 +378,7 @@
 
             mLock.unlock();
             // This might take long time if connection has some issue.
-            sp<DataSource> dataSource = DataSourceFactory::CreateFromURI(
+            sp<DataSource> dataSource = ClearDataSourceFactory::CreateFromURI(
                    mHTTPService, uri, &mUriHeaders, &contentType,
                    static_cast<HTTPBase *>(mHttpSource.get()));
             mLock.lock();