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

Commit 0bebe33b authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Automerger Merge Worker
Browse files

Merge "audio: Restrict reported channel masks to "mono" and "stereo"" into... 

Merge "audio: Restrict reported channel masks to "mono" and "stereo"" into main am: 96c01234 am: c778e25c

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3183105



Change-Id: I45948cdbf0af550664b9e30755d6e71f9b330c5a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5f812b1c c778e25c

audio/aidl/default/alsa/Utils.cpp

+2 −5
Original line number Diff line number Diff line
@@ -80,11 +80,8 @@ static AudioChannelCountToMaskMap make_ChannelCountToMaskMap( 


const AudioChannelCountToMaskMap& getSupportedChannelOutLayoutMap() {

    static const std::set<AudioChannelLayout> supportedOutChannelLayouts = {

            DEFINE_CHANNEL_LAYOUT_MASK(MONO),          DEFINE_CHANNEL_LAYOUT_MASK(STEREO),

            DEFINE_CHANNEL_LAYOUT_MASK(2POINT1),       DEFINE_CHANNEL_LAYOUT_MASK(QUAD),

            DEFINE_CHANNEL_LAYOUT_MASK(PENTA),         DEFINE_CHANNEL_LAYOUT_MASK(5POINT1),

            DEFINE_CHANNEL_LAYOUT_MASK(6POINT1),       DEFINE_CHANNEL_LAYOUT_MASK(7POINT1),

            DEFINE_CHANNEL_LAYOUT_MASK(7POINT1POINT4), DEFINE_CHANNEL_LAYOUT_MASK(22POINT2),

            DEFINE_CHANNEL_LAYOUT_MASK(MONO),

            DEFINE_CHANNEL_LAYOUT_MASK(STEREO),

    };

    static const AudioChannelCountToMaskMap outLayouts =

            make_ChannelCountToMaskMap(supportedOutChannelLayouts);