commit ff3f75c3e827c1c1f3e3a11b1de46b19444af197
author Marco Nelissen <marcone@google.com> Fri Aug 24 10:37:39 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Aug 24 10:37:39 2012 -0700
tree 5b660851627c1926b96278f9dac189b36b17e3cf
parent 6de95261c619d53f3e7b431fd17995e73928571e
parent dbcb4c17f16230dfc6af908f176681c49f61b13e

Merge "Allow directly setting a DataSource for NuMediaExtractor" into jb-mr1-dev

include/media/stagefright/NuMediaExtractor.h

diff --git a/include/media/stagefright/NuMediaExtractor.h b/include/media/stagefright/NuMediaExtractor.h
index c9c709c..0833110 100644
--- a/include/media/stagefright/NuMediaExtractor.h
+++ b/include/media/stagefright/NuMediaExtractor.h
@@ -50,6 +50,8 @@
 
     status_t setDataSource(int fd, off64_t offset, off64_t size);
 
+    status_t setDataSource(const sp<DataSource> &datasource);
+
     size_t countTracks() const;
     status_t getTrackFormat(size_t index, sp<AMessage> *format) const;
 

media/libstagefright/NuMediaExtractor.cpp

diff --git a/media/libstagefright/NuMediaExtractor.cpp b/media/libstagefright/NuMediaExtractor.cpp
index 64e5403..bf833dc 100644
--- a/media/libstagefright/NuMediaExtractor.cpp
+++ b/media/libstagefright/NuMediaExtractor.cpp
@@ -134,18 +134,28 @@
 
     sp<FileSource> fileSource = new FileSource(dup(fd), offset, size);
 
-    status_t err = fileSource->initCheck();
+    return setDataSource(fileSource);
+}
+
+status_t NuMediaExtractor::setDataSource(const sp<DataSource> &source) {
+    Mutex::Autolock autoLock(mLock);
+
+    if (mImpl != NULL) {
+        return -EINVAL;
+    }
+
+    status_t err = source->initCheck();
     if (err != OK) {
         return err;
     }
 
-    mImpl = MediaExtractor::Create(fileSource);
+    mImpl = MediaExtractor::Create(source);
 
     if (mImpl == NULL) {
         return ERROR_UNSUPPORTED;
     }
 
-    mDataSource = fileSource;
+    mDataSource = source;
 
     updateDurationAndBitrate();