summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-04-07 17:57:04 -0700
committerJames Dong <jdong@google.com>2011-04-07 17:57:04 -0700
commit4cb2c4dc7af70684e81cfbce46cbcbb9e44f4dc4 (patch)
treef4b3a05f4ebe645487eeb11cf3850832d8cfabc9 /media
parentc30268b9d118309a0514bcf280a03ee69f81403f (diff)
downloadframeworks_av-4cb2c4dc7af70684e81cfbce46cbcbb9e44f4dc4.zip
frameworks_av-4cb2c4dc7af70684e81cfbce46cbcbb9e44f4dc4.tar.gz
frameworks_av-4cb2c4dc7af70684e81cfbce46cbcbb9e44f4dc4.tar.bz2
Give PSP and QuickTime compatible mp4 files a chance to play
Change-Id: I2618946b242b581fb8ed5de9a13ede23a4191b11 related-to-bug: 4173290
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/MPEG4Extractor.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index 1ca2d6d..8b5ba6c 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -2207,6 +2207,11 @@ static bool isCompatibleBrand(uint32_t fourcc) {
FOURCC('3', 'g', 'p', '4'),
FOURCC('m', 'p', '4', '1'),
FOURCC('m', 'p', '4', '2'),
+
+ // Won't promise that the following file types can be played.
+ // Just give these file types a chance.
+ FOURCC('q', 't', ' ', ' '), // Apple's QuickTime
+ FOURCC('M', 'S', 'N', 'V'), // Sony's PSP
};
for (size_t i = 0;