Merge "Add haptic channel mask." (31500204) · Commits · e / os / android_hardware_interfaces

audio/common/5.0/types.hal

+16 −0

Original line number	Diff line number	Diff line
		@@ -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 */