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

Commit 3c198703 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add support for IAMF audio format" into main

parents 4025d084 3fabd2e1

media/audioaidlconversion/AidlConversionCppNdk.cpp

+36 −0
Original line number Diff line number Diff line
@@ -803,6 +803,42 @@ const detail::AudioFormatPairs& getAudioFormatPairs() { 
            {// Note: not in the IANA registry.

             AUDIO_FORMAT_APTX_ADAPTIVE_R4,

             make_AudioFormatDescription("audio/vnd.qcom.aptx.adaptive.r4")},

            {// Note: not in the IANA registry.

             AUDIO_FORMAT_IAMF_SIMPLE_OPUS, make_AudioFormatDescription(

                     std::string(::android::MEDIA_MIMETYPE_AUDIO_IAMF) + ".simple.opus")},

            {// Note: not in the IANA registry.

             AUDIO_FORMAT_IAMF_SIMPLE_AAC, make_AudioFormatDescription(

                     std::string(::android::MEDIA_MIMETYPE_AUDIO_IAMF) + ".simple.aac")},

            {// Note: not in the IANA registry.

             AUDIO_FORMAT_IAMF_SIMPLE_FLAC, make_AudioFormatDescription(

                    std::string(::android::MEDIA_MIMETYPE_AUDIO_IAMF) + ".simple.flac")},

            {// Note: not in the IANA registry.

             AUDIO_FORMAT_IAMF_SIMPLE_PCM, make_AudioFormatDescription(

                    std::string(::android::MEDIA_MIMETYPE_AUDIO_IAMF) + ".simple.pcm")},

            {// Note: not in the IANA registry.

             AUDIO_FORMAT_IAMF_BASE_OPUS, make_AudioFormatDescription(

                    std::string(::android::MEDIA_MIMETYPE_AUDIO_IAMF) + ".base.opus")},

            {// Note: not in the IANA registry.

             AUDIO_FORMAT_IAMF_BASE_AAC, make_AudioFormatDescription(

                    std::string(::android::MEDIA_MIMETYPE_AUDIO_IAMF) + ".base.aac")},

            {// Note: not in the IANA registry.

             AUDIO_FORMAT_IAMF_BASE_FLAC, make_AudioFormatDescription(

                    std::string(::android::MEDIA_MIMETYPE_AUDIO_IAMF) + ".base.flac")},

            {// Note: not in the IANA registry.

             AUDIO_FORMAT_IAMF_BASE_PCM, make_AudioFormatDescription(

                    std::string(::android::MEDIA_MIMETYPE_AUDIO_IAMF) + ".base.pcm")},

            {// Note: not in the IANA registry.

             AUDIO_FORMAT_IAMF_BASE_ENHANCED_OPUS, make_AudioFormatDescription(

                    std::string(::android::MEDIA_MIMETYPE_AUDIO_IAMF) + ".base_enhanced.opus")},

            {// Note: not in the IANA registry.

             AUDIO_FORMAT_IAMF_BASE_ENHANCED_AAC, make_AudioFormatDescription(

                    std::string(::android::MEDIA_MIMETYPE_AUDIO_IAMF) + ".base_enhanced.aac")},

            {// Note: not in the IANA registry.

             AUDIO_FORMAT_IAMF_BASE_ENHANCED_FLAC, make_AudioFormatDescription(

                    std::string(::android::MEDIA_MIMETYPE_AUDIO_IAMF) + ".base_enhanced.flac")},

            {// Note: not in the IANA registry.

             AUDIO_FORMAT_IAMF_BASE_ENHANCED_PCM, make_AudioFormatDescription(

                    std::string(::android::MEDIA_MIMETYPE_AUDIO_IAMF) + ".base_enhanced.pcm")},

    }};

    return pairs;

}

media/module/foundation/MediaDefs.cpp

+2 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ const char *MEDIA_MIMETYPE_AUDIO_AAC_LATM_HE_V2 = "audio/mp4a-latm.29"; 
const char *MEDIA_MIMETYPE_AUDIO_IEC61937 = "audio/x-iec61937";

// Note: not in the IANA registry.

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

// Note: not in the IANA registry.

const char *MEDIA_MIMETYPE_AUDIO_IAMF = "audio/iamf";



const char *MEDIA_MIMETYPE_CONTAINER_MPEG4 = "video/mp4";

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

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

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ 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_AUDIO_IAMF;



extern const char *MEDIA_MIMETYPE_CONTAINER_MPEG4;

extern const char *MEDIA_MIMETYPE_CONTAINER_WAV;