summaryrefslogtreecommitdiffstats
path: root/audio/5.0
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2019-01-22 12:56:56 -0800
committerEric Laurent <elaurent@google.com>2019-01-22 15:45:05 -0800
commitf2b77b0705b0b823e24adeb06d35b526ef640781 (patch)
treef504fcc745d3a9354e1a08b54a890ce49c090ad7 /audio/5.0
parent1f702cac1fea2088b1cd34c9dcaa7cdbddaefb1c (diff)
downloadplatform_hardware_interfaces-f2b77b0705b0b823e24adeb06d35b526ef640781.tar.gz
platform_hardware_interfaces-f2b77b0705b0b823e24adeb06d35b526ef640781.tar.bz2
platform_hardware_interfaces-f2b77b0705b0b823e24adeb06d35b526ef640781.zip
audio: add new audio formats
Add audio format for LHDC Bluetooth codec. Also add missing audio sources and devices in xsd. Bug: 120395342 Test: make Change-Id: Ib55c7d351074d8ef75747bcb1195e1ce15ed8b20
Diffstat (limited to 'audio/5.0')
-rw-r--r--audio/5.0/config/api/current.txt4
-rw-r--r--audio/5.0/config/audio_policy_configuration.xsd4
2 files changed, 8 insertions, 0 deletions
diff --git a/audio/5.0/config/api/current.txt b/audio/5.0/config/api/current.txt
index d4469f8b28..17f38c1647 100644
--- a/audio/5.0/config/api/current.txt
+++ b/audio/5.0/config/api/current.txt
@@ -20,8 +20,10 @@ package audio.policy.configuration.V5_0 {
enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_COMMUNICATION;
enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_DEFAULT;
enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_DGTL_DOCK_HEADSET;
+ enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_ECHO_REFERENCE;
enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_FM_TUNER;
enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_HDMI;
+ enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_HDMI_ARC;
enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_IP;
enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_LINE;
enum_constant public static final audio.policy.configuration.V5_0.AudioDevice AUDIO_DEVICE_IN_LOOPBACK;
@@ -128,6 +130,8 @@ package audio.policy.configuration.V5_0 {
enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_HE_AAC_V2;
enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_IEC61937;
enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_LDAC;
+ enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_LHDC;
+ enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_LHDC_LL;
enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_MAT_1_0;
enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_MAT_2_0;
enum_constant public static final audio.policy.configuration.V5_0.AudioFormat AUDIO_FORMAT_MAT_2_1;
diff --git a/audio/5.0/config/audio_policy_configuration.xsd b/audio/5.0/config/audio_policy_configuration.xsd
index d85f9c2a96..ee3a437d1d 100644
--- a/audio/5.0/config/audio_policy_configuration.xsd
+++ b/audio/5.0/config/audio_policy_configuration.xsd
@@ -277,6 +277,8 @@
<xs:enumeration value="AUDIO_DEVICE_IN_PROXY"/>
<xs:enumeration value="AUDIO_DEVICE_IN_USB_HEADSET"/>
<xs:enumeration value="AUDIO_DEVICE_IN_BLUETOOTH_BLE"/>
+ <xs:enumeration value="AUDIO_DEVICE_IN_HDMI_ARC"/>
+ <xs:enumeration value="AUDIO_DEVICE_IN_ECHO_REFERENCE"/>
<xs:enumeration value="AUDIO_DEVICE_IN_DEFAULT"/>
<xs:enumeration value="AUDIO_DEVICE_IN_STUB"/>
</xs:restriction>
@@ -370,6 +372,8 @@
<xs:enumeration value="AUDIO_FORMAT_AAC_LATM_HE_V2"/>
<xs:enumeration value="AUDIO_FORMAT_CELT"/>
<xs:enumeration value="AUDIO_FORMAT_APTX_ADAPTIVE"/>
+ <xs:enumeration value="AUDIO_FORMAT_LHDC"/>
+ <xs:enumeration value="AUDIO_FORMAT_LHDC_LL"/>
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="extendableAudioFormat">