Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ac9d844 authored by François Gaffie's avatar François Gaffie Committed by Eric Laurent
Browse files

audio policy: engine configurable: improve accessibility volume 



This is the counter part patch of 28d09f06
for configurable engine verion based on the parameter framework.

It solves:
regressions caused by the introduction of accessibility stream type and strategy in M.

- change the way ACCESSIBILITY usage maps to a given strategy: always map
 to strategy ACCESSIBILITY but implement a specific device selection for
strategy ACCESSIBILITY in getDeviceForStrategy(). This makes sure that
 accessibility prompts always use ACCESSIBILITY stream type.

- optimize getDeviceForStrategy() to avoid reloading the list of outputs
and devices from the observer when called recursively.

-  make sure that all volume APIs also take into account ACCESSIBILITY stream
when called for MUSIC stream. Generalize the concept of matching strategies
for straqegies that should be considered equivalent for volume control.

Bug: 25067903
Bug: 25616373

Change-Id: Ie674e6bfb5d1b25f71a9fd31cd2405c263b1732b
Signed-off-by: default avatarFrançois Gaffie <francois.gaffie@intel.com>
parent e358ea3f

services/audiopolicy/engineconfigurable/parameter-framework/example/Settings/PolicyConfigurableDomains.xml

+528 −39

File changed.

Preview size limit exceeded, changes collapsed.

services/audiopolicy/engineconfigurable/parameter-framework/example/Settings/device_for_strategy_accessibility.pfw

+308 −20
Original line number Diff line number Diff line
@@ -2,9 +2,10 @@ supDomain: DeviceForStrategy 


	supDomain: Accessibility

		#

		# @FIXME: STRATEGY_ACCESSIBILITY follows STRATEGY_MEDIA for now

		# STRATEGY_ACCESSIBILITY follows STRATEGY_PHONE if in call widely speaking

		# STRATEGY_ACCESSIBILITY follows STRATEGY_MEDIA otherwise

		#

		# @FIXME: How to disable HDMI if !audio_is_linear_pcm other than programmatically???

		# Other case are handled programmatically has involving activity of streams.

		#

		domain: UnreachableDevices

			conf: Calibration
@@ -14,21 +15,26 @@ supDomain: DeviceForStrategy 
					aux_line = 0

					fm = 0

					speaker_safe = 0

					earpiece = 0

					bluetooth_sco = 0

					bluetooth_sco_headset = 0

					bluetooth_sco_carkit = 0

					telephony_tx = 0



		domain: Device2

		domain: Device

			conf: RemoteSubmix

				#

				# Accessibility follows Media strategy if not in call

				#

				TelephonyMode IsNot InCall

				TelephonyMode IsNot InCommunication

				AvailableOutputDevices Includes RemoteSubmix



				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask

					remote_submix = 1

					earpiece = 0

					bluetooth_a2dp = 0

					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					bluetooth_sco_headset = 0

					bluetooth_sco_carkit = 0

					bluetooth_sco = 0

					speaker = 0

					wired_headset = 0

					wired_headphone = 0
@@ -40,14 +46,23 @@ supDomain: DeviceForStrategy 
					hdmi = 0



			conf: BluetoothA2dp

				#

				# Accessibility falls through media strategy if not in call (widely speaking)

				#

				TelephonyMode IsNot InCall

				TelephonyMode IsNot InCommunication

				ForceUseForMedia IsNot ForceNoBtA2dp

				AvailableOutputDevices Includes BluetoothA2dp



				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask

					remote_submix = 0

					earpiece = 0

					bluetooth_a2dp = 1

					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					bluetooth_sco_headset = 0

					bluetooth_sco_carkit = 0

					bluetooth_sco = 0

					speaker = 0

					wired_headset = 0

					wired_headphone = 0
@@ -59,14 +74,23 @@ supDomain: DeviceForStrategy 
					hdmi = 0



			conf: BluetoothA2dpHeadphone

				#

				# Accessibility falls through media strategy if not in call (widely speaking)

				#

				TelephonyMode IsNot InCall

				TelephonyMode IsNot InCommunication

				ForceUseForMedia IsNot ForceNoBtA2dp

				AvailableOutputDevices Includes BluetoothA2dpHeadphones



				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask

					remote_submix = 0

					earpiece = 0

					bluetooth_a2dp = 0

					bluetooth_a2dp_headphones = 1

					bluetooth_a2dp_speaker = 0

					bluetooth_sco_headset = 0

					bluetooth_sco_carkit = 0

					bluetooth_sco = 0

					speaker = 0

					wired_headset = 0

					wired_headphone = 0
@@ -78,14 +102,23 @@ supDomain: DeviceForStrategy 
					hdmi = 0



			conf: BluetoothA2dpSpeaker

				#

				# Accessibility falls through media strategy if not in call (widely speaking)

				#

				ForceUseForMedia IsNot ForceNoBtA2dp

				TelephonyMode IsNot InCall

				TelephonyMode IsNot InCommunication

				AvailableOutputDevices Includes BluetoothA2dpSpeaker



				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask

					remote_submix = 0

					earpiece = 0

					bluetooth_a2dp = 0

					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 1

					bluetooth_sco_headset = 0

					bluetooth_sco_carkit = 0

					bluetooth_sco = 0

					speaker = 0

					wired_headset = 0

					wired_headphone = 0
@@ -96,15 +129,24 @@ supDomain: DeviceForStrategy 
					usb_device = 0

					hdmi = 0



			conf: ForceSpeaker

			conf: ForceSpeakerWhenNotInCall

				#

				# Accessibility follows Media strategy if not in call

				#

				TelephonyMode IsNot InCall

				TelephonyMode IsNot InCommunication

				ForceUseForMedia Is ForceSpeaker

				AvailableOutputDevices Includes Speaker



				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask

					remote_submix = 0

					earpiece = 0

					bluetooth_a2dp = 0

					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					bluetooth_sco_headset = 0

					bluetooth_sco_carkit = 0

					bluetooth_sco = 0

					speaker = 1

					wired_headset = 0

					wired_headphone = 0
@@ -115,14 +157,120 @@ supDomain: DeviceForStrategy 
					usb_device = 0

					hdmi = 0



			conf: BluetoothScoCarkit

				#

				# accessibility falls through Phone strategy if in call

				#

				ANY

					TelephonyMode Is InCall

					TelephonyMode Is InCommunication

				AvailableOutputDevices Includes BluetoothScoCarkit

				ForceUseForCommunication Is ForceBtSco



				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask

					remote_submix = 0

					earpiece = 0

					bluetooth_a2dp = 0

					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					bluetooth_sco_headset = 0

					bluetooth_sco_carkit = 1

					bluetooth_sco = 0

					speaker = 0

					wired_headset = 0

					wired_headphone = 0

					line = 0

					angl_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0

					hdmi = 0



			conf: BluetoothScoHeadset

				#

				# accessibility falls through Phone strategy if in call

				#

				ANY

					TelephonyMode Is InCall

					TelephonyMode Is InCommunication

				AvailableOutputDevices Includes BluetoothScoHeadset

				ForceUseForCommunication Is ForceBtSco



				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask

					remote_submix = 0

					earpiece = 0

					bluetooth_a2dp = 0

					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					bluetooth_sco_headset = 1

					bluetooth_sco_carkit = 0

					bluetooth_sco = 0

					speaker = 0

					wired_headset = 0

					wired_headphone = 0

					line = 0

					angl_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0

					hdmi = 0



			conf: BluetoothSco

				#

				# accessibility falls through Phone strategy if in call

				#

				ANY

					TelephonyMode Is InCall

					TelephonyMode Is InCommunication

				AvailableOutputDevices Includes BluetoothSco

				ForceUseForCommunication Is ForceBtSco



				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask

					remote_submix = 0

					earpiece = 0

					bluetooth_a2dp = 0

					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					bluetooth_sco_headset = 0

					bluetooth_sco_carkit = 0

					bluetooth_sco = 1

					speaker = 0

					wired_headset = 0

					wired_headphone = 0

					line = 0

					angl_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0

					hdmi = 0



			conf: WiredHeadphone

				ANY

					#

					# accessibility falls through Phone strategy if in call

					#

					ALL

						ANY

							TelephonyMode Is InCall

							TelephonyMode Is InCommunication

						ForceUseForCommunication IsNot ForceSpeaker

					#

					# accessibility follows Media strategy if not in call

					#

					ALL

						TelephonyMode IsNot InCall

						TelephonyMode IsNot InCommunication

				AvailableOutputDevices Includes WiredHeadphone



				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask

					remote_submix = 0

					earpiece = 0

					bluetooth_a2dp = 0

					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					bluetooth_sco_headset = 0

					bluetooth_sco_carkit = 0

					bluetooth_sco = 0

					speaker = 0

					wired_headset = 0

					wired_headphone = 1
@@ -134,13 +282,31 @@ supDomain: DeviceForStrategy 
					hdmi = 0



			conf: Line

				ANY

					#

					# accessibility falls through Phone strategy if in call

					# but Line has a lower priority than WiredHeadset in this case.

					#

					ALL

						ANY

							TelephonyMode Is InCall

							TelephonyMode Is InCommunication

						ForceUseForCommunication IsNot ForceSpeaker

						AvailableOutputDevices Excludes WiredHeadset

					#

					# accessibility follows Media strategy if not in call

					#

				AvailableOutputDevices Includes Line



				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask

					remote_submix = 0

					earpiece = 0

					bluetooth_a2dp = 0

					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					bluetooth_sco_headset = 0

					bluetooth_sco_carkit = 0

					bluetooth_sco = 0

					speaker = 0

					wired_headset = 0

					wired_headphone = 0
@@ -152,13 +318,32 @@ supDomain: DeviceForStrategy 
					hdmi = 0



			conf: WiredHeadset

				ANY

					#

					# accessibility falls through Phone strategy if in call

					#

					ALL

						ANY

							TelephonyMode Is InCall

							TelephonyMode Is InCommunication

						ForceUseForCommunication IsNot ForceSpeaker

					#

					# accessibility follows Media strategy if not in call

					#

					ALL

						TelephonyMode IsNot InCall

						TelephonyMode IsNot InCommunication

				AvailableOutputDevices Includes WiredHeadset



				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask

					remote_submix = 0

					earpiece = 0

					bluetooth_a2dp = 0

					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					bluetooth_sco_headset = 0

					bluetooth_sco_carkit = 0

					bluetooth_sco = 0

					speaker = 0

					wired_headset = 1

					wired_headphone = 0
@@ -169,50 +354,97 @@ supDomain: DeviceForStrategy 
					usb_device = 0

					hdmi = 0



			conf: UsbAccessory

				AvailableOutputDevices Includes UsbAccessory

			conf: UsbDevice

				ANY

					#

					# accessibility falls through Phone strategy if in call (widely speaking)

					#

					ALL

						ANY

							TelephonyMode Is InCall

							TelephonyMode Is InCommunication

						ForceUseForCommunication IsNot ForceSpeaker

					#

					# accessibility follows Media strategy if not in call

					# Media strategy inverts the priority of USB device vs accessory

					#

					ALL

						TelephonyMode IsNot InCall

						TelephonyMode IsNot InCommunication

						AvailableOutputDevices Excludes UsbAccessory

						ForceUseForCommunication Is ForceSpeaker

				AvailableOutputDevices Includes UsbDevice



				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask

					remote_submix = 0

					earpiece = 0

					bluetooth_a2dp = 0

					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					bluetooth_sco_headset = 0

					bluetooth_sco_carkit = 0

					bluetooth_sco = 0

					speaker = 0

					wired_headset = 0

					wired_headphone = 0

					line = 0

					angl_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 1

					usb_device = 0

					usb_accessory = 0

					usb_device = 1

					hdmi = 0



			conf: UsbDevice

				AvailableOutputDevices Includes UsbDevice

			conf: UsbAccessory

				#

				# accessibility falls through Phone strategy if in call (widely speaking)

				# but USB accessory not reachable in call

				#

				# accessibility follows Media strategy if not in call

				# Media strategy inverts the priority of USB device vs accessory

				#

				TelephonyMode IsNot InCall

				TelephonyMode IsNot InCommunication

				AvailableOutputDevices Includes UsbAccessory



				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask

					remote_submix = 0

					earpiece = 0

					bluetooth_a2dp = 0

					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					bluetooth_sco_headset = 0

					bluetooth_sco_carkit = 0

					bluetooth_sco = 0

					speaker = 0

					wired_headset = 0

					wired_headphone = 0

					line = 0

					angl_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 1

					usb_accessory = 1

					usb_device = 0

					hdmi = 0



			conf: DgtlDockHeadset

				#

				# accessibility falls through Phone strategy if in call (widely speaking)

				# but DgtlDockHeadset not reachable in call

				#

				# accessibility follows Media strategy if not in call

				#

				TelephonyMode IsNot InCall

				TelephonyMode IsNot InCommunication

				AvailableOutputDevices Includes DgtlDockHeadset



				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask

					remote_submix = 0

					earpiece = 0

					bluetooth_a2dp = 0

					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					bluetooth_sco_headset = 0

					bluetooth_sco_carkit = 0

					bluetooth_sco = 0

					speaker = 0

					wired_headset = 0

					wired_headphone = 0
@@ -225,19 +457,24 @@ supDomain: DeviceForStrategy 


			conf: AuxDigital

				#

				# Do not route accessibility prompts to a digital output currently configured with a

				# compressed format as they would likely not be mixed and dropped.

				# accessibility falls through Phone strategy if in call (widely speaking)

				# but Hdmi not reachable in call

				#

				# @TODO How to translate the following condition(???)

				# desc->isActive() && !audio_is_linear_pcm(desc->mFormat) && devices != AUDIO_DEVICE_NONE

				# accessibility follows Media strategy if not in call

				#

				TelephonyMode IsNot InCall

				TelephonyMode IsNot InCommunication

				AvailableOutputDevices Includes Hdmi



				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask

					remote_submix = 0

					earpiece = 0

					bluetooth_a2dp = 0

					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					bluetooth_sco_headset = 0

					bluetooth_sco_carkit = 0

					bluetooth_sco = 0

					speaker = 0

					wired_headset = 0

					wired_headphone = 0
@@ -249,14 +486,27 @@ supDomain: DeviceForStrategy 
					hdmi = 1



			conf: AnlgDockHeadset

				#

				# accessibility falls through Phone strategy if in call (widely speaking)

				# but AnlgDockHeadset not reachable in call

				#

				# accessibility follows Media strategy if not in call

				# Media strategy inverts the priority of USB device vs accessory

				#

				TelephonyMode IsNot InCall

				TelephonyMode IsNot InCommunication

				AvailableOutputDevices Includes AnlgDockHeadset

				ForceUseForDock Is ForceAnalogDock



				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask

					remote_submix = 0

					earpiece = 0

					bluetooth_a2dp = 0

					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					bluetooth_sco_headset = 0

					bluetooth_sco_carkit = 0

					bluetooth_sco = 0

					speaker = 0

					wired_headset = 0

					wired_headphone = 0
@@ -267,14 +517,47 @@ supDomain: DeviceForStrategy 
					usb_device = 0

					hdmi = 0



			conf: Earpiece

				#

				# accessibility falls through Phone strategy if in call

				#

				ANY

					TelephonyMode Is InCall

					TelephonyMode Is InCommunication

				AvailableOutputDevices Includes Earpiece

				ForceUseForCommunication IsNot ForceSpeaker



				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask

					remote_submix = 0

					earpiece = 1

					bluetooth_a2dp = 0

					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					bluetooth_sco_headset = 0

					bluetooth_sco_carkit = 0

					bluetooth_sco = 0

					speaker = 0

					wired_headset = 0

					wired_headphone = 0

					line = 0

					angl_dock_headset = 0

					dgtl_dock_headset = 0

					usb_accessory = 0

					usb_device = 0

					hdmi = 0



			conf: Speaker

				AvailableOutputDevices Includes Speaker



				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask

					remote_submix = 0

					earpiece = 0

					bluetooth_a2dp = 0

					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					bluetooth_sco_headset = 0

					bluetooth_sco_carkit = 0

					bluetooth_sco = 0

					speaker = 1

					wired_headset = 0

					wired_headphone = 0
@@ -288,9 +571,13 @@ supDomain: DeviceForStrategy 
			conf: Default

				component: /Policy/policy/strategies/accessibility/selected_output_devices/mask

					remote_submix = 0

					earpiece = 0

					bluetooth_a2dp = 0

					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 0

					bluetooth_sco_headset = 0

					bluetooth_sco_carkit = 0

					bluetooth_sco = 0

					speaker = 0

					wired_headset = 0

					wired_headphone = 0
@@ -300,3 +587,4 @@ supDomain: DeviceForStrategy 
					usb_accessory = 0

					usb_device = 0

					hdmi = 0

services/audiopolicy/engineconfigurable/src/Engine.cpp

+8 −9
Original line number Diff line number Diff line
@@ -140,15 +140,6 @@ Property Engine::getPropertyForKey(Key key) const 


routing_strategy Engine::ManagerInterfaceImpl::getStrategyForUsage(audio_usage_t usage)

{

    const SwAudioOutputCollection &outputs = mPolicyEngine->mApmObserver->getOutputs();



    //FIXME: getStrategyForUsage() should return STRATEGY_ACCESSIBILITY and getDeviceForStrategy()

    // should be implemented accordingly for STRATEGY_ACCESSIBILITY

    if (usage == AUDIO_USAGE_ASSISTANCE_ACCESSIBILITY &&

            (outputs.isStreamActive(AUDIO_STREAM_RING) ||

             outputs.isStreamActive(AUDIO_STREAM_ALARM))) {

        return STRATEGY_SONIFICATION;

    }

    return mPolicyEngine->getPropertyForKey<routing_strategy, audio_usage_t>(usage);

}
@@ -173,6 +164,14 @@ audio_devices_t Engine::ManagerInterfaceImpl::getDeviceForStrategy(routing_strat 
            outputs.isStreamActive(AUDIO_STREAM_MUSIC, SONIFICATION_RESPECTFUL_AFTER_MUSIC_DELAY)) {

        return mPolicyEngine->getPropertyForKey<audio_devices_t, routing_strategy>(STRATEGY_MEDIA);

    }

    if (strategy == STRATEGY_ACCESSIBILITY &&

        (outputs.isStreamActive(AUDIO_STREAM_RING) || outputs.isStreamActive(AUDIO_STREAM_ALARM))) {

            // do not route accessibility prompts to a digital output currently configured with a

            // compressed format as they would likely not be mixed and dropped.

            // Device For Sonification conf file has HDMI, SPDIF and HDMI ARC unreacheable.

        return mPolicyEngine->getPropertyForKey<audio_devices_t, routing_strategy>(

                    STRATEGY_SONIFICATION);

    }

    return mPolicyEngine->getPropertyForKey<audio_devices_t, routing_strategy>(strategy);

}