commit 6225516c8512741fe659ede6eeae37806c35314c
author Marco Nelissen <marcone@google.com> Tue Apr 17 14:03:59 2018 -0700
committer Marco Nelissen <marcone@google.com> Tue Apr 17 14:03:59 2018 -0700
tree 3a7d303a647c71314410122c0c2e80a3975fc3a3
parent 85d2e91d3cb2faaf42338df28d34c1cc1bc968bd

Don't CHECK for unknown fourcc

Bug: 69924180
Test: manual
Change-Id: I47c8e16dbe3ba5ec9ee44de6901c4916d9e79773

media/extractors/mp4/MPEG4Extractor.cpp

diff --git a/media/extractors/mp4/MPEG4Extractor.cpp b/media/extractors/mp4/MPEG4Extractor.cpp
index 99f32d5..dad36ec 100644
--- a/media/extractors/mp4/MPEG4Extractor.cpp
+++ b/media/extractors/mp4/MPEG4Extractor.cpp
@@ -321,8 +321,13 @@
         case FOURCC('h', 'e', 'v', '1'):
             return MEDIA_MIMETYPE_VIDEO_HEVC;
         default:
-            CHECK(!"should not be here.");
-            return NULL;
+            ALOGW("Unknown fourcc: %c%c%c%c",
+                   (fourcc >> 24) & 0xff,
+                   (fourcc >> 16) & 0xff,
+                   (fourcc >> 8) & 0xff,
+                   fourcc & 0xff
+                   );
+            return "application/octet-stream";
     }
 }