Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Opted to recognize "h263" or "H263" boxes in an mp4 file"

Browse Source
This commit is contained in:
James Dong
2010-12-15 16:05:24 -08:00
committed by Android (Google) Code Review
parent 39be4bdd59 0efdc95d59
commit e40dbfe13c
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/libstagefright/MPEG4Extractor.cpp
View File

@@ -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;