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/libstagefright/MediaExtractor.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'media/libstagefright/MediaExtractor.cpp')

diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp
index 8d89071..c0fbb6d 100644
--- a/media/libstagefright/MediaExtractor.cpp
+++ b/media/libstagefright/MediaExtractor.cpp
@@ -93,8 +93,8 @@ sp<MediaExtractor> MediaExtractor::Create(
         }
     }
 
-    MediaExtractor *ret = NULL;
-    if ((ret = AVFactory::get()->createExtendedExtractor(source, mime)) != NULL) {
+    sp<MediaExtractor> ret = NULL;
+    if ((ret = AVFactory::get()->createExtendedExtractor(source, mime, &meta)) != NULL) {
     } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_MPEG4)
             || !strcasecmp(mime, "audio/mp4")) {
         ret = new MPEG4Extractor(source);
@@ -124,6 +124,7 @@ sp<MediaExtractor> MediaExtractor::Create(
         ret = new MidiExtractor(source);
     }
 
+    ret = AVFactory::get()->updateExtractor(ret, source, mime, &meta);
     if (ret != NULL) {
        if (isDrm) {
            ret->setDrmFlag(true);
-- 
cgit v1.1