stagefright-plugins: Improvements and updates for CM14

[android-x86/external-stagefright-plugins.git] / extractor / FFmpegExtractor.h

diff --git a/extractor/FFmpegExtractor.h b/extractor/FFmpegExtractor.h
index aaec67d..4bfa893 100644 (file)
--- a/extractor/FFmpegExtractor.h
+++ b/extractor/FFmpegExtractor.h
@@ -30,14 +30,14 @@ namespace android {
 
 struct ABuffer;
 struct AMessage;
-struct String8;
+class String8;
 struct FFmpegSource;
 
 struct FFmpegExtractor : public MediaExtractor {
     FFmpegExtractor(const sp<DataSource> &source, const sp<AMessage> &meta);
 
     virtual size_t countTracks();
-    virtual sp<MediaSource> getTrack(size_t index);
+    virtual sp<IMediaSource> getTrack(size_t index);
     virtual sp<MetaData> getTrackMetaData(size_t index, uint32_t flags);
 
     virtual sp<MetaData> getMetaData();
@@ -130,13 +130,24 @@ private:
     static void *ReaderWrapper(void *me);
     void readerEntry();
 
+    bool mParsedMetadata;
+
     DISALLOW_EVIL_CONSTRUCTORS(FFmpegExtractor);
 };
 
+extern "C" {
+
+static const char *findMatchingContainer(const char *name);
+
 bool SniffFFMPEG(
         const sp<DataSource> &source, String8 *mimeType, float *confidence,
         sp<AMessage> *);
 
+MediaExtractor* CreateFFMPEGExtractor(const sp<DataSource> &source,
+        const char *mime, const sp<AMessage> &meta);
+
+}
+
 }  // namespace android
 
 #endif  // SUPER_EXTRACTOR_H_