summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/DataSource.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2014-02-10 14:40:45 -0800
committerAndreas Huber <andih@google.com>2014-02-11 11:50:54 -0800
commit4bbfff2dbf3968c267c3b2ea9f8912a38372a9da (patch)
tree5e9dc59c018069605c0a1591971dbb762419ae17 /media/libstagefright/DataSource.cpp
parent1d6fa7af1288b550faabe4ec2cf98684236723db (diff)
downloadframeworks_av-4bbfff2dbf3968c267c3b2ea9f8912a38372a9da.zip
frameworks_av-4bbfff2dbf3968c267c3b2ea9f8912a38372a9da.tar.gz
frameworks_av-4bbfff2dbf3968c267c3b2ea9f8912a38372a9da.tar.bz2
Support "data:" URIs again in mediaplayer...
Change-Id: I6dac35c7e606f738a60f985f6dca977dc92c82a4 related-to-bug: 12957757
Diffstat (limited to 'media/libstagefright/DataSource.cpp')
-rw-r--r--media/libstagefright/DataSource.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/DataSource.cpp b/media/libstagefright/DataSource.cpp
index 2704b74..6e0f37a 100644
--- a/media/libstagefright/DataSource.cpp
+++ b/media/libstagefright/DataSource.cpp
@@ -35,6 +35,7 @@
#include <media/IMediaHTTPService.h>
#include <media/stagefright/foundation/AMessage.h>
#include <media/stagefright/DataSource.h>
+#include <media/stagefright/DataURISource.h>
#include <media/stagefright/FileSource.h>
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/MediaHTTP.h>
@@ -221,6 +222,8 @@ sp<DataSource> DataSource::CreateFromURI(
// in the widevine:// case.
source = httpSource;
}
+ } else if (!strncasecmp("data:", uri, 5)) {
+ source = DataURISource::Create(uri);
} else {
// Assume it's a filename.
source = new FileSource(uri);