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

Commit 91ef183c authored by Kei Murayama's avatar Kei Murayama Committed by Andy Hung
Browse files

audio: Add AUDIO_CHANNEL_OUT_13POINT_360RA constant 

13ch audio constant for 360 Reality Audio.

The enum value is added in system/media/audio/audio-hal-enums.h.
 - Define the same enum to HALv7.
 - Set 13 for the layout from getChannelCount().

Bug: 185100731
Test: Use the value on audio hal and build.
Test: Use the value on audio_policy_configuration.xml and build.
Test: atest android.hardware.audio.common@7.0-util_tests
Change-Id: Ifa37f9be96a94c623e5d4164774c39d05efbbb8b
parent a546efe5

audio/7.0/config/api/current.txt

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

    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_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
@@ -504,6 +504,7 @@ 
            <xs:enumeration value="AUDIO_CHANNEL_OUT_7POINT1"/>

            <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_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
@@ -94,6 +94,7 @@ static inline size_t getChannelCount(AudioChannelMask mask) { 
        case AudioChannelMask::AUDIO_CHANNEL_OUT_7POINT1POINT4:

        case AudioChannelMask::AUDIO_CHANNEL_INDEX_MASK_12:

            return 12;

        case AudioChannelMask::AUDIO_CHANNEL_OUT_13POINT_360RA:

        case AudioChannelMask::AUDIO_CHANNEL_INDEX_MASK_13:

            return 13;

        case AudioChannelMask::AUDIO_CHANNEL_INDEX_MASK_14: