From d51e9d6d1f59dd3bd0916175b6502af74c9dfe10 Mon Sep 17 00:00:00 2001 From: Manikanta Kanamarlapudi Date: Thu, 28 Nov 2013 11:55:29 +0530 Subject: 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 --- media/libstagefright/MPEG4Extractor.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'media/libstagefright/MPEG4Extractor.cpp') 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'): -- cgit v1.1