libstagefright: Add support for fragmented MPEG4 container

- Stagefright parser dosent support parsing fragmented 3G2 clips
- add support to used mm-parser to parser fragmented 3G2 clips

(cherry picked from commit f1eb550a11bdc2a4534a89764f8c42008add90ae)

Change-Id: I9afcbd144dbbd50218b5ad8733b07d6c73f5f4d7

2 files changed, 13 insertions, 0 deletions

diff --git a/include/media/stagefright/DataSource.h b/include/media/stagefright/DataSource.h
index 713af92..effa686 100644
--- a/include/media/stagefright/DataSource.h
+++ b/include/media/stagefright/DataSource.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2009 The Android Open Source Project
+ * Copyright (C) 2010-2012 Code Aurora Forum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -77,7 +78,12 @@ public:
             const sp<DataSource> &source, String8 *mimeType,
             float *confidence, sp<AMessage> *meta);
 
+#ifdef QCOM_HARDWARE
+    //isExtendedExtractor if true, will store the location of the sniffer to register
+    static void RegisterSniffer(SnifferFunc func, bool isExtendedExtractor = false);
+#else
     static void RegisterSniffer(SnifferFunc func);
+#endif
     static void RegisterDefaultSniffers();
 
     // for DRM
@@ -92,6 +98,7 @@ public:
 
     virtual String8 getMIMEType() const;
 
+
 protected:
     virtual ~DataSource() {}
 
@@ -99,6 +106,10 @@ private:
     static Mutex gSnifferMutex;
     static List<SnifferFunc> gSniffers;
 
+#ifdef QCOM_HARDWARE
+    static List<SnifferFunc>::iterator extendedSnifferPosition;
+#endif
+
     DataSource(const DataSource &);
     DataSource &operator=(const DataSource &);
 };
diff --git a/include/media/stagefright/MediaDefs.h b/include/media/stagefright/MediaDefs.h
index 3ab664a..9559083 100755
--- a/include/media/stagefright/MediaDefs.h
+++ b/include/media/stagefright/MediaDefs.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2009 The Android Open Source Project
+ * Copyright (C) 2010-2012 Code Aurora Forum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -68,6 +69,7 @@ extern const char *MEDIA_MIMETYPE_CONTAINER_QCP;
 extern const char *MEDIA_MIMETYPE_VIDEO_DIVX311;
 extern const char *MEDIA_MIMETYPE_VIDEO_DIVX4;
 extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG2;
+extern const char *MEDIA_MIMETYPE_CONTAINER_3G2;
 #endif
 }  // namespace android