Support the specification of additional HTTP headers in the creation of a DataSource.

related-to-bug: 2393577

1 files changed, 12 insertions, 2 deletions

diff --git a/media/libstagefright/omx/tests/OMXHarness.cpp b/media/libstagefright/omx/tests/OMXHarness.cpp
index 5b45c1c..6c36163 100644
--- a/media/libstagefright/omx/tests/OMXHarness.cpp
+++ b/media/libstagefright/omx/tests/OMXHarness.cpp
@@ -245,10 +245,20 @@ private:
     NodeReaper &operator=(const NodeReaper &);
 };
 
+static sp<MediaExtractor> CreateExtractorFromURI(const char *uri) {
+    sp<DataSource> source = DataSource::CreateFromURI(uri);
+
+    if (source == NULL) {
+        return NULL;
+    }
+
+    return MediaExtractor::Create(source);
+}
+
 static sp<MediaSource> MakeSource(
         const char *uri,
         const char *mimeType) {
-    sp<MediaExtractor> extractor = MediaExtractor::CreateFromURI(uri);
+    sp<MediaExtractor> extractor = CreateExtractorFromURI(uri);
 
     if (extractor == NULL) {
         return NULL;
@@ -500,7 +510,7 @@ static sp<MediaSource> CreateSourceForMime(const char *mime) {
     const char *url = GetURLForMime(mime);
     CHECK(url != NULL);
 
-    sp<MediaExtractor> extractor = MediaExtractor::CreateFromURI(url);
+    sp<MediaExtractor> extractor = CreateExtractorFromURI(url);
 
     CHECK(extractor != NULL);