From df0f1c1e615afacf109c0957f6262a6de233d5a7 Mon Sep 17 00:00:00 2001 From: jiabin Date: Tue, 4 Dec 2018 11:09:03 -0800 Subject: [PATCH] Add haptic channel mask. Bug: 111454766 Test: build Change-Id: I00c28aa02473ce83b0d9b404b5cf33410c73a2c8 --- audio/common/5.0/types.hal | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/audio/common/5.0/types.hal b/audio/common/5.0/types.hal index 2ce2929dce..e5919cbc22 100644 --- a/audio/common/5.0/types.hal +++ b/audio/common/5.0/types.hal @@ -376,6 +376,16 @@ enum AudioChannelMask : uint32_t { OUT_TOP_SIDE_LEFT = 0x40000, OUT_TOP_SIDE_RIGHT = 0x80000, + /** + * Haptic channel characteristics are specific to a device and + * only used to play device specific resources (eg: ringtones). + * The HAL can freely map A and B to haptic controllers, the + * framework shall not interpret those values and forward them + * from the device audio assets. + */ + OUT_HAPTIC_A = 0x20000000, + OUT_HAPTIC_B = 0x10000000, + OUT_MONO = OUT_FRONT_LEFT, OUT_STEREO = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT), OUT_2POINT1 = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT | OUT_LOW_FREQUENCY), @@ -423,6 +433,12 @@ enum AudioChannelMask : uint32_t { OUT_7POINT1POINT4 = (OUT_7POINT1 | OUT_TOP_FRONT_LEFT | OUT_TOP_FRONT_RIGHT | OUT_TOP_BACK_LEFT | OUT_TOP_BACK_RIGHT), + OUT_MONO_HAPTIC_A = (OUT_FRONT_LEFT | OUT_HAPTIC_A), + OUT_STEREO_HAPTIC_A = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT | OUT_HAPTIC_A), + OUT_HAPTIC_AB = (OUT_HAPTIC_A | OUT_HAPTIC_B), + OUT_MONO_HAPTIC_AB = (OUT_FRONT_LEFT | OUT_HAPTIC_A | OUT_HAPTIC_B), + OUT_STEREO_HAPTIC_AB = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT | + OUT_HAPTIC_A | OUT_HAPTIC_B), // Note that the 2.0 OUT_ALL* have been moved to helper functions /* These are bits only, not complete values */