From 3c5fcc51f52a188739079ad2b78dc7da32c13ba0 Mon Sep 17 00:00:00 2001 From: Andy Hung Date: Tue, 6 Apr 2021 10:16:48 -0700 Subject: [PATCH 1/3] Audio: Add AUDIO_FORMAT_DTS_UHD See ETSI TS 103 491 V1.2.1 (2019-05) DTS-UHD Audio Format; Delivery of Channels, Objects and Ambisonic Sound Fields Test: atest AudioFormatTest Bug: 184538197 Merged-In: I4123efb29a95a599982af85068f8e4468ff15159 Change-Id: I4123efb29a95a599982af85068f8e4468ff15159 --- audio/7.0/config/api/current.txt | 1 + audio/7.0/config/audio_policy_configuration.xsd | 1 + 2 files changed, 2 insertions(+) diff --git a/audio/7.0/config/api/current.txt b/audio/7.0/config/api/current.txt index b5b3925cf3..b4ad338cc5 100644 --- a/audio/7.0/config/api/current.txt +++ b/audio/7.0/config/api/current.txt @@ -211,6 +211,7 @@ package android.audio.policy.configuration.V7_0 { enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_DSD; enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_DTS; enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_DTS_HD; + enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_DTS_UHD; enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_EVRC; enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_EVRCB; enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_EVRCNW; diff --git a/audio/7.0/config/audio_policy_configuration.xsd b/audio/7.0/config/audio_policy_configuration.xsd index 4f5614bbd3..7b0d8978d4 100644 --- a/audio/7.0/config/audio_policy_configuration.xsd +++ b/audio/7.0/config/audio_policy_configuration.xsd @@ -411,6 +411,7 @@ + From 1f90e1fbf82b01f9f305cf35feedd6016064221e Mon Sep 17 00:00:00 2001 From: Andy Hung Date: Thu, 8 Apr 2021 18:36:17 -0700 Subject: [PATCH 2/3] audio: Add device constants for HDMI EARC Implementation check by grep -E -r "HDMI_ARC|HDMI_EARC" . Test: atest AudioDeviceInfoTest Bug: 131385398 Bug: 151781316 Merged-In: Idfe27b468a9f09770a31b6b58d83de77bebc6c80 Change-Id: Idfe27b468a9f09770a31b6b58d83de77bebc6c80 --- audio/7.0/config/api/current.txt | 2 ++ audio/7.0/config/audio_policy_configuration.xsd | 2 ++ .../include/android_audio_policy_configuration_V7_0-enums.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/audio/7.0/config/api/current.txt b/audio/7.0/config/api/current.txt index b4ad338cc5..3d3f6c3d79 100644 --- a/audio/7.0/config/api/current.txt +++ b/audio/7.0/config/api/current.txt @@ -106,6 +106,7 @@ package android.audio.policy.configuration.V7_0 { enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_IN_FM_TUNER; enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_IN_HDMI; enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_IN_HDMI_ARC; + enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_IN_HDMI_EARC; enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_IN_IP; enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_IN_LINE; enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_IN_LOOPBACK; @@ -140,6 +141,7 @@ package android.audio.policy.configuration.V7_0 { enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_OUT_FM; enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_OUT_HDMI; enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_OUT_HDMI_ARC; + enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_OUT_HDMI_EARC; enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_OUT_HEARING_AID; enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_OUT_IP; enum_constant public static final android.audio.policy.configuration.V7_0.AudioDevice AUDIO_DEVICE_OUT_LINE; diff --git a/audio/7.0/config/audio_policy_configuration.xsd b/audio/7.0/config/audio_policy_configuration.xsd index 7b0d8978d4..ba1cd92028 100644 --- a/audio/7.0/config/audio_policy_configuration.xsd +++ b/audio/7.0/config/audio_policy_configuration.xsd @@ -252,6 +252,7 @@ + @@ -303,6 +304,7 @@ + diff --git a/audio/common/7.0/enums/include/android_audio_policy_configuration_V7_0-enums.h b/audio/common/7.0/enums/include/android_audio_policy_configuration_V7_0-enums.h index fe3e4ea615..a92a277471 100644 --- a/audio/common/7.0/enums/include/android_audio_policy_configuration_V7_0-enums.h +++ b/audio/common/7.0/enums/include/android_audio_policy_configuration_V7_0-enums.h @@ -157,6 +157,7 @@ static inline bool isOutputDevice(AudioDevice device) { case AudioDevice::AUDIO_DEVICE_OUT_TELEPHONY_TX: case AudioDevice::AUDIO_DEVICE_OUT_LINE: case AudioDevice::AUDIO_DEVICE_OUT_HDMI_ARC: + case AudioDevice::AUDIO_DEVICE_OUT_HDMI_EARC: case AudioDevice::AUDIO_DEVICE_OUT_SPDIF: case AudioDevice::AUDIO_DEVICE_OUT_FM: case AudioDevice::AUDIO_DEVICE_OUT_AUX_LINE: @@ -199,6 +200,7 @@ static inline bool isOutputDevice(AudioDevice device) { case AudioDevice::AUDIO_DEVICE_IN_USB_HEADSET: case AudioDevice::AUDIO_DEVICE_IN_BLUETOOTH_BLE: case AudioDevice::AUDIO_DEVICE_IN_HDMI_ARC: + case AudioDevice::AUDIO_DEVICE_IN_HDMI_EARC: case AudioDevice::AUDIO_DEVICE_IN_ECHO_REFERENCE: case AudioDevice::AUDIO_DEVICE_IN_BLE_HEADSET: case AudioDevice::AUDIO_DEVICE_IN_DEFAULT: From 6ce19700eb4076bf970c3365585719325657de45 Mon Sep 17 00:00:00 2001 From: Andy Hung Date: Tue, 20 Apr 2021 19:22:22 -0700 Subject: [PATCH 3/3] Audio: Add AUDIO_FORMAT_DRA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit China DTMB digital TV. See SJ/T11368-2006 “Specification for multichannel digital audio coding technology”. Test: atest AudioFormatTest Bug: 185950819 Merged-In: I941c4991e598e864babfb888a8827d1625d95990 Change-Id: I941c4991e598e864babfb888a8827d1625d95990 --- audio/7.0/config/api/current.txt | 1 + audio/7.0/config/audio_policy_configuration.xsd | 1 + 2 files changed, 2 insertions(+) diff --git a/audio/7.0/config/api/current.txt b/audio/7.0/config/api/current.txt index 3d3f6c3d79..c2585bd8b0 100644 --- a/audio/7.0/config/api/current.txt +++ b/audio/7.0/config/api/current.txt @@ -210,6 +210,7 @@ package android.audio.policy.configuration.V7_0 { enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_CELT; enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_DEFAULT; enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_DOLBY_TRUEHD; + enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_DRA; enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_DSD; enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_DTS; enum_constant public static final android.audio.policy.configuration.V7_0.AudioFormat AUDIO_FORMAT_DTS_HD; diff --git a/audio/7.0/config/audio_policy_configuration.xsd b/audio/7.0/config/audio_policy_configuration.xsd index ba1cd92028..e0df3599c7 100644 --- a/audio/7.0/config/audio_policy_configuration.xsd +++ b/audio/7.0/config/audio_policy_configuration.xsd @@ -414,6 +414,7 @@ +