commit f37a9661c9ef30e23f06c3fa980849bfe335846f
author Iris Chang <iris.chang@mediatek.com> Fri Jan 18 14:26:47 2019 +0800
committer Marco Nelissen <marcone@google.com> Fri Jan 25 09:45:35 2019 -0800
tree 66bf3542c9520370ab9e58ed35e0fe32e9e45520
parent 50b7ff208ff31b00c6e95478edb633eb7a193cb6

Cannot play mp4 file with major brand 'wmf'

Problem: Major brand 'wmf' is not in compatible array, so mp4
file with major brand 'wmf' is not recognized as mp4.

Solution: add 'wmf' to compatible array

Bug: 123051965
Test: play mp4 file whose ftyp major brand is 'wmf' and check
if it can be played normally

Change-Id: I9ff1411c01aa89d5bc35d85f6bc2ee07d37545e3

media/extractors/mp4/MPEG4Extractor.cpp

diff --git a/media/extractors/mp4/MPEG4Extractor.cpp b/media/extractors/mp4/MPEG4Extractor.cpp
index 50f172e..d0efddd 100644
--- a/media/extractors/mp4/MPEG4Extractor.cpp
+++ b/media/extractors/mp4/MPEG4Extractor.cpp
@@ -6048,6 +6048,7 @@
         // Just give these file types a chance.
         FOURCC("qt  "),  // Apple's QuickTime
         FOURCC("MSNV"),  // Sony's PSP
+        FOURCC("wmf "),
 
         FOURCC("3g2a"),  // 3GPP2
         FOURCC("3g2b"),