From 918c7652b9a38c02e26c0c46541cea82070c0e43 Mon Sep 17 00:00:00 2001
From: Andreas Huber <andih@google.com>
Date: Fri, 13 Apr 2012 11:16:48 -0700
Subject: Change NuMediaExtractor's API to support different kinds of data
 sources.

Change-Id: I080aa2ce28300a72a85751509334dbdc491936c6
related-to-bug: 6276111
---
 media/libstagefright/DataSource.cpp | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'media/libstagefright/DataSource.cpp')

diff --git a/media/libstagefright/DataSource.cpp b/media/libstagefright/DataSource.cpp
index d0a7880..aba95bc 100644
--- a/media/libstagefright/DataSource.cpp
+++ b/media/libstagefright/DataSource.cpp
@@ -142,7 +142,19 @@ sp<DataSource> DataSource::CreateFromURI(
         if (httpSource->connect(uri, headers) != OK) {
             return NULL;
         }
-        source = new NuCachedSource2(httpSource);
+
+        String8 cacheConfig;
+        bool disconnectAtHighwatermark;
+        if (headers != NULL) {
+            KeyedVector<String8, String8> copy = *headers;
+            NuCachedSource2::RemoveCacheSpecificHeaders(
+                    &copy, &cacheConfig, &disconnectAtHighwatermark);
+        }
+
+        source = new NuCachedSource2(
+                httpSource,
+                cacheConfig.isEmpty() ? NULL : cacheConfig.string());
+
 # if CHROMIUM_AVAILABLE
     } else if (!strncasecmp("data:", uri, 5)) {
         source = new DataUriSource(uri);
-- 
cgit v1.1