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

Commit b43061b9 authored by Andy Hung's avatar Andy Hung Committed by Automerger Merge Worker
Browse files

Merge "Replace channel layout for 13.0" into main am: d85a6838 am: da4be0dd 

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2577913



Change-Id: If7ce20770c4c5ad99fb500457fe6a9ef857efb34
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 36e5ce05 da4be0dd

media/audio/aconfig/audio_framework.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -86,6 +86,14 @@ flag { 
    is_exported: true

}



flag {

    name: "sony_360ra_mpegh_3d_format"

    namespace: "media_audio"

    description: "360 Reality Audio MPEG-H 3D Format"

    is_fixed_read_only: true

    bug: "238402306"

}



# TODO remove

flag {

    name: "foreground_audio_control"

media/audioaidlconversion/AidlConversionCppNdk.cpp

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ const detail::AudioChannelPairs& getOutAudioChannelPairs() { 
        DEFINE_OUTPUT_LAYOUT(7POINT1),

        DEFINE_OUTPUT_LAYOUT(7POINT1POINT2),

        DEFINE_OUTPUT_LAYOUT(7POINT1POINT4),

        DEFINE_OUTPUT_LAYOUT(13POINT_360RA),

        DEFINE_OUTPUT_LAYOUT(13POINT0),

        DEFINE_OUTPUT_LAYOUT(22POINT2),

        DEFINE_OUTPUT_LAYOUT(MONO_HAPTIC_A),

        DEFINE_OUTPUT_LAYOUT(STEREO_HAPTIC_A),

media/libeffects/downmix/benchmark/downmix_benchmark.cpp

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ static constexpr audio_channel_mask_t kChannelPositionMasks[] = { 
    AUDIO_CHANNEL_OUT_5POINT1POINT4,

    AUDIO_CHANNEL_OUT_7POINT1POINT2,

    AUDIO_CHANNEL_OUT_7POINT1POINT4,

    AUDIO_CHANNEL_OUT_13POINT_360RA,

    AUDIO_CHANNEL_OUT_13POINT0,

    AUDIO_CHANNEL_OUT_22POINT2,

};

media/libeffects/downmix/tests/downmix_tests.cpp

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static constexpr audio_channel_mask_t kChannelPositionMasks[] = { 
    AUDIO_CHANNEL_OUT_5POINT1POINT4,

    AUDIO_CHANNEL_OUT_7POINT1POINT2,

    AUDIO_CHANNEL_OUT_7POINT1POINT4,

    AUDIO_CHANNEL_OUT_13POINT_360RA,

    AUDIO_CHANNEL_OUT_13POINT0,

    AUDIO_CHANNEL_OUT_22POINT2,

    audio_channel_mask_t(AUDIO_CHANNEL_OUT_22POINT2

            | AUDIO_CHANNEL_OUT_FRONT_WIDE_LEFT | AUDIO_CHANNEL_OUT_FRONT_WIDE_RIGHT),