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

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

Audio Policy: engine configurable: remove sign bit from conf files 



In order to avoid mistake or extra configuration, this patch removes
from xml/pfw configuration files the sign bit for input device and adds
it programmaticaly within the Parameter Framework policy plugin

Bug: 25075342

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

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

+0 −48
Original line number Diff line number Diff line
@@ -8473,7 +8473,6 @@ 
      </Configuration>

    </Configurations>

    <ConfigurableElements>

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

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

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

      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/hdmi"/>
@@ -8490,7 +8489,6 @@ 
      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/loopback"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/ip"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bus"/>

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

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

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

      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/hdmi"/>
@@ -8507,7 +8505,6 @@ 
      <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/loopback"/>

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

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

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

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

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

      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/builtin_mic"/>
@@ -8528,7 +8525,6 @@ 
      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/loopback"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/ip"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/bus"/>

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

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

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

      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/builtin_mic"/>
@@ -8549,7 +8545,6 @@ 
      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/loopback"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/ip"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/bus"/>

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

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

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

      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/builtin_mic"/>
@@ -8570,7 +8565,6 @@ 
      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/loopback"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/ip"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/bus"/>

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

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

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

      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/bluetooth_sco_headset"/>
@@ -8590,7 +8584,6 @@ 
      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/loopback"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/ip"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/bus"/>

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

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

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

      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/hdmi"/>
@@ -8608,7 +8601,6 @@ 
      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/loopback"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/ip"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bus"/>

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

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

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

      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/hdmi"/>
@@ -8625,7 +8617,6 @@ 
      <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/loopback"/>

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

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

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

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

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

      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/builtin_mic"/>
@@ -8646,7 +8637,6 @@ 
      <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/loopback"/>

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

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

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

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

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

      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/hdmi"/>
@@ -8664,7 +8654,6 @@ 
      <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/loopback"/>

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

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

      <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"/>
@@ -8682,7 +8671,6 @@ 
      <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/loopback"/>

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

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

      <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"/>

      <ConfigurableElement Path="/Policy/policy/input_sources/fm_tuner/applicable_input_device/mask/bluetooth_sco_headset"/>
@@ -8706,9 +8694,6 @@ 
    </ConfigurableElements>

    <Settings>

      <Configuration Name="Calibration">

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

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

        </ConfigurableElement>

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

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

        </ConfigurableElement>
@@ -8757,9 +8742,6 @@ 
        <ConfigurableElement Path="/Policy/policy/input_sources/default/applicable_input_device/mask/bus">

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

        </ConfigurableElement>

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

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

        </ConfigurableElement>

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

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

        </ConfigurableElement>
@@ -8808,9 +8790,6 @@ 
        <ConfigurableElement Path="/Policy/policy/input_sources/mic/applicable_input_device/mask/bus">

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

        </ConfigurableElement>

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

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

        </ConfigurableElement>

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

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

        </ConfigurableElement>
@@ -8871,9 +8850,6 @@ 
        <ConfigurableElement Path="/Policy/policy/input_sources/voice_downlink/applicable_input_device/mask/bus">

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

        </ConfigurableElement>

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

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

        </ConfigurableElement>

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

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

        </ConfigurableElement>
@@ -8934,9 +8910,6 @@ 
        <ConfigurableElement Path="/Policy/policy/input_sources/voice_call/applicable_input_device/mask/bus">

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

        </ConfigurableElement>

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

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

        </ConfigurableElement>

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

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

        </ConfigurableElement>
@@ -8997,9 +8970,6 @@ 
        <ConfigurableElement Path="/Policy/policy/input_sources/voice_uplink/applicable_input_device/mask/bus">

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

        </ConfigurableElement>

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

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

        </ConfigurableElement>

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

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

        </ConfigurableElement>
@@ -9057,9 +9027,6 @@ 
        <ConfigurableElement Path="/Policy/policy/input_sources/camcorder/applicable_input_device/mask/bus">

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

        </ConfigurableElement>

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

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

        </ConfigurableElement>

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

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

        </ConfigurableElement>
@@ -9111,9 +9078,6 @@ 
        <ConfigurableElement Path="/Policy/policy/input_sources/voice_recognition/applicable_input_device/mask/bus">

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

        </ConfigurableElement>

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

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

        </ConfigurableElement>

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

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

        </ConfigurableElement>
@@ -9162,9 +9126,6 @@ 
        <ConfigurableElement Path="/Policy/policy/input_sources/voice_communication/applicable_input_device/mask/bus">

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

        </ConfigurableElement>

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

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

        </ConfigurableElement>

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

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

        </ConfigurableElement>
@@ -9225,9 +9186,6 @@ 
        <ConfigurableElement Path="/Policy/policy/input_sources/remote_submix/applicable_input_device/mask/bus">

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

        </ConfigurableElement>

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

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

        </ConfigurableElement>

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

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

        </ConfigurableElement>
@@ -9279,9 +9237,6 @@ 
        <ConfigurableElement Path="/Policy/policy/input_sources/hotword/applicable_input_device/mask/bus">

          <BitParameter Name="bus">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>
@@ -9333,9 +9288,6 @@ 
        <ConfigurableElement Path="/Policy/policy/input_sources/unprocessed/applicable_input_device/mask/bus">

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

        </ConfigurableElement>

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

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

        </ConfigurableElement>

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

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

        </ConfigurableElement>

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

+0 −16
Original line number Diff line number Diff line 
supDomain: DeviceForInputSource

	domain: Calibration

		conf: Calibration

			#

			# Note that ALL input devices must have the sign bit set to 1.

			# As the devices is a mask, use the "in" bit as a direction indicator.

			#

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

				in = 1

				communication = 0

				ambient = 0

				hdmi = 0
@@ -24,7 +19,6 @@ supDomain: DeviceForInputSource 
				ip = 0

				bus = 0

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

				in = 1

				communication = 0

				ambient = 0

				hdmi = 0
@@ -42,7 +36,6 @@ supDomain: DeviceForInputSource 
				ip = 0

				bus = 0

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

				in = 1

				communication = 0

				ambient = 0

				builtin_mic = 0
@@ -64,7 +57,6 @@ supDomain: DeviceForInputSource 
				ip = 0

				bus = 0

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

				in = 1

				communication = 0

				ambient = 0

				builtin_mic = 0
@@ -86,7 +78,6 @@ supDomain: DeviceForInputSource 
				ip = 0

				bus = 0

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

				in = 1

				communication = 0

				ambient = 0

				builtin_mic = 0
@@ -108,7 +99,6 @@ supDomain: DeviceForInputSource 
				ip = 0

				bus = 0

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

				in = 1

				communication = 0

				ambient = 0

				bluetooth_sco_headset = 0
@@ -129,7 +119,6 @@ supDomain: DeviceForInputSource 
				ip = 0

				bus = 0

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

				in = 1

				communication = 0

				ambient = 0

				hdmi = 0
@@ -148,7 +137,6 @@ supDomain: DeviceForInputSource 
				ip = 0

				bus = 0

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

				in = 1

				communication = 0

				ambient = 0

				hdmi = 0
@@ -166,7 +154,6 @@ supDomain: DeviceForInputSource 
				ip = 0

				bus = 0

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

				in = 1

				communication = 0

				ambient = 0

				builtin_mic = 0
@@ -188,7 +175,6 @@ supDomain: DeviceForInputSource 
				ip = 0

				bus = 0

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

				in = 1

				communication = 0

				ambient = 0

				hdmi = 0
@@ -207,7 +193,6 @@ supDomain: DeviceForInputSource 
				ip = 0

				bus = 0

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

				in = 1

				communication = 0

				ambient = 0

				hdmi = 0
@@ -226,7 +211,6 @@ supDomain: DeviceForInputSource 
				ip = 0

				bus = 0

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

				in = 1

				communication = 0

				ambient = 0

				bluetooth_sco_headset = 0

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

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ 
            <BitParameter Name="loopback" Size="1" Pos="18"/>

            <BitParameter Name="ip" Size="1" Pos="19"/>

            <BitParameter Name="bus" Size="1" Pos="20"/>

            <BitParameter Name="in" Size="1" Pos="31"/>

        </BitParameterBlock>

    </ComponentType>

services/audiopolicy/engineconfigurable/parameter-framework/plugin/InputSource.cpp

+2 −1
Original line number Diff line number Diff line
@@ -42,5 +42,6 @@ bool InputSource::sendToHW(string & /*error*/) 
{

    uint32_t applicableInputDevice;

    blackboardRead(&applicableInputDevice, sizeof(applicableInputDevice));

    return mPolicyPluginInterface->setDeviceForInputSource(mId, applicableInputDevice);

    return mPolicyPluginInterface->setDeviceForInputSource(

                mId, AUDIO_DEVICE_BIT_IN | applicableInputDevice);

}