Keep navigation and voice in same audio group

This patch adds changes to keep navigation and voice_out also in the media group. Since there are no seperate pcm devices to handle these, there is delay while switching from one context to other as it tries to close same pcm device and open same pcm device again. Signed-off-by: padmashree mandri <[email protected]>
projectceladon · Oct 10, 2024 · e39b95a · e39b95a
1 parent 824901c
commit e39b95a
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 47 deletions.
diff --git a/groups/audio/audio_base_aaos/default/policy/audio_hal_configuration.xml b/groups/audio/audio_base_aaos/default/policy/audio_hal_configuration.xml
@@ -10,12 +10,6 @@
   <Stream Address="bus0_media_out" Direction="playback" Mmap="false">
     <Pcm Card="SoundCard" Device="1" SampleRate="48000" Format="32" Channels="2" PeriodSize="1024" PeriodCount="4" StartThreshhold="4096" AdditionalOutputDeviceDelay="5"/>
   </Stream>
-  <Stream Address="bus1_navigation_out" Direction="playback" Mmap="false">
-    <Pcm Card="SoundCard" Device="1" SampleRate="48000" Format="32" Channels="2" PeriodSize="1024" PeriodCount="4" StartThreshhold="4096" AdditionalOutputDeviceDelay="5"/>
-  </Stream>
-  <Stream Address="bus2_voice_command_out" Direction="playback" Mmap="false">
-    <Pcm Card="SoundCard" Device="1" SampleRate="48000" Format="32" Channels="2" PeriodSize="1024" PeriodCount="4" StartThreshhold="4096" AdditionalOutputDeviceDelay="5"/>
-  </Stream>
   <Stream Address="bus3_call_ring_out" Direction="playback" Mmap="false">
     <Pcm Card="SoundCard" Device="1" SampleRate="48000" Format="32" Channels="2" PeriodSize="1024" PeriodCount="4" StartThreshhold="4096" AdditionalOutputDeviceDelay="5"/>
   </Stream>

diff --git a/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_attached_devices.xml b/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_attached_devices.xml
@@ -16,8 +16,6 @@
 <attachedDevices>
     <!-- One bus per context -->
     <item>bus0_media_out</item>
-    <item>bus1_navigation_out</item>
-    <item>bus2_voice_command_out</item>
     <item>bus3_call_ring_out</item>
     <item>bus4_call_out</item>
 

diff --git a/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_devices.xml b/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_devices.xml
@@ -25,26 +25,6 @@
                   defaultValueMB="0" stepValueMB="100"/>
             </gains>
     </devicePort>
-    <devicePort tagName="bus1_navigation_out" role="sink" type="AUDIO_DEVICE_OUT_BUS"
-                address="bus1_navigation_out">
-        <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                 samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-        <gains>
-            <gain name="" mode="AUDIO_GAIN_MODE_JOINT"
-                  minValueMB="-3200" maxValueMB="600"
-                  defaultValueMB="0" stepValueMB="100"/>
-        </gains>
-    </devicePort>
-    <devicePort tagName="bus2_voice_command_out" role="sink" type="AUDIO_DEVICE_OUT_BUS"
-                address="bus2_voice_command_out">
-        <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                 samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-        <gains>
-            <gain name="" mode="AUDIO_GAIN_MODE_JOINT"
-                  minValueMB="-3200" maxValueMB="600"
-                  defaultValueMB="0" stepValueMB="100"/>
-        </gains>
-    </devicePort>
     <devicePort tagName="bus3_call_ring_out" role="sink" type="AUDIO_DEVICE_OUT_BUS"
                 address="bus3_call_ring_out">
         <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"

diff --git a/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_mixports.xml b/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_mixports.xml
@@ -20,16 +20,6 @@
                  samplingRates="48000"
                  channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
         </mixPort>
-    <mixPort name="mixport_bus1_navigation_out" role="source">
-        <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                 samplingRates="48000"
-                 channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-    </mixPort>
-    <mixPort name="mixport_bus2_voice_command_out" role="source">
-        <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                 samplingRates="48000"
-                 channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
-    </mixPort>
     <mixPort name="mixport_bus3_call_ring_out" role="source">
         <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
                  samplingRates="48000"

diff --git a/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_routes.xml b/groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_routes.xml
@@ -30,9 +30,6 @@
     <route type="mix" sink="mixport_bus_2000_input_zone_1" sources="bus_2000_input_zone_1"/>
 
     <route type="mix" sink="bus0_media_out" sources="mixport_bus0_media_out"/>
-    <route type="mix" sink="bus1_navigation_out" sources="mixport_bus1_navigation_out"/>
-    <route type="mix" sink="bus2_voice_command_out"
-           sources="mixport_bus2_voice_command_out"/>
     <route type="mix" sink="bus3_call_ring_out" sources="mixport_bus3_call_ring_out"/>
     <route type="mix" sink="bus4_call_out" sources="mixport_bus4_call_out"/>
 

diff --git a/groups/audio/audio_base_aaos/default/policy/car_audio_configuration.xml b/groups/audio/audio_base_aaos/default/policy/car_audio_configuration.xml
@@ -35,13 +35,7 @@
                         <context context="safety"/>
                         <context context="vehicle_status"/>
                         <context context="notification"/>
-                    </device>
-                </group>
-                <group>
-                    <device address="bus1_navigation_out">
                         <context context="navigation"/>
-                    </device>
-                    <device address="bus2_voice_command_out">
                         <context context="voice_command"/>
                     </device>
                 </group>