summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MPEG4Extractor.cpp
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-12-15 15:49:46 -0800
committerJames Dong <jdong@google.com>2010-12-15 15:49:46 -0800
commite071b055cee301d71335519601474c62b10af411 (patch)
tree53842b260dfa027fbcbb14b1fb0b7f21e1d682d9 /media/libstagefright/MPEG4Extractor.cpp
parentc08bb264768f773cd6d10b8736ccfc4745645135 (diff)
downloadframeworks_av-e071b055cee301d71335519601474c62b10af411.zip
frameworks_av-e071b055cee301d71335519601474c62b10af411.tar.gz
frameworks_av-e071b055cee301d71335519601474c62b10af411.tar.bz2
Opted to recognize "h263" or "H263" boxes in an mp4 file
bug - 3278240 Change-Id: Ifd1b1f3e5dd55dbf2c33bbad9dd51998c25bfc15
Diffstat (limited to 'media/libstagefright/MPEG4Extractor.cpp')
-rw-r--r--media/libstagefright/MPEG4Extractor.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index bbe99d3..d3c7445 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -247,6 +247,8 @@ static const char *FourCC2MIME(uint32_t fourcc) {
return MEDIA_MIMETYPE_VIDEO_MPEG4;
case FOURCC('s', '2', '6', '3'):
+ case FOURCC('h', '2', '6', '3'):
+ case FOURCC('H', '2', '6', '3'):
return MEDIA_MIMETYPE_VIDEO_H263;
case FOURCC('a', 'v', 'c', '1'):
@@ -936,6 +938,8 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
case FOURCC('m', 'p', '4', 'v'):
case FOURCC('s', '2', '6', '3'):
+ case FOURCC('H', '2', '6', '3'):
+ case FOURCC('h', '2', '6', '3'):
case FOURCC('a', 'v', 'c', '1'):
{
mHasVideo = true;