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

Commit 9792ec37 authored by François Gaffie's avatar François Gaffie Committed by Eric Laurent
Browse files

audio policy: engine configurable: update example PFW files 



This patch updates the PFW files given as example.
-it adapts to N-definition
-fixes some bugs

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

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

+75 −13
Original line number Diff line number Diff line
@@ -52,18 +52,21 @@ 
      <Configuration Name="BluetoothA2dp">

        <CompoundRule Type="All">

          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>

          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceBtSco"/>

          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dp"/>

        </CompoundRule>

      </Configuration>

      <Configuration Name="BluetoothA2dpHeadphone">

        <CompoundRule Type="All">

          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>

          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceBtSco"/>

          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpHeadphones"/>

        </CompoundRule>

      </Configuration>

      <Configuration Name="BluetoothA2dpSpeaker">

        <CompoundRule Type="All">

          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>

          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceBtSco"/>

          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="BluetoothA2dpSpeaker"/>

        </CompoundRule>

      </Configuration>
@@ -119,6 +122,7 @@ 
        <CompoundRule Type="All">

          <SelectionCriterionRule SelectionCriterion="AvailableOutputDevices" MatchesWhen="Includes" Value="Speaker"/>

          <SelectionCriterionRule SelectionCriterion="ForceUseForHdmiSystemAudio" MatchesWhen="IsNot" Value="ForceHdmiSystemEnforced"/>

          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="IsNot" Value="ForceBtSco"/>

        </CompoundRule>

      </Configuration>

      <Configuration Name="Default">
@@ -902,11 +906,8 @@ 
          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>

          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>

          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>

          <CompoundRule Type="Any">

            <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>

          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceNone"/>

        </CompoundRule>

        </CompoundRule>

      </Configuration>

      <Configuration Name="BluetoothA2dpHeadphones">

        <CompoundRule Type="All">
@@ -914,11 +915,8 @@ 
          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCall"/>

          <SelectionCriterionRule SelectionCriterion="TelephonyMode" MatchesWhen="IsNot" Value="InCommunication"/>

          <SelectionCriterionRule SelectionCriterion="ForceUseForMedia" MatchesWhen="IsNot" Value="ForceNoBtA2dp"/>

          <CompoundRule Type="Any">

            <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceBtSco"/>

          <SelectionCriterionRule SelectionCriterion="ForceUseForCommunication" MatchesWhen="Is" Value="ForceNone"/>

        </CompoundRule>

        </CompoundRule>

      </Configuration>

      <Configuration Name="BluetoothA2dpSpeaker">

        <CompoundRule Type="All">
@@ -1314,10 +1312,10 @@ 
          <BitParameter Name="bluetooth_a2dp">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_headphones">

          <BitParameter Name="bluetooth_a2dp_headphones">1</BitParameter>

          <BitParameter Name="bluetooth_a2dp_headphones">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/bluetooth_a2dp_speaker">

          <BitParameter Name="bluetooth_a2dp_speaker">0</BitParameter>

          <BitParameter Name="bluetooth_a2dp_speaker">1</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/hdmi">

          <BitParameter Name="hdmi">0</BitParameter>
@@ -1924,7 +1922,7 @@ 
          <BitParameter Name="line">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/strategies/phone/selected_output_devices/mask/speaker">

          <BitParameter Name="speaker">0</BitParameter>

          <BitParameter Name="speaker">1</BitParameter>

        </ConfigurableElement>

      </Configuration>

    </Settings>
@@ -8197,6 +8195,22 @@ 
      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/spdif"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bluetooth_a2dp"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/loopback"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/in"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/communication"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/ambient"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/hdmi"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/telephony_rx"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/back_mic"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/remote_submix"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/anlg_dock_headset"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/dgtl_dock_headset"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/usb_accessory"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/fm_tuner"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/tv_tuner"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/line"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/spdif"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/bluetooth_a2dp"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/loopback"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/in"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/communication"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/ambient"/>
@@ -8733,6 +8747,54 @@ 
        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/loopback">

          <BitParameter Name="loopback">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/in">

          <BitParameter Name="in">1</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/communication">

          <BitParameter Name="communication">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/ambient">

          <BitParameter Name="ambient">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/hdmi">

          <BitParameter Name="hdmi">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/telephony_rx">

          <BitParameter Name="telephony_rx">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/back_mic">

          <BitParameter Name="back_mic">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/remote_submix">

          <BitParameter Name="remote_submix">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/anlg_dock_headset">

          <BitParameter Name="anlg_dock_headset">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/dgtl_dock_headset">

          <BitParameter Name="dgtl_dock_headset">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/usb_accessory">

          <BitParameter Name="usb_accessory">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/fm_tuner">

          <BitParameter Name="fm_tuner">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/tv_tuner">

          <BitParameter Name="tv_tuner">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/line">

          <BitParameter Name="line">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/spdif">

          <BitParameter Name="spdif">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/bluetooth_a2dp">

          <BitParameter Name="bluetooth_a2dp">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/loopback">

          <BitParameter Name="loopback">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/in">

          <BitParameter Name="in">1</BitParameter>

        </ConfigurableElement>
@@ -8893,7 +8955,7 @@ 
          <BitParameter Name="bluetooth_a2dp">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/wired_headset">

          <BitParameter Name="wired_headset">1</BitParameter>

          <BitParameter Name="wired_headset">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/usb_device">

          <BitParameter Name="usb_device">0</BitParameter>
@@ -9439,7 +9501,7 @@ 
          <BitParameter Name="usb_device">0</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/builtin_mic">

          <BitParameter Name="builtin_mic">0</BitParameter>

          <BitParameter Name="builtin_mic">1</BitParameter>

        </ConfigurableElement>

        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/back_mic">

          <BitParameter Name="back_mic">0</BitParameter>

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

+22 −2
Original line number Diff line number Diff line
@@ -186,6 +186,23 @@ supDomain: DeviceForInputSource 
				spdif = 0

				bluetooth_a2dp = 0

				loopback = 0

			component: /Policy/policy/input_sources/unprocessed/applicable_input_device/mask

				in = 1

				communication = 0

				ambient = 0

				hdmi = 0

				telephony_rx = 0

				back_mic = 0

				remote_submix = 0

				anlg_dock_headset = 0

				dgtl_dock_headset = 0

				usb_accessory = 0

				fm_tuner = 0

				tv_tuner = 0

				line = 0

				spdif = 0

				bluetooth_a2dp = 0

				loopback = 0

			component: /Policy/policy/input_sources/fm_tuner/applicable_input_device/mask

				in = 1

				communication = 0
@@ -239,7 +256,7 @@ supDomain: DeviceForInputSource 
					bluetooth_sco_headset = 1

				component: mic/applicable_input_device/mask/

					bluetooth_a2dp = 0

					wired_headset = 1

					wired_headset = 0

					usb_device = 0

					builtin_mic = 0

					bluetooth_sco_headset = 1
@@ -484,11 +501,14 @@ supDomain: DeviceForInputSource 
				back_mic = 1



		conf: Default

			#

			# Fallback on the default input device which can be builtin mic for example

			#

			component: /Policy/policy/input_sources/voice_communication/applicable_input_device/mask

				bluetooth_sco_headset = 0

				wired_headset = 0

				usb_device = 0

				builtin_mic = 0

				builtin_mic = 1

				back_mic = 0



	domain: RemoteSubmix

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

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ domainGroup: DeviceForStrategy 


			conf: BluetoothA2dp

				ForceUseForMedia IsNot ForceNoBtA2dp

				ForceUseForCommunication IsNot ForceBtSco

				AvailableOutputDevices Includes BluetoothA2dp



				component: /Policy/policy/strategies/media/selected_output_devices/mask
@@ -53,6 +54,7 @@ domainGroup: DeviceForStrategy 


			conf: BluetoothA2dpHeadphone

				ForceUseForMedia IsNot ForceNoBtA2dp

				ForceUseForCommunication IsNot ForceBtSco

				AvailableOutputDevices Includes BluetoothA2dpHeadphones



				component: /Policy/policy/strategies/media/selected_output_devices/mask
@@ -72,6 +74,7 @@ domainGroup: DeviceForStrategy 


			conf: BluetoothA2dpSpeaker

				ForceUseForMedia IsNot ForceNoBtA2dp

				ForceUseForCommunication IsNot ForceBtSco

				AvailableOutputDevices Includes BluetoothA2dpSpeaker



				component: /Policy/policy/strategies/media/selected_output_devices/mask
@@ -263,6 +266,7 @@ domainGroup: DeviceForStrategy 
				# If hdmi system audio mode is on, remove speaker out of output list.

				#

				ForceUseForHdmiSystemAudio IsNot ForceHdmiSystemEnforced

				ForceUseForCommunication IsNot ForceBtSco



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

					speaker = 1

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

+8 −9
Original line number Diff line number Diff line
@@ -92,8 +92,6 @@ supDomain: DeviceForStrategy 
				TelephonyMode IsNot InCall

				TelephonyMode IsNot InCommunication

				ForceUseForMedia IsNot ForceNoBtA2dp

				ANY

					ForceUseForCommunication Is ForceBtSco

				ForceUseForCommunication Is ForceNone



				component: /Policy/policy/strategies/phone/selected_output_devices/mask
@@ -124,8 +122,6 @@ supDomain: DeviceForStrategy 
				TelephonyMode IsNot InCall

				TelephonyMode IsNot InCommunication

				ForceUseForMedia IsNot ForceNoBtA2dp

				ANY

					ForceUseForCommunication Is ForceBtSco

				ForceUseForCommunication Is ForceNone



				component: /Policy/policy/strategies/phone/selected_output_devices/mask
@@ -166,8 +162,8 @@ supDomain: DeviceForStrategy 
					bluetooth_sco_headset = 0

					bluetooth_sco_carkit = 0

					bluetooth_a2dp = 0

					bluetooth_a2dp_headphones = 1

					bluetooth_a2dp_speaker = 0

					bluetooth_a2dp_headphones = 0

					bluetooth_a2dp_speaker = 1

					hdmi = 0

					angl_dock_headset = 0

					dgtl_dock_headset = 0
@@ -463,6 +459,9 @@ supDomain: DeviceForStrategy 
					speaker = 1



			conf: Default

				#

				# Fallback on default output device which can be speaker for example

				#

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

					earpiece = 0

					wired_headset = 0
@@ -480,6 +479,6 @@ supDomain: DeviceForStrategy 
					usb_device = 0

					telephony_tx = 0

					line = 0

					speaker = 0

					speaker = 1

services/audiopolicy/engineconfigurable/parameter-framework/example/Structure/PolicySubsystem-CommonTypes.xml

+4 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
            <BitParameter Name="usb_accessory" Size="1" Pos="13"/>

            <BitParameter Name="usb_device" Size="1" Pos="14"/>

            <BitParameter Name="remote_submix" Size="1" Pos="15"/>

            <BitParameter Name="telephony_tx" Size="1" Pos="26"/>

            <BitParameter Name="telephony_tx" Size="1" Pos="16"/>

            <BitParameter Name="line" Size="1" Pos="17"/>

            <BitParameter Name="hdmi_arc" Size="1" Pos="18"/>

            <BitParameter Name="spdif" Size="1" Pos="19"/>
@@ -109,8 +109,9 @@ 
            <BitParameter Name="voice_recognition" Size="1" Pos="6"/>

            <BitParameter Name="voice_communication" Size="1" Pos="7"/>

            <BitParameter Name="remote_submix" Size="1" Pos="8"/>

            <BitParameter Name="fm_tuner" Size="1" Pos="9"/>

            <BitParameter Name="hotword" Size="1" Pos="10"/>

            <BitParameter Name="unprocessed" Size="1" Pos="9"/>

            <BitParameter Name="fm_tuner" Size="1" Pos="10"/>

            <BitParameter Name="hotword" Size="1" Pos="11"/>

        </BitParameterBlock>

    </ComponentType>