commit 8d015fc6ea232411be455143b20fc77ca7929bb0
author Gopalakrishnan Nallasamy <gokrishnan@google.com> Sat Sep 04 13:48:27 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Sep 04 13:48:27 2021 +0000
tree 927ce26af91de059517ec284ea3cdf62b56db34f
parent e15ad67a7eed3b2bc5ddf5549e1421c8162e00f2
parent 8b7552e47700989d0355e42e3bb349bc6f22232a

Merge "MediaAppender:File fmt mime to determine extractor" into sc-qpr1-dev

media/libstagefright/MediaAppender.cpp

diff --git a/media/libstagefright/MediaAppender.cpp b/media/libstagefright/MediaAppender.cpp
index 5d80b30..21dcfa1 100644
--- a/media/libstagefright/MediaAppender.cpp
+++ b/media/libstagefright/MediaAppender.cpp
@@ -75,10 +75,21 @@
         return status;
     }
 
-    if (strcmp("MPEG4Extractor", mExtractor->getName()) == 0) {
+    sp<AMessage> fileFormat;
+    status = mExtractor->getFileFormat(&fileFormat);
+    if (status != OK) {
+        ALOGE("extractor_getFileFormat failed, status :%d", status);
+        return status;
+    }
+
+    AString fileMime;
+    fileFormat->findString("mime", &fileMime);
+    // only compare the end of the file MIME type to allow for vendor customized mime type
+    if (fileMime.endsWith("mp4")){
         mFormat = MediaMuxer::OUTPUT_FORMAT_MPEG_4;
     } else {
-        ALOGE("Unsupported format, extractor name:%s", mExtractor->getName());
+        ALOGE("Unsupported file format, extractor name:%s, fileformat %s",
+              mExtractor->getName(), fileMime.c_str());
         return ERROR_UNSUPPORTED;
     }