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

Commit 9ec08d02 authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

Update MIME types in AidlConversion and MediaDefs 

Add some IANA-listed types that were absent from MediaDefs.
Also add unlisted types that have corresponding
android.media.AudioFormat.ENCODING_* constants in the Java SDK.

For the types related to MPEG4 audio use the convention described
in RFC 6381 where various codecs are specified using the Audio
Object Type Identifier from the ISO/IEC 14496-3 standard and its
amendments.

For the types related to MPEG-H audio use the identifiers from the
ISO/IEC 23008-3 standard.

Bug: 188932434
Test: m
Change-Id: I87b77a90526a6b04ddebd7b3c4c16293edd1ae4e
parent b051b48a

media/libaudioclient/AidlConversion.cpp

+55 −82
Original line number Diff line number Diff line
@@ -724,7 +724,6 @@ const detail::AudioFormatPairs& getAudioFormatPairs() { 
            AUDIO_FORMAT_PCM_24_BIT_PACKED, make_AudioFormatDescription(media::PcmType::INT_24_BIT)

        },

        {

            // See the comment in MediaDefs.h.

            AUDIO_FORMAT_MP3, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_MPEG)

        },

        {
@@ -734,52 +733,41 @@ const detail::AudioFormatPairs& getAudioFormatPairs() { 
            AUDIO_FORMAT_AMR_WB, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AMR_WB)

        },

        {

            // Note: in MediaDefs.cpp MEDIA_MIMETYPE_AUDIO_AAC = "audio/mp4a-latm".

            AUDIO_FORMAT_AAC, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_FORMAT)

            AUDIO_FORMAT_AAC, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_MP4)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_MAIN, make_AudioFormatDescription("audio/aac.main")

            AUDIO_FORMAT_AAC_MAIN, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_MAIN)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_LC, make_AudioFormatDescription("audio/aac.lc")

            AUDIO_FORMAT_AAC_LC, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_LC)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_SSR, make_AudioFormatDescription("audio/aac.ssr")

            AUDIO_FORMAT_AAC_SSR, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_SSR)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_LTP, make_AudioFormatDescription("audio/aac.ltp")

            AUDIO_FORMAT_AAC_LTP, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_LTP)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_HE_V1, make_AudioFormatDescription("audio/aac.he.v1")

            AUDIO_FORMAT_AAC_HE_V1, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_HE_V1)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_SCALABLE, make_AudioFormatDescription("audio/aac.scalable")

            AUDIO_FORMAT_AAC_SCALABLE,

            make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_SCALABLE)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_ERLC, make_AudioFormatDescription("audio/aac.erlc")

            AUDIO_FORMAT_AAC_ERLC, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ERLC)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_LD, make_AudioFormatDescription("audio/aac.ld")

            AUDIO_FORMAT_AAC_LD, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_LD)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_HE_V2, make_AudioFormatDescription("audio/aac.he.v2")

            AUDIO_FORMAT_AAC_HE_V2, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_HE_V2)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_ELD, make_AudioFormatDescription("audio/aac.eld")

            AUDIO_FORMAT_AAC_ELD, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ELD)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_XHE, make_AudioFormatDescription("audio/aac.xhe")

            AUDIO_FORMAT_AAC_XHE, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_XHE)

        },

        // AUDIO_FORMAT_HE_AAC_V1 and HE_AAC_V2 are removed since they were deprecated long time

        // ago.
@@ -796,7 +784,6 @@ const detail::AudioFormatPairs& getAudioFormatPairs() { 
            AUDIO_FORMAT_E_AC3, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_EAC3)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_E_AC3_JOC, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_EAC3_JOC)

        },

        {
@@ -809,13 +796,12 @@ const detail::AudioFormatPairs& getAudioFormatPairs() { 
        // nested AudioFormatDescriptions. The legacy 'AUDIO_FORMAT_IEC61937' type doesn't

        // specify the format of the encapsulated bitstream.

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_IEC61937,

            make_AudioFormatDescription(media::PcmType::INT_16_BIT, "audio/x-iec61937")

            make_AudioFormatDescription(media::PcmType::INT_16_BIT, MEDIA_MIMETYPE_AUDIO_IEC61937)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_DOLBY_TRUEHD, make_AudioFormatDescription("audio/vnd.dolby.truehd")

            AUDIO_FORMAT_DOLBY_TRUEHD,

            make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DOLBY_TRUEHD)

        },

        {

            AUDIO_FORMAT_EVRC, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_EVRC)
@@ -830,11 +816,9 @@ const detail::AudioFormatPairs& getAudioFormatPairs() { 
            AUDIO_FORMAT_EVRCNW, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_EVRCNW)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_ADIF, make_AudioFormatDescription("audio/aac.adif")

            AUDIO_FORMAT_AAC_ADIF, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADIF)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_WMA, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_WMA)

        },

        {
@@ -845,7 +829,6 @@ const detail::AudioFormatPairs& getAudioFormatPairs() { 
            AUDIO_FORMAT_AMR_WB_PLUS, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AMR_WB_PLUS)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_MP2, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_II)

        },

        {
@@ -859,7 +842,6 @@ const detail::AudioFormatPairs& getAudioFormatPairs() { 
            AUDIO_FORMAT_FLAC, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_FLAC)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_ALAC, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_ALAC)

        },

        {
@@ -867,52 +849,49 @@ const detail::AudioFormatPairs& getAudioFormatPairs() { 
            AUDIO_FORMAT_APE, make_AudioFormatDescription("audio/x-ape")

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_ADTS, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADTS)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_ADTS_MAIN, make_AudioFormatDescription("audio/aac-adts.main")

            AUDIO_FORMAT_AAC_ADTS_MAIN,

            make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADTS_MAIN)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_ADTS_LC, make_AudioFormatDescription("audio/aac-adts.lc")

            AUDIO_FORMAT_AAC_ADTS_LC, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADTS_LC)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_ADTS_SSR, make_AudioFormatDescription("audio/aac-adts.ssr")

            AUDIO_FORMAT_AAC_ADTS_SSR,

            make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADTS_SSR)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_ADTS_LTP, make_AudioFormatDescription("audio/aac-adts.ltp")

            AUDIO_FORMAT_AAC_ADTS_LTP,

            make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADTS_LTP)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_ADTS_HE_V1, make_AudioFormatDescription("audio/aac-adts.he.v1")

            AUDIO_FORMAT_AAC_ADTS_HE_V1,

            make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADTS_HE_V1)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_ADTS_SCALABLE, make_AudioFormatDescription("audio/aac-adts.scalable")

            AUDIO_FORMAT_AAC_ADTS_SCALABLE,

            make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADTS_SCALABLE)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_ADTS_ERLC, make_AudioFormatDescription("audio/aac-adts.erlc")

            AUDIO_FORMAT_AAC_ADTS_ERLC,

            make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADTS_ERLC)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_ADTS_LD, make_AudioFormatDescription("audio/aac-adts.ld")

            AUDIO_FORMAT_AAC_ADTS_LD, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADTS_LD)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_ADTS_HE_V2, make_AudioFormatDescription("audio/aac-adts.he.v2")

            AUDIO_FORMAT_AAC_ADTS_HE_V2,

            make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADTS_HE_V2)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_ADTS_ELD, make_AudioFormatDescription("audio/aac-adts.eld")

            AUDIO_FORMAT_AAC_ADTS_ELD,

            make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADTS_ELD)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_ADTS_XHE, make_AudioFormatDescription("audio/aac-adts.xhe")

            AUDIO_FORMAT_AAC_ADTS_XHE,

            make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_ADTS_XHE)

        },

        {

            // Note: not in the IANA registry. "vnd.octel.sbc" is not BT SBC.
@@ -926,7 +905,6 @@ const detail::AudioFormatPairs& getAudioFormatPairs() { 
            AUDIO_FORMAT_APTX_HD, make_AudioFormatDescription("audio/vnd.qcom.aptx.hd")

        },

        {

            // Note: not in the IANA registry. Matches MediaDefs.cpp.

            AUDIO_FORMAT_AC4, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AC4)

        },

        {
@@ -934,35 +912,36 @@ const detail::AudioFormatPairs& getAudioFormatPairs() { 
            AUDIO_FORMAT_LDAC, make_AudioFormatDescription("audio/vnd.sony.ldac")

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_MAT, make_AudioFormatDescription("audio/vnd.dolby.mat")

            AUDIO_FORMAT_MAT, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DOLBY_MAT)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_MAT_1_0, make_AudioFormatDescription("audio/vnd.dolby.mat.1.0")

            AUDIO_FORMAT_MAT_1_0,

            make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DOLBY_MAT + std::string(".1.0"))

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_MAT_2_0, make_AudioFormatDescription("audio/vnd.dolby.mat.2.0")

            AUDIO_FORMAT_MAT_2_0,

            make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DOLBY_MAT + std::string(".2.0"))

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_MAT_2_1, make_AudioFormatDescription("audio/vnd.dolby.mat.2.1")

            AUDIO_FORMAT_MAT_2_1,

            make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DOLBY_MAT + std::string(".2.1"))

        },

        {

            AUDIO_FORMAT_AAC_LATM, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_LATM_LC, make_AudioFormatDescription("audio/mp4a-latm.lc")

            AUDIO_FORMAT_AAC_LATM_LC, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_LATM_LC)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_LATM_HE_V1, make_AudioFormatDescription("audio/mp4a-latm.he.v1")

            AUDIO_FORMAT_AAC_LATM_HE_V1,

            make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_LATM_HE_V1)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_AAC_LATM_HE_V2, make_AudioFormatDescription("audio/mp4a-latm.he.v2")

            AUDIO_FORMAT_AAC_LATM_HE_V2,

            make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_AAC_LATM_HE_V2)

        },

        {

            // Note: not in the IANA registry.
@@ -989,29 +968,23 @@ const detail::AudioFormatPairs& getAudioFormatPairs() { 
            AUDIO_FORMAT_LC3, make_AudioFormatDescription("audio/x-lc3")

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_MPEGH, make_AudioFormatDescription("audio/x-mpegh")

            AUDIO_FORMAT_MPEGH, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_MPEGH_MHM1)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_MPEGH_BL_L3, make_AudioFormatDescription("audio/x-mpegh.bl.l3")

            AUDIO_FORMAT_MPEGH_BL_L3, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_MPEGH_BL_L3)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_MPEGH_BL_L4, make_AudioFormatDescription("audio/x-mpegh.bl.l4")

            AUDIO_FORMAT_MPEGH_BL_L4, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_MPEGH_BL_L4)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_MPEGH_LC_L3, make_AudioFormatDescription("audio/x-mpegh.lc.l3")

            AUDIO_FORMAT_MPEGH_LC_L3, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_MPEGH_LC_L3)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_MPEGH_LC_L4, make_AudioFormatDescription("audio/x-mpegh.lc.l4")

            AUDIO_FORMAT_MPEGH_LC_L4, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_MPEGH_LC_L4)

        },

        {

            // Note: not in the IANA registry.

            AUDIO_FORMAT_IEC60958,

            make_AudioFormatDescription(media::PcmType::INT_24_BIT, "audio/x-iec60958")

            make_AudioFormatDescription(media::PcmType::INT_24_BIT, MEDIA_MIMETYPE_AUDIO_IEC60958)

        },

        {

            AUDIO_FORMAT_DTS_UHD, make_AudioFormatDescription(MEDIA_MIMETYPE_AUDIO_DTS_UHD)

media/libstagefright/foundation/MediaDefs.cpp

+45 −1
Original line number Diff line number Diff line
@@ -60,6 +60,10 @@ const char *MEDIA_MIMETYPE_AUDIO_EAC3_JOC = "audio/eac3-joc"; 
const char *MEDIA_MIMETYPE_AUDIO_AC4 = "audio/ac4";

const char *MEDIA_MIMETYPE_AUDIO_MPEGH_MHA1 = "audio/mha1";

const char *MEDIA_MIMETYPE_AUDIO_MPEGH_MHM1 = "audio/mhm1";

const char *MEDIA_MIMETYPE_AUDIO_MPEGH_BL_L3 = "audio/mhm1.03";

const char *MEDIA_MIMETYPE_AUDIO_MPEGH_BL_L4 = "audio/mhm1.04";

const char *MEDIA_MIMETYPE_AUDIO_MPEGH_LC_L3 = "audio/mhm1.0d";

const char *MEDIA_MIMETYPE_AUDIO_MPEGH_LC_L4 = "audio/mhm1.0e";

const char *MEDIA_MIMETYPE_AUDIO_SCRAMBLED = "audio/scrambled";

const char *MEDIA_MIMETYPE_AUDIO_ALAC = "audio/alac";

const char *MEDIA_MIMETYPE_AUDIO_WMA = "audio/x-ms-wma";
@@ -75,7 +79,47 @@ const char *MEDIA_MIMETYPE_AUDIO_EVRCNW = "audio/evrcnw"; 
const char *MEDIA_MIMETYPE_AUDIO_AMR_WB_PLUS = "audio/amr-wb+";

const char *MEDIA_MIMETYPE_AUDIO_APTX = "audio/aptx";

const char *MEDIA_MIMETYPE_AUDIO_DRA = "audio/vnd.dra";

const char *MEDIA_MIMETYPE_AUDIO_AAC_FORMAT = "audio/aac";

// Note: not in the IANA registry.

const char *MEDIA_MIMETYPE_AUDIO_DOLBY_MAT = "audio/vnd.dolby.mat";

// Note: not in the IANA registry.

const char *MEDIA_MIMETYPE_AUDIO_DOLBY_MAT_1_0 = "audio/vnd.dolby.mat.1.0";

// Note: not in the IANA registry.

const char *MEDIA_MIMETYPE_AUDIO_DOLBY_MAT_2_0 = "audio/vnd.dolby.mat.2.0";

// Note: not in the IANA registry.

const char *MEDIA_MIMETYPE_AUDIO_DOLBY_MAT_2_1 = "audio/vnd.dolby.mat.2.1";

const char *MEDIA_MIMETYPE_AUDIO_DOLBY_TRUEHD = "audio/vnd.dolby.mlp";

const char *MEDIA_MIMETYPE_AUDIO_AAC_MP4 = "audio/mp4a.40";

const char *MEDIA_MIMETYPE_AUDIO_AAC_MAIN = "audio/mp4a.40.01";

const char *MEDIA_MIMETYPE_AUDIO_AAC_LC = "audio/mp4a.40.02";

const char *MEDIA_MIMETYPE_AUDIO_AAC_SSR = "audio/mp4a.40.03";

const char *MEDIA_MIMETYPE_AUDIO_AAC_LTP = "audio/mp4a.40.04";

const char *MEDIA_MIMETYPE_AUDIO_AAC_HE_V1 = "audio/mp4a.40.05";

const char *MEDIA_MIMETYPE_AUDIO_AAC_SCALABLE = "audio/mp4a.40.06";

const char *MEDIA_MIMETYPE_AUDIO_AAC_ERLC = "audio/mp4a.40.17";

const char *MEDIA_MIMETYPE_AUDIO_AAC_LD = "audio/mp4a.40.23";

const char *MEDIA_MIMETYPE_AUDIO_AAC_HE_V2 = "audio/mp4a.40.29";

const char *MEDIA_MIMETYPE_AUDIO_AAC_ELD = "audio/mp4a.40.39";

const char *MEDIA_MIMETYPE_AUDIO_AAC_XHE = "audio/mp4a.40.42";

// Note: not in the IANA registry.

const char *MEDIA_MIMETYPE_AUDIO_AAC_ADIF = "audio/aac-adif";

const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS_MAIN = "audio/aac-adts.01";

const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS_LC = "audio/aac-adts.02";

const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS_SSR = "audio/aac-adts.03";

const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS_LTP = "audio/aac-adts.04";

const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS_HE_V1 = "audio/aac-adts.05";

const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS_SCALABLE = "audio/aac-adts.06";

const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS_ERLC = "audio/aac-adts.17";

const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS_LD = "audio/aac-adts.23";

const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS_HE_V2 = "audio/aac-adts.29";

const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS_ELD = "audio/aac-adts.39";

const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS_XHE = "audio/aac-adts.42";

const char *MEDIA_MIMETYPE_AUDIO_AAC_LATM_LC = "audio/mp4a-latm.02";

const char *MEDIA_MIMETYPE_AUDIO_AAC_LATM_HE_V1 = "audio/mp4a-latm.05";

const char *MEDIA_MIMETYPE_AUDIO_AAC_LATM_HE_V2 = "audio/mp4a-latm.29";

// Note: not in the IANA registry.

const char *MEDIA_MIMETYPE_AUDIO_IEC61937 = "audio/x-iec61937";

// Note: not in the IANA registry.

const char *MEDIA_MIMETYPE_AUDIO_IEC60958 = "audio/x-iec60958";



const char *MEDIA_MIMETYPE_CONTAINER_MPEG4 = "video/mp4";

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

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

+38 −1
Original line number Diff line number Diff line
@@ -62,6 +62,10 @@ extern const char *MEDIA_MIMETYPE_AUDIO_EAC3_JOC; 
extern const char *MEDIA_MIMETYPE_AUDIO_AC4;

extern const char *MEDIA_MIMETYPE_AUDIO_MPEGH_MHA1;

extern const char *MEDIA_MIMETYPE_AUDIO_MPEGH_MHM1;

extern const char *MEDIA_MIMETYPE_AUDIO_MPEGH_BL_L3;

extern const char *MEDIA_MIMETYPE_AUDIO_MPEGH_BL_L4;

extern const char *MEDIA_MIMETYPE_AUDIO_MPEGH_LC_L3;

extern const char *MEDIA_MIMETYPE_AUDIO_MPEGH_LC_L4;

extern const char *MEDIA_MIMETYPE_AUDIO_SCRAMBLED;

extern const char *MEDIA_MIMETYPE_AUDIO_ALAC;

extern const char *MEDIA_MIMETYPE_AUDIO_WMA;
@@ -77,7 +81,40 @@ extern const char *MEDIA_MIMETYPE_AUDIO_EVRCNW; 
extern const char *MEDIA_MIMETYPE_AUDIO_AMR_WB_PLUS;

extern const char *MEDIA_MIMETYPE_AUDIO_APTX;

extern const char *MEDIA_MIMETYPE_AUDIO_DRA;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_FORMAT;

extern const char *MEDIA_MIMETYPE_AUDIO_DOLBY_MAT;

extern const char *MEDIA_MIMETYPE_AUDIO_DOLBY_MAT_1_0;

extern const char *MEDIA_MIMETYPE_AUDIO_DOLBY_MAT_2_0;

extern const char *MEDIA_MIMETYPE_AUDIO_DOLBY_MAT_2_1;

extern const char *MEDIA_MIMETYPE_AUDIO_DOLBY_TRUEHD;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_MP4;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_MAIN;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_LC;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_SSR;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_LTP;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_HE_V1;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_SCALABLE;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_ERLC;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_LD;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_HE_V2;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_ELD;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_XHE;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_ADIF;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS_MAIN;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS_LC;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS_SSR;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS_LTP;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS_HE_V1;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS_SCALABLE;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS_ERLC;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS_LD;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS_HE_V2;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS_ELD;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_ADTS_XHE;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_LATM_LC;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_LATM_HE_V1;

extern const char *MEDIA_MIMETYPE_AUDIO_AAC_LATM_HE_V2;

extern const char *MEDIA_MIMETYPE_AUDIO_IEC61937;

extern const char *MEDIA_MIMETYPE_AUDIO_IEC60958;



extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG4;

extern const char *MEDIA_MIMETYPE_CONTAINER_WAV;