summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-04-16 11:11:02 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-16 11:11:02 -0700
commita98db787397633155fd71b06ecaa765a7ad20cf2 (patch)
tree312df209f64c9ed371bb7855ca6243352207fd62 /include
parentb388e531613730572067e193b6b66afb5d042233 (diff)
parent918c7652b9a38c02e26c0c46541cea82070c0e43 (diff)
downloadframeworks_av-a98db787397633155fd71b06ecaa765a7ad20cf2.zip
frameworks_av-a98db787397633155fd71b06ecaa765a7ad20cf2.tar.gz
frameworks_av-a98db787397633155fd71b06ecaa765a7ad20cf2.tar.bz2
Merge "Change NuMediaExtractor's API to support different kinds of data sources."
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/NuMediaExtractor.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/include/media/stagefright/NuMediaExtractor.h b/include/media/stagefright/NuMediaExtractor.h
index 07c7be5..a09f971 100644
--- a/include/media/stagefright/NuMediaExtractor.h
+++ b/include/media/stagefright/NuMediaExtractor.h
@@ -19,7 +19,9 @@
#include <media/stagefright/foundation/ABase.h>
#include <utils/Errors.h>
+#include <utils/KeyedVector.h>
#include <utils/RefBase.h>
+#include <utils/String8.h>
#include <utils/Vector.h>
namespace android {
@@ -38,7 +40,11 @@ struct NuMediaExtractor : public RefBase {
NuMediaExtractor();
- status_t setDataSource(const char *path);
+ status_t setDataSource(
+ const char *path,
+ const KeyedVector<String8, String8> *headers = NULL);
+
+ status_t setDataSource(int fd, off64_t offset, off64_t size);
size_t countTracks() const;
status_t getTrackFormat(size_t index, sp<AMessage> *format) const;