New API to instantiate a MediaExtractor given a URI and optional MIME type.

Also DataSources now must provide a method initCheck()
and DataSource::reat_at has been renamed to readAt to conform to
standard API naming guidelines.

1 files changed, 1 insertions, 20 deletions

diff --git a/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp b/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp
index fc4f2c5..7a3aee8 100644
--- a/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp
+++ b/media/libmediaplayerservice/StagefrightMetadataRetriever.cpp
@@ -48,26 +48,7 @@ StagefrightMetadataRetriever::~StagefrightMetadataRetriever() {
 status_t StagefrightMetadataRetriever::setDataSource(const char *uri) {
     LOGV("setDataSource(%s)", uri);
 
-    sp<DataSource> source;
-    if (!strncasecmp("file://", uri, 7)) {
-        sp<MmapSource> mmapSource = new MmapSource(uri + 7);
-        if (mmapSource->InitCheck() != OK) {
-            return ERROR_IO;
-        }
-        source = mmapSource;
-    } else if (!strncasecmp("http://", uri, 7)) {
-        source = new HTTPDataSource(uri);
-        source = new CachingDataSource(source, 64 * 1024, 10);
-    } else {
-        // Assume it's a filename.
-        sp<MmapSource> mmapSource = new MmapSource(uri);
-        if (mmapSource->InitCheck() != OK) {
-            return ERROR_IO;
-        }
-        source = mmapSource;
-    }
-
-    mExtractor = MediaExtractor::Create(source);
+    mExtractor = MediaExtractor::CreateFromURI(uri);
 
     return mExtractor.get() != NULL ? OK : UNKNOWN_ERROR;
 }