Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f415766d authored by Manikanta Kanamarlapudi's avatar Manikanta Kanamarlapudi Committed by Steve Kondik
Browse files

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
parent 1a9b49f3

media/libstagefright/MPEG4Extractor.cpp

+7 −0
Original line number Diff line number Diff line
@@ -313,6 +313,10 @@ static const char *FourCC2MIME(uint32_t fourcc) { 
    switch (fourcc) {

        case FOURCC('m', 'p', '4', 'a'):

            return MEDIA_MIMETYPE_AUDIO_AAC;



        case FOURCC('e', 'n', 'c', 'a'):

            return MEDIA_MIMETYPE_AUDIO_AAC;



#ifdef QCOM_HARDWARE

        case FOURCC('.', 'm', 'p', '3'):

            return MEDIA_MIMETYPE_AUDIO_MPEG;
@@ -327,6 +331,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'):