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

Commit 8c27e46b authored by Mikhail Naganov's avatar Mikhail Naganov
Browse files

audio: Restrict reported channel masks to "mono" and "stereo" 

When translating supported channel counts into channel masks,
only use channel layouts for 1 and 2 channels: "mono" and
"stereo", while reporting all other counts via indexed
masks. This helps to support output to multichannel USB Audio
interfaces properly.

Bug: 329571487
Test: repro steps in the bug
Change-Id: Ibbbf71e7f04a6622cccaddeb3f4f140193d7f8fb
parent 5102a372

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);