From 91ef183cf75d849272746dc966b9c5a99faa6fb9 Mon Sep 17 00:00:00 2001 From: Kei Murayama Date: Tue, 13 Apr 2021 20:48:02 +0900 Subject: [PATCH 1/2] 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 --- audio/7.0/config/api/current.txt | 1 + audio/7.0/config/audio_policy_configuration.xsd | 1 + .../include/android_audio_policy_configuration_V7_0-enums.h | 1 + 3 files changed, 3 insertions(+) diff --git a/audio/7.0/config/api/current.txt b/audio/7.0/config/api/current.txt index eb8c2dd35e..d4be9aea9c 100644 --- a/audio/7.0/config/api/current.txt +++ b/audio/7.0/config/api/current.txt @@ -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; diff --git a/audio/7.0/config/audio_policy_configuration.xsd b/audio/7.0/config/audio_policy_configuration.xsd index 007e2501cf..0753fea384 100644 --- a/audio/7.0/config/audio_policy_configuration.xsd +++ b/audio/7.0/config/audio_policy_configuration.xsd @@ -504,6 +504,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 7d83556895..30e45897a1 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 @@ -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: From 3cc6843bd5048189e113de6332fbb49e9b4e7d0d Mon Sep 17 00:00:00 2001 From: Andy Hung Date: Thu, 15 Apr 2021 17:37:22 -0700 Subject: [PATCH 2/2] audio: Add AUDIO_CHANNEL_OUT_22POINT2 constant 24 channel configuration for immersive audio See new value in system/media/audio/audio-hal-enums.h. Define the same enum to HALv7 and update getChannelCount(). Test: atest android.hardware.audio.common@7.0-util_tests Bug: 185530406 Change-Id: I8dc5e6c504049908fef157b11ffa043ecaeacaf9 --- audio/7.0/config/api/current.txt | 1 + audio/7.0/config/audio_policy_configuration.xsd | 1 + .../include/android_audio_policy_configuration_V7_0-enums.h | 1 + 3 files changed, 3 insertions(+) diff --git a/audio/7.0/config/api/current.txt b/audio/7.0/config/api/current.txt index d4be9aea9c..b5b3925cf3 100644 --- a/audio/7.0/config/api/current.txt +++ b/audio/7.0/config/api/current.txt @@ -46,6 +46,7 @@ package android.audio.policy.configuration.V7_0 { 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; diff --git a/audio/7.0/config/audio_policy_configuration.xsd b/audio/7.0/config/audio_policy_configuration.xsd index 0753fea384..4f5614bbd3 100644 --- a/audio/7.0/config/audio_policy_configuration.xsd +++ b/audio/7.0/config/audio_policy_configuration.xsd @@ -505,6 +505,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 30e45897a1..fe3e4ea615 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 @@ -117,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: