commit d76a4a1e096ec3ccaee2599bbb5079d97e5879f7
author Marco Nelissen <marcone@google.com> Wed Oct 11 07:54:21 2017 -0700
committer Marco Nelissen <marcone@google.com> Wed Oct 11 07:57:14 2017 -0700
tree dac59a018232ca27f53a9bde9b68191c378856ea
parent 0d182e194f61490368459831579a19cfcaf2a0b0

Fix HEIF support

Ignore mime type and just always sniff

Bug: 67639035
Test: yes
Change-Id: I33d22db0ece8edea6f678f7b8253caf40158d2a1

media/libstagefright/MediaExtractor.cpp

diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp
index e7e42b2..cc2fa63 100644
--- a/media/libstagefright/MediaExtractor.cpp
+++ b/media/libstagefright/MediaExtractor.cpp
@@ -154,19 +154,17 @@
 
     CreatorFunc creator = NULL;
     String8 tmp;
-    if (mime == NULL) {
-        float confidence;
-        creator = sniff(source, &tmp, &confidence, &meta);
-        if (!creator) {
-            ALOGV("FAILED to autodetect media content.");
-            return NULL;
-        }
-
-        mime = tmp.string();
-        ALOGV("Autodetected media content as '%s' with confidence %.2f",
-             mime, confidence);
+    float confidence;
+    creator = sniff(source, &tmp, &confidence, &meta);
+    if (!creator) {
+        ALOGV("FAILED to autodetect media content.");
+        return NULL;
     }
 
+    mime = tmp.string();
+    ALOGV("Autodetected media content as '%s' with confidence %.2f",
+         mime, confidence);
+
     MediaExtractor *ret = creator(source, meta);
 
     if (ret != NULL) {