summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2012-08-24 10:37:39 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-24 10:37:39 -0700
commitff3f75c3e827c1c1f3e3a11b1de46b19444af197 (patch)
tree5b660851627c1926b96278f9dac189b36b17e3cf /include
parent6de95261c619d53f3e7b431fd17995e73928571e (diff)
parentdbcb4c17f16230dfc6af908f176681c49f61b13e (diff)
Merge "Allow directly setting a DataSource for NuMediaExtractor" into jb-mr1-dev
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/NuMediaExtractor.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/media/stagefright/NuMediaExtractor.h b/include/media/stagefright/NuMediaExtractor.h
index c9c709cc..0833110b 100644
--- a/include/media/stagefright/NuMediaExtractor.h
+++ b/include/media/stagefright/NuMediaExtractor.h
@@ -50,6 +50,8 @@ struct NuMediaExtractor : public RefBase {
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;