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

Commit 78e3c8ad authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Gerrit Code Review
Browse files

Merge "Add support for AC-4 level 4 audio format" into main

parents 437a666b 05fcd3a1

media/audio/aconfig/audio_framework.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -40,6 +40,14 @@ flag { 
    bug: "316414750"

}



flag {

    name: "dolby_ac4_level4_encoding_api"

    namespace: "media_audio"

    description: "Feature flag for Dolby AC-4 level 4 AudioFormat encoding."

    is_fixed_read_only: true

    bug: "266537650"

}



# TODO remove

flag {

    name: "foreground_audio_control"

media/audioaidlconversion/AidlConversionCppNdk.cpp

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

             AUDIO_FORMAT_APTX_HD, make_AudioFormatDescription("audio/vnd.qcom.aptx.hd")},

            {AUDIO_FORMAT_AC4, make_AudioFormatDescription(::android::MEDIA_MIMETYPE_AUDIO_AC4)},

            {AUDIO_FORMAT_AC4_L4, make_AudioFormatDescription(

                    std::string(::android::MEDIA_MIMETYPE_AUDIO_AC4) + ";version=02.01.04")},

            {// Note: not in the IANA registry.

             AUDIO_FORMAT_LDAC, make_AudioFormatDescription("audio/vnd.sony.ldac")},

            {AUDIO_FORMAT_MAT,

services/audiopolicy/common/managerdefinitions/src/AudioPolicyConfig.cpp

+2 −1
Original line number Diff line number Diff line
@@ -342,7 +342,8 @@ void AudioPolicyConfig::setDefaultSurroundFormats() { 
                AUDIO_FORMAT_AAC_XHE}},

        {AUDIO_FORMAT_DOLBY_TRUEHD, {}},

        {AUDIO_FORMAT_E_AC3_JOC, {}},

        {AUDIO_FORMAT_AC4, {}}};

        {AUDIO_FORMAT_AC4, {}},     // L0-3

        {AUDIO_FORMAT_AC4_L4, {}}};

}



bool AudioPolicyConfig::useDeepBufferForMedia() const {

services/audiopolicy/config/surround_sound_configuration_5_0.xml

+1 −0
Original line number Diff line number Diff line
@@ -27,5 +27,6 @@ 
    <format name="AUDIO_FORMAT_DTS_HD" />

    <format name="AUDIO_FORMAT_AAC_LC" subformats="AUDIO_FORMAT_AAC_HE_V1 AUDIO_FORMAT_AAC_HE_V2 AUDIO_FORMAT_AAC_ELD AUDIO_FORMAT_AAC_XHE" />

    <format name="AUDIO_FORMAT_AC4" />

    <format name="AUDIO_FORMAT_AC4_L4" />

  </formats>

</surroundSound>

services/audiopolicy/config/surround_sound_configuration_aidl.xml

+1 −0
Original line number Diff line number Diff line
@@ -30,5 +30,6 @@ 
    <format name="AUDIO_FORMAT_DTS_UHD_P2" />

    <format name="AUDIO_FORMAT_AAC_LC" subformats="AUDIO_FORMAT_AAC_HE_V1 AUDIO_FORMAT_AAC_HE_V2 AUDIO_FORMAT_AAC_ELD AUDIO_FORMAT_AAC_XHE" />

    <format name="AUDIO_FORMAT_AC4" />

    <format name="AUDIO_FORMAT_AC4_L4" />

  </formats>

</surroundSound>