summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/DataSource.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2011-03-08 15:59:28 -0800
committerAndreas Huber <andih@google.com>2011-03-09 10:14:46 -0800
commit1156dc913a5ba7b2bc86489468d4914430f03d14 (patch)
tree351803a481df1784b789fdcdfa13cbc9b30a0a12 /media/libstagefright/DataSource.cpp
parent271151e65fdc289514317b6e4e1b8805e6c647e1 (diff)
downloadframeworks_av-1156dc913a5ba7b2bc86489468d4914430f03d14.zip
frameworks_av-1156dc913a5ba7b2bc86489468d4914430f03d14.tar.gz
frameworks_av-1156dc913a5ba7b2bc86489468d4914430f03d14.tar.bz2
An HTTP datasource for stagefright using the chromium code.
Use of this new datasource is now the default unless overwritten by adb shell setprop media.stagefright.use-chromium false Change-Id: I156a8eb9a1fff1cb537b4aec6cf3e8e6052be81e
Diffstat (limited to 'media/libstagefright/DataSource.cpp')
-rw-r--r--media/libstagefright/DataSource.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/DataSource.cpp b/media/libstagefright/DataSource.cpp
index 3b38208..b5c51f4 100644
--- a/media/libstagefright/DataSource.cpp
+++ b/media/libstagefright/DataSource.cpp
@@ -21,7 +21,7 @@
#include "include/OggExtractor.h"
#include "include/MPEG2TSExtractor.h"
#include "include/NuCachedSource2.h"
-#include "include/NuHTTPDataSource.h"
+#include "include/HTTPBase.h"
#include "include/DRMExtractor.h"
#include "include/FLACExtractor.h"
#include "include/AACExtractor.h"
@@ -127,7 +127,7 @@ sp<DataSource> DataSource::CreateFromURI(
source = new FileSource(uri + 7);
} else if (!strncasecmp("http://", uri, 7)
|| !strncasecmp("https://", uri, 8)) {
- sp<NuHTTPDataSource> httpSource = new NuHTTPDataSource;
+ sp<HTTPBase> httpSource = HTTPBase::Create();
if (httpSource->connect(uri, headers) != OK) {
return NULL;
}