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

Commit 3074f122 authored by Suresh Choudhary's avatar Suresh Choudhary Committed by Steve Kondik
Browse files

libstagefright: Adds some parsing capability 

o Adds AC3, EAC3 and DTS mime types
o Adds AC3/EAC3 support in MP4 parser
o Adds MPEG4 video, MPEG Audio, AC3, DTS, EAC3 support
in mkv extractor.

Change-Id: I9895c0e40e5ad38976004a9569200f1340d525de
parent ee43a4e0

include/media/stagefright/MediaDefs.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -48,6 +48,7 @@ extern const char *MEDIA_MIMETYPE_AUDIO_FLAC; 
extern const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS;

extern const char *MEDIA_MIMETYPE_AUDIO_MSGSM;

extern const char *MEDIA_MIMETYPE_AUDIO_MSGSM;

extern const char *MEDIA_MIMETYPE_AUDIO_AC3;

extern const char *MEDIA_MIMETYPE_AUDIO_AC3;

extern const char *MEDIA_MIMETYPE_AUDIO_EAC3;





extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG4;

extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG4;

extern const char *MEDIA_MIMETYPE_CONTAINER_WAV;

extern const char *MEDIA_MIMETYPE_CONTAINER_WAV;

media/libstagefright/ExtendedMediaDefs.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -47,7 +47,6 @@ const char *MEDIA_MIMETYPE_CONTAINER_3G2 = "video/3g2"; 
const char *MEDIA_MIMETYPE_AUDIO_DTS = "audio/dts";

const char *MEDIA_MIMETYPE_AUDIO_DTS = "audio/dts";





const char *MEDIA_MIMETYPE_AUDIO_DTS_LBR = "audio/dts-lbr";

const char *MEDIA_MIMETYPE_AUDIO_DTS_LBR = "audio/dts-lbr";

const char *MEDIA_MIMETYPE_AUDIO_EAC3 = "audio/eac3";

const char *MEDIA_MIMETYPE_AUDIO_AMR_WB_PLUS = "audio/amr-wb-plus";

const char *MEDIA_MIMETYPE_AUDIO_AMR_WB_PLUS = "audio/amr-wb-plus";

const char *MEDIA_MIMETYPE_CONTAINER_QCAMR_NB = "audio/qc-amr";

const char *MEDIA_MIMETYPE_CONTAINER_QCAMR_NB = "audio/qc-amr";

const char *MEDIA_MIMETYPE_CONTAINER_QCAMR_WB = "audio/qc-amr-wb";

const char *MEDIA_MIMETYPE_CONTAINER_QCAMR_WB = "audio/qc-amr-wb";

media/libstagefright/MPEG4Extractor.cpp

+6 −6
Original line number Original line Diff line number Diff line
@@ -325,6 +325,12 @@ static const char *FourCC2MIME(uint32_t fourcc) { 
        case FOURCC('s', 'a', 'w', 'b'):

        case FOURCC('s', 'a', 'w', 'b'):

            return MEDIA_MIMETYPE_AUDIO_AMR_WB;

            return MEDIA_MIMETYPE_AUDIO_AMR_WB;





        case FOURCC('a', 'c', '-', '3'):

            return MEDIA_MIMETYPE_AUDIO_AC3;



        case FOURCC('e', 'c', '-', '3'):

            return MEDIA_MIMETYPE_AUDIO_EAC3;



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

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

            return MEDIA_MIMETYPE_VIDEO_MPEG4;

            return MEDIA_MIMETYPE_VIDEO_MPEG4;
@@ -357,12 +363,6 @@ static const char *FourCC2MIME(uint32_t fourcc) { 




        case FOURCC('d', 't', 's', 'e'):

        case FOURCC('d', 't', 's', 'e'):

            return MEDIA_MIMETYPE_AUDIO_DTS_LBR;

            return MEDIA_MIMETYPE_AUDIO_DTS_LBR;



        case FOURCC('a', 'c', '-', '3'):

            return MEDIA_MIMETYPE_AUDIO_AC3;



        case FOURCC('e', 'c', '-', '3'):

            return MEDIA_MIMETYPE_AUDIO_EAC3;

#endif

#endif





        default:

        default:

media/libstagefright/MediaDefs.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -46,6 +46,7 @@ const char *MEDIA_MIMETYPE_AUDIO_FLAC = "audio/flac"; 
const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS = "audio/aac-adts";

const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS = "audio/aac-adts";

const char *MEDIA_MIMETYPE_AUDIO_MSGSM = "audio/gsm";

const char *MEDIA_MIMETYPE_AUDIO_MSGSM = "audio/gsm";

const char *MEDIA_MIMETYPE_AUDIO_AC3 = "audio/ac3";

const char *MEDIA_MIMETYPE_AUDIO_AC3 = "audio/ac3";

const char *MEDIA_MIMETYPE_AUDIO_EAC3 = "audio/x-eac3";





const char *MEDIA_MIMETYPE_CONTAINER_MPEG4 = "video/mp4";

const char *MEDIA_MIMETYPE_CONTAINER_MPEG4 = "video/mp4";

const char *MEDIA_MIMETYPE_CONTAINER_WAV = "audio/x-wav";

const char *MEDIA_MIMETYPE_CONTAINER_WAV = "audio/x-wav";

media/libstagefright/matroska/MatroskaExtractor.cpp

+21 −0
Original line number Original line Diff line number Diff line
@@ -137,6 +137,11 @@ private: 
    enum Type {

    enum Type {

        AVC,

        AVC,

        AAC,

        AAC,

        MP3,

        AC3,

        EAC3,

        DTS,

        MPEG4,

        OTHER

        OTHER

    };

    };
@@ -237,6 +242,16 @@ MatroskaSource::MatroskaSource( 
        ALOGV("mNALSizeLen = %zu", mNALSizeLen);

        ALOGV("mNALSizeLen = %zu", mNALSizeLen);

    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC)) {

    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC)) {

        mType = AAC;

        mType = AAC;

    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AC3)) {

        mType = AC3;

    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_EAC3)) {

        mType = EAC3;

    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_MPEG)) {

        mType = MP3;

    } else if (!strcasecmp (mime, MEDIA_MIMETYPE_VIDEO_MPEG4)) {

        mType = MPEG4;

    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_DTS)) {

        mType = DTS;

    }

    }

}

}
@@ -1030,6 +1045,12 @@ void MatroskaExtractor::addTracks() { 
                    mSeekPreRollNs = track->GetSeekPreRoll();

                    mSeekPreRollNs = track->GetSeekPreRoll();

                } else if (!strcmp("A_MPEG/L3", codecID)) {

                } else if (!strcmp("A_MPEG/L3", codecID)) {

                    meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_MPEG);

                    meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_MPEG);

                } else if (!strcmp("A_AC3", codecID)) {

                    meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_AC3);

                } else if (!strcmp("A_EAC3", codecID)) {

                    meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_EAC3);

                } else if (!strcmp("A_DTS", codecID)) {

                    meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_DTS);

                } else {

                } else {

                    ALOGW("%s is not supported.", codecID);

                    ALOGW("%s is not supported.", codecID);

                    continue;

                    continue;