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

Commit af242df7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add eac3-joc MIME type support"

parents 3e239410 ddfbcedc

media/libstagefright/Utils.cpp

+1 −0
Original line number Diff line number Diff line
@@ -1822,6 +1822,7 @@ static const struct mime_conv_t mimeLookup[] = { 
    { MEDIA_MIMETYPE_AUDIO_OPUS,        AUDIO_FORMAT_OPUS},

    { MEDIA_MIMETYPE_AUDIO_AC3,         AUDIO_FORMAT_AC3},

    { MEDIA_MIMETYPE_AUDIO_EAC3,        AUDIO_FORMAT_E_AC3},

    { MEDIA_MIMETYPE_AUDIO_EAC3_JOC,    AUDIO_FORMAT_E_AC3_JOC},

    { MEDIA_MIMETYPE_AUDIO_AC4,         AUDIO_FORMAT_AC4},

    { MEDIA_MIMETYPE_AUDIO_FLAC,        AUDIO_FORMAT_FLAC},

    { MEDIA_MIMETYPE_AUDIO_ALAC,        AUDIO_FORMAT_ALAC },

media/libstagefright/foundation/MediaDefs.cpp

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

const char *MEDIA_MIMETYPE_AUDIO_AC3 = "audio/ac3";

const char *MEDIA_MIMETYPE_AUDIO_EAC3 = "audio/eac3";

const char *MEDIA_MIMETYPE_AUDIO_EAC3_JOC = "audio/eac3-joc";

const char *MEDIA_MIMETYPE_AUDIO_AC4 = "audio/ac4";

const char *MEDIA_MIMETYPE_AUDIO_SCRAMBLED = "audio/scrambled";

const char *MEDIA_MIMETYPE_AUDIO_ALAC = "audio/alac";

media/libstagefright/foundation/include/media/stagefright/foundation/MediaDefs.h

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

extern const char *MEDIA_MIMETYPE_AUDIO_AC3;

extern const char *MEDIA_MIMETYPE_AUDIO_EAC3;

extern const char *MEDIA_MIMETYPE_AUDIO_EAC3_JOC;

extern const char *MEDIA_MIMETYPE_AUDIO_AC4;

extern const char *MEDIA_MIMETYPE_AUDIO_SCRAMBLED;

extern const char *MEDIA_MIMETYPE_AUDIO_ALAC;

media/libstagefright/omx/OMXUtils.cpp

+2 −0
Original line number Diff line number Diff line
@@ -164,6 +164,8 @@ const char *GetComponentRole(bool isEncoder, const char *mime) { 
            "audio_decoder.ac3", "audio_encoder.ac3" },

        { MEDIA_MIMETYPE_AUDIO_EAC3,

            "audio_decoder.eac3", "audio_encoder.eac3" },

        { MEDIA_MIMETYPE_AUDIO_EAC3_JOC,

            "audio_decoder.eac3_joc", "audio_encoder.eac3_joc" },

        { MEDIA_MIMETYPE_AUDIO_AC4,

            "audio_decoder.ac4", "audio_encoder.ac4" },

        { MEDIA_MIMETYPE_IMAGE_ANDROID_HEIC,