From 363794122a6482830ec5925d13b34c5d05c0726f Mon Sep 17 00:00:00 2001
From: Apurupa Pattapu <apurupa@codeaurora.org>
Date: Thu, 6 Aug 2015 13:06:07 -0700
Subject: libstagefright: Update extractor for specific formats

- New API updateExtractor is used to either keep default
  extractor or use extended extractor based on media track's
  mime types.

CRs-Fixed: 884793
Change-Id: I63dcc4b2d3901dbc3287eb43a1f4ce2767897258
---
 media/libavextensions/stagefright/AVExtensions.h | 5 ++++-
 media/libavextensions/stagefright/AVFactory.cpp  | 8 +++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'media/libavextensions')

diff --git a/media/libavextensions/stagefright/AVExtensions.h b/media/libavextensions/stagefright/AVExtensions.h
index 33f19d3..9cf1413 100644
--- a/media/libavextensions/stagefright/AVExtensions.h
+++ b/media/libavextensions/stagefright/AVExtensions.h
@@ -51,7 +51,10 @@ struct NuCachedSource2;
 struct AVFactory {
     virtual sp<ACodec> createACodec();
     virtual MediaExtractor* createExtendedExtractor(
-            const sp<DataSource> &source, const char *mime);
+            const sp<DataSource> &source, const char *mime, sp<AMessage> *meta);
+    virtual sp<MediaExtractor> updateExtractor(
+            sp<MediaExtractor> ext, const sp<DataSource> &source,
+            const char *mime, sp<AMessage> *meta);
     virtual sp<NuCachedSource2> createCachedSource(
             const sp<DataSource> &source,
             const char *cacheConfig = NULL,
diff --git a/media/libavextensions/stagefright/AVFactory.cpp b/media/libavextensions/stagefright/AVFactory.cpp
index 22969a2..671c858 100644
--- a/media/libavextensions/stagefright/AVFactory.cpp
+++ b/media/libavextensions/stagefright/AVFactory.cpp
@@ -53,10 +53,16 @@ sp<ACodec> AVFactory::createACodec() {
 }
 
 MediaExtractor* AVFactory::createExtendedExtractor(
-         const sp<DataSource> &, const char *) {
+         const sp<DataSource> &, const char *, sp<AMessage> *) {
     return NULL;
 }
 
+sp<MediaExtractor> AVFactory::updateExtractor(
+            sp<MediaExtractor> ext, const sp<DataSource> &,
+            const char *, sp<AMessage> *) {
+    return ext;
+}
+
 sp<NuCachedSource2> AVFactory::createCachedSource(
             const sp<DataSource> &source,
             const char *cacheConfig,
-- 
cgit v1.1