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

Commit f3283809 authored by Mikhail Naganov's avatar Mikhail Naganov Committed by Android (Google) Code Review
Browse files

Merge "audio: Add APTX_TWSP audio format"

parents 996b0b19 aa5d4910

audio/5.0/config/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ package audio.policy.configuration.V5_0 { 
    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_APTX;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_APTX_ADAPTIVE;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_APTX_HD;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_APTX_TWSP;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_CELT;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_DOLBY_TRUEHD;

    enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_DSD;

audio/5.0/config/audio_policy_configuration.xsd

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

            <xs:enumeration value="AUDIO_FORMAT_LHDC"/>

            <xs:enumeration value="AUDIO_FORMAT_LHDC_LL"/>

            <xs:enumeration value="AUDIO_FORMAT_APTX_TWSP"/>

        </xs:restriction>

    </xs:simpleType>

    <xs:simpleType name="extendableAudioFormat">

audio/common/5.0/types.hal

+1 −0
Original line number Diff line number Diff line
@@ -240,6 +240,7 @@ enum AudioFormat : uint32_t { 
    APTX_ADAPTIVE       = 0x27000000UL,

    LHDC                = 0x28000000UL,

    LHDC_LL             = 0x29000000UL,

    APTX_TWSP           = 0x2A000000UL,



    /** Deprecated */

    MAIN_MASK           = 0xFF000000UL,

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ e05e48c583de14c1e5a6fa9d48ea50244e3e0924b76b342374e7471dc8007ba9 android.hardwar 
9471b12b1c255bb530695720bc4174bd74987b75b1f820854af8944bc8c215c9 android.hardware.audio@5.0::IStreamOut

1b0500367ed2b32a841667ac3200edf3d3a164e8004aca445ff1b085ac831e93 android.hardware.audio@5.0::IStreamOutCallback

83e365479cc77d8717c155e1787ee668cd2ae4c557b467cf75b8e7cd53697ad8 android.hardware.audio@5.0::types

c25ae57a9197fdf83aa6f7b31ab1ac4922dea4f19f92cdb1f9013ad49fa56594 android.hardware.audio.common@5.0::types

a0df6961e65444e1ca40a206d7f31304d313e8b7e5b122855e3272ab02720cd4 android.hardware.audio.common@5.0::types

f269297866765b95ddd1825676cc8a772f0c7c9863286df596fc302781a42ff5 android.hardware.audio.effect@5.0::IAcousticEchoCancelerEffect

fa187b602d8939644ef708ed7627f2e3deac97899a4bda1de07f2ff126abe243 android.hardware.audio.effect@5.0::IAutomaticGainControlEffect

e1bf864ccb8458c0da1dcc74a2e748b1dca8ac360df590591cf82d98292d7981 android.hardware.audio.effect@5.0::IBassBoostEffect