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

Commit 2092162b authored by Andy Hung's avatar Andy Hung Committed by Gerrit Code Review
Browse files

Merge changes from topics "24ch Audio HAL", "360RA HAL" 

* changes:
  audio: Add AUDIO_CHANNEL_OUT_22POINT2 constant
  audio: Add AUDIO_CHANNEL_OUT_13POINT_360RA constant
parents bc7cfe2b 3cc6843b

audio/7.0/config/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ 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_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

+2 −0
Original line number Diff line number Diff line
@@ -504,6 +504,8 @@ 
            <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_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

+2 −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:
@@ -116,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: