commit b486b52b2b67961073677d583a02269cbdc9a3fc
author Dongwon Kang <dwkang@google.com> Fri Feb 16 15:46:53 2018 -0800
committer Dongwon Kang <dwkang@google.com> Tue Feb 27 15:18:32 2018 -0800
tree 6b56a1661c8e6684113a12a770b1d8e282294df8
parent c9e3a6945d67b8ecb7835686a04c2ac6d75f3d5a

Remove system library classes from DataSourceBase

Test: build.
Bug: 67908556
Change-Id: Ib56b3cd92ecc781fc2c4ff3696e71051ce8e212d

media/libmediaextractor/DataSourceBase.cpp

diff --git a/media/libmediaextractor/DataSourceBase.cpp b/media/libmediaextractor/DataSourceBase.cpp
index d3af4eb..8f47ee5 100644
--- a/media/libmediaextractor/DataSourceBase.cpp
+++ b/media/libmediaextractor/DataSourceBase.cpp
@@ -123,8 +123,8 @@
     return ERROR_UNSUPPORTED;
 }
 
-String8 DataSourceBase::getMIMEType() const {
-    return String8("application/octet-stream");
+bool DataSourceBase::getUri(char *uriString __unused, size_t bufferSize __unused) {
+    return false;
 }
 
 }  // namespace android

media/libmediaextractor/include/media/DataSource.h

diff --git a/media/libmediaextractor/include/media/DataSource.h b/media/libmediaextractor/include/media/DataSource.h
index 1ae2e21..0e59f39 100644
--- a/media/libmediaextractor/include/media/DataSource.h
+++ b/media/libmediaextractor/include/media/DataSource.h
@@ -41,6 +41,34 @@
         return nullptr;
     }
 
+    virtual String8 toString() {
+        return String8("<unspecified>");
+    }
+
+    virtual status_t reconnectAtOffset(off64_t /*offset*/) {
+        return ERROR_UNSUPPORTED;
+    }
+
+    ////////////////////////////////////////////////////////////////////////////
+
+    // for DRM
+    virtual sp<DecryptHandle> DrmInitialization(const char * /*mime*/ = NULL) {
+        return NULL;
+    }
+
+    virtual String8 getUri() {
+        return String8();
+    }
+
+    virtual bool getUri(char *uriString, size_t bufferSize) final {
+        int ret = snprintf(uriString, bufferSize, "%s", getUri().c_str());
+        return ret >= 0 && static_cast<size_t>(ret) < bufferSize;
+    }
+
+    virtual String8 getMIMEType() const {
+        return String8("application/octet-stream");
+    }
+
 protected:
     virtual ~DataSource() {}
 

media/libmediaextractor/include/media/DataSourceBase.h

diff --git a/media/libmediaextractor/include/media/DataSourceBase.h b/media/libmediaextractor/include/media/DataSourceBase.h
index 8028dd7..51993da 100644
--- a/media/libmediaextractor/include/media/DataSourceBase.h
+++ b/media/libmediaextractor/include/media/DataSourceBase.h
@@ -19,10 +19,7 @@
 #define DATA_SOURCE_BASE_H_
 
 #include <sys/types.h>
-#include <media/stagefright/MediaErrors.h>
 #include <utils/Errors.h>
-#include <utils/threads.h>
-#include <drm/DrmManagerClient.h>
 
 namespace android {
 
@@ -61,31 +58,12 @@
     // May return ERROR_UNSUPPORTED.
     virtual status_t getSize(off64_t *size);
 
+    virtual bool getUri(char *uriString, size_t bufferSize);
+
     virtual uint32_t flags() {
         return 0;
     }
 
-    virtual String8 toString() {
-        return String8("<unspecified>");
-    }
-
-    virtual status_t reconnectAtOffset(off64_t /*offset*/) {
-        return ERROR_UNSUPPORTED;
-    }
-
-    ////////////////////////////////////////////////////////////////////////////
-
-    // for DRM
-    virtual sp<DecryptHandle> DrmInitialization(const char * /*mime*/ = NULL) {
-        return NULL;
-    }
-
-    virtual String8 getUri() {
-        return String8();
-    }
-
-    virtual String8 getMIMEType() const;
-
     virtual void close() {};
 
 protected: