diff options
| author | Manikanta Kanamarlapudi <kmanikan@codeaurora.org> | 2013-11-28 11:55:29 +0530 |
|---|---|---|
| committer | Diogo Ferreira <defer@cyngn.com> | 2015-11-27 11:30:10 +0000 |
| commit | d51e9d6d1f59dd3bd0916175b6502af74c9dfe10 (patch) | |
| tree | 9eb43c33c57a52f43be6e806f35b84e18c1115aa /media/libstagefright/MPEG4Extractor.cpp | |
| parent | 17c160c29793a049c1af12ac88a0921a0db62234 (diff) | |
| download | frameworks_av-d51e9d6d1f59dd3bd0916175b6502af74c9dfe10.zip frameworks_av-d51e9d6d1f59dd3bd0916175b6502af74c9dfe10.tar.gz frameworks_av-d51e9d6d1f59dd3bd0916175b6502af74c9dfe10.tar.bz2 | |
libstagefright: Added mime-types for enca/encv atoms
- enca/encv are encrypted audio and video atoms for
mp4a and mp4v. Hence returning aac and mpeg4 mime-types
for enca and encv.
CRs-Fixed: 578506
Change-Id: Ie568ea7eec73e110eef07e2b1b921afefc8c54a7
Diffstat (limited to 'media/libstagefright/MPEG4Extractor.cpp')
| -rwxr-xr-x | media/libstagefright/MPEG4Extractor.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp index 1f010d4..738b134 100755 --- a/media/libstagefright/MPEG4Extractor.cpp +++ b/media/libstagefright/MPEG4Extractor.cpp @@ -315,6 +315,9 @@ static const char *FourCC2MIME(uint32_t fourcc) { case FOURCC('m', 'p', '4', 'a'): return MEDIA_MIMETYPE_AUDIO_AAC; + case FOURCC('e', 'n', 'c', 'a'): + return MEDIA_MIMETYPE_AUDIO_AAC; + case FOURCC('.', 'm', 'p', '3'): return MEDIA_MIMETYPE_AUDIO_MPEG; @@ -327,6 +330,9 @@ static const char *FourCC2MIME(uint32_t fourcc) { case FOURCC('m', 'p', '4', 'v'): return MEDIA_MIMETYPE_VIDEO_MPEG4; + case FOURCC('e', 'n', 'c', 'v'): + return MEDIA_MIMETYPE_VIDEO_MPEG4; + case FOURCC('s', '2', '6', '3'): case FOURCC('h', '2', '6', '3'): case FOURCC('H', '2', '6', '3'): |