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

Commit 3cc6843b authored by Andy Hung's avatar Andy Hung
Browse files

audio: Add AUDIO_CHANNEL_OUT_22POINT2 constant 

24 channel configuration for immersive audio

See new value in system/media/audio/audio-hal-enums.h.
Define the same enum to HALv7 and update getChannelCount().

Test: atest android.hardware.audio.common@7.0-util_tests
Bug: 185530406
Change-Id: I8dc5e6c504049908fef157b11ffa043ecaeacaf9
parent 91ef183c

audio/7.0/config/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ package android.audio.policy.configuration.V7_0 { 
    enum_constant public static final android.audio.policy.configuration.V7_0.AudioChannelMask AUDIO_CHANNEL_IN_VOICE_UPLINK_MONO;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioChannelMask AUDIO_CHANNEL_NONE;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioChannelMask AUDIO_CHANNEL_OUT_13POINT_360RA;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioChannelMask AUDIO_CHANNEL_OUT_22POINT2;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioChannelMask AUDIO_CHANNEL_OUT_2POINT0POINT2;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioChannelMask AUDIO_CHANNEL_OUT_2POINT1;

    enum_constant public static final android.audio.policy.configuration.V7_0.AudioChannelMask AUDIO_CHANNEL_OUT_2POINT1POINT2;

audio/7.0/config/audio_policy_configuration.xsd

+1 −0
Original line number Diff line number Diff line
@@ -505,6 +505,7 @@ 
            <xs:enumeration value="AUDIO_CHANNEL_OUT_7POINT1POINT2"/>

            <xs:enumeration value="AUDIO_CHANNEL_OUT_7POINT1POINT4"/>

            <xs:enumeration value="AUDIO_CHANNEL_OUT_13POINT_360RA"/>

            <xs:enumeration value="AUDIO_CHANNEL_OUT_22POINT2"/>

            <xs:enumeration value="AUDIO_CHANNEL_OUT_MONO_HAPTIC_A"/>

            <xs:enumeration value="AUDIO_CHANNEL_OUT_STEREO_HAPTIC_A"/>

            <xs:enumeration value="AUDIO_CHANNEL_OUT_HAPTIC_AB"/>

audio/common/7.0/enums/include/android_audio_policy_configuration_V7_0-enums.h

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ static inline size_t getChannelCount(AudioChannelMask mask) { 
            return 22;

        case AudioChannelMask::AUDIO_CHANNEL_INDEX_MASK_23:

            return 23;

        case AudioChannelMask::AUDIO_CHANNEL_OUT_22POINT2:

        case AudioChannelMask::AUDIO_CHANNEL_INDEX_MASK_24:

            return 24;

        case AudioChannelMask::UNKNOWN: