mixin-update-HAL7.0 policy config for 48k,44.1K

Update audio policy configuration xml as per the HAL-7.0 version. 1. 'AUDIO_CHANNEL_IN_MONO, AUDIO_CHANNEL_IN_STEREO' Above two channels, if set, any of the config need to be removed, 2. Removed "," and separated sample rates by spaces Tracked-On: OAM-104226 Signed-off-by: Deepa K G <[email protected]> Signed-off-by: Kothapeta, BikshapathiX <[email protected]>
projectceladon · Oct 14, 2022 · 8276b64 · 8276b64
1 parent 5694548
commit 8276b64
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 14 deletions.
diff --git a/caas/audio/default/policy/a2dp_audio_policy_configuration.xml b/caas/audio/default/policy/a2dp_audio_policy_configuration.xml
@@ -9,8 +9,8 @@
         </mixPort>
         <mixPort name="a2dp input" role="sink">
             <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                     samplingRates="44100,48000"
-                     channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+                     samplingRates="44100 48000"
+                     channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
         </mixPort>
     </mixPorts>
     <devicePorts>
@@ -31,8 +31,8 @@
         </devicePort>
         <devicePort tagName="BT A2DP In" type="AUDIO_DEVICE_IN_BLUETOOTH_A2DP" role="source">
             <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                     samplingRates="44100,48000"
-                     channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>
+                     samplingRates="44100 48000"
+                     channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
         </devicePort>
     </devicePorts>
     <routes>

diff --git a/caas/audio/default/policy/audio_policy_configuration.xml b/caas/audio/default/policy/audio_policy_configuration.xml
@@ -35,16 +35,15 @@
                 </mixPort>
                 <mixPort name="primary input" role="sink"> 
                      <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="48000"
-                             channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
+                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
                 <mixPort name="voice_rx" role="sink">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000 16000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
+                             samplingRates="16000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
                 </mixPort>
                 <mixPort name="voice_tx" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                             samplingRates="8000 16000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
+                             samplingRates="16000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
                 </mixPort>
             </mixPorts>
 
@@ -73,12 +72,12 @@
                 <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO "/>
+                             channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
                 </devicePort>
                 <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
                     <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                              samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000"
-                             channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO "/>
+                             channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
                 </devicePort>
                 <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink"/>
                 <devicePort tagName="Telephony Rx" type="AUDIO_DEVICE_IN_TELEPHONY_RX" role="source"/>

diff --git a/caas/audio/default/policy/fallback/audio_policy_configuration_generic.xml b/caas/audio/default/policy/fallback/audio_policy_configuration_generic.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+<audioPolicyConfiguration version="7.0" xmlns:xi="http://www.w3.org/2001/XInclude">
     <!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->
 
     <!-- Global configuration Decalaration -->

diff --git a/caas/audio/default/policy/fallback/primary_audio_policy_configuration.xml b/caas/audio/default/policy/fallback/primary_audio_policy_configuration.xml
@@ -13,7 +13,7 @@
         </mixPort>
         <mixPort name="primary input" role="sink">
             <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                     samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
+                     samplingRates="8000 16000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>
         </mixPort>
    </mixPorts>
    <devicePorts>

diff --git a/caas/audio/default/policy/hdmi_audio_policy_configuration.xml b/caas/audio/default/policy/hdmi_audio_policy_configuration.xml
@@ -32,14 +32,14 @@
                      samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
 
             <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                     samplingRates="32000,44100,48000"/>
+                     samplingRates="32000 44100 48000"/>
         </devicePort>
         <devicePort tagName="HDMI_2" type="AUDIO_DEVICE_OUT_HDMI" role="sink">
             <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
                      samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
 
             <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
-                     samplingRates="32000,44100,48000"/>
+                     samplingRates="32000 44100 48000"/>
         </devicePort>
 
     </devicePorts>