Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bsp_diff cleanup to mixin #2080

Merged
merged 10 commits into from
Oct 11, 2024
Merged

bsp_diff cleanup to mixin #2080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
916b3bb
Enable 2 microphones on Android 14
xinxin-wan Jul 4, 2024
18c3e0f
Have a separate volume group for call
gkdeepa Jul 31, 2024
77bf444
Have a separate volume group for call
gkdeepa Jul 31, 2024
900918e
Adding routing to Built-In Back Mic
libinyang Aug 8, 2024
5b344d5
Keep same group for alarm/notification/sys sounds
haochuan1982 Oct 8, 2024
030ff1e
Keep same group for alarm/notification/sys sounds
haochuan1982 Oct 8, 2024
b13b904
update audio policy and car audio conf to support more zones
libinyang Sep 4, 2024
824901c
update audio_hal_configuration.xml to support zone 3 and zone 4
libinyang Sep 6, 2024
e39b95a
Keep navigation and voice in same audio group
padmashree9110 Sep 30, 2024
75ae9b5
bsp_diff cleanup to mixin
haochuan1982 Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 6 additions & 15 deletions groups/audio/audio_base_aaos/default/policy/audio_hal_configuration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,19 @@
<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>
<Stream Address="bus4_call_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="bus5_alarm_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="bus6_notification_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="bus7_system_sound_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="Built-In Mic" Direction="capture" Mmap="false">
<Pcm Card="SoundCard" Device="1" SampleRate="48000" Format="16" Channels="2" PeriodSize="960" PeriodCount="4" StartThreshhold="1" StopThreshold="3840" AdditionalOutputDeviceDelay="5"/>
</Stream>
<Stream Address="Built-In Back Mic" Direction="capture" Mmap="false">
<Pcm Card="SoundCard" Device="1" SampleRate="48000" Format="32" Channels="2" PeriodSize="960" PeriodCount="4" StartThreshhold="1" StopThreshold="3840" AdditionalOutputDeviceDelay="5"/>
</Stream>
<Stream Address="bus_1000_input_zone_0" Direction="capture" Mmap="false">
<Pcm Card="SoundCard" Device="2" SampleRate="48000" Format="16" Channels="2" PeriodSize="960" PeriodCount="4" StartThreshhold="1" StopThreshold="3840" AdditionalOutputDeviceDelay="5"/>
</Stream>
</Streams>
5 changes: 0 additions & 5 deletions groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_attached_devices.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,8 @@
<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>
<item>bus5_alarm_out</item>
<item>bus6_notification_out</item>
<item>bus7_system_sound_out</item>

<!-- TODO update for input-->
<item>bus_1000_input_zone_0</item>
Expand Down
50 changes: 0 additions & 50 deletions groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_devices.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -65,36 +45,6 @@
defaultValueMB="0" stepValueMB="100"/>
</gains>
</devicePort>
<devicePort tagName="bus5_alarm_out" role="sink" type="AUDIO_DEVICE_OUT_BUS"
address="bus5_alarm_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="bus6_notification_out" role="sink" type="AUDIO_DEVICE_OUT_BUS"
address="bus6_notification_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="bus7_system_sound_out" role="sink" type="AUDIO_DEVICE_OUT_BUS"
address="bus7_system_sound_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>

<!-- TODO update for input-->
<devicePort tagName="bus_1000_input_zone_0" type="AUDIO_DEVICE_IN_BUS"
Expand Down
25 changes: 0 additions & 25 deletions groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_mixports.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -40,21 +30,6 @@
samplingRates="48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="mixport_bus5_alarm_out" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
samplingRates="48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="mixport_bus6_notification_out" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
samplingRates="48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="mixport_bus7_system_sound_out" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
samplingRates="48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<!-- TODO update for input-->
<mixPort name="primary input" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
Expand Down
8 changes: 0 additions & 8 deletions groups/audio/audio_base_aaos/default/policy/audio_policy_configuration_routes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,8 @@
<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"/>
<route type="mix" sink="bus5_alarm_out" sources="mixport_bus5_alarm_out"/>
<route type="mix" sink="bus6_notification_out"
sources="mixport_bus6_notification_out"/>
<route type="mix" sink="bus7_system_sound_out"
sources="mixport_bus7_system_sound_out"/>

<!-- TODO update for input-->
<route type="mix" sink="mixport_bus_1000_input_zone_0" sources="bus_1000_input_zone_0"/>
Expand Down
31 changes: 10 additions & 21 deletions groups/audio/audio_base_aaos/default/policy/car_audio_configuration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,40 +29,29 @@
<device address="bus0_media_out">
<context context="music"/>
<context context="announcement"/>
<context context="call"/>
</device>
<device address="bus6_notification_out">
<context context="alarm"/>
<context context="system_sound"/>
<context context="emergency"/>
<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>
<group>
<device address="bus3_call_ring_out">
<context context="call_ring"/>
</device>
</group>
<group>
<device address="bus5_alarm_out">
<context context="alarm"/>
</device>
<device address="bus7_system_sound_out">
<context context="system_sound"/>
<context context="emergency"/>
<context context="safety"/>
<context context="vehicle_status"/>
</device>
</device>
<device address="bus4_call_out">
<context context="call"/>
</device>
</group>
</volumeGroups>
<inputDevices>
<inputDevice address="bus_1000_input_zone_0"/>
<inputDevice address="Built-In Mic"/>
<inputDevice address="Built-In Back Mic"/>
</inputDevices>
</zone>
</zones>
Expand Down
34 changes: 25 additions & 9 deletions groups/multi-passenger/true/audio/audio_hal_configuration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,11 @@
<Stream Address="bus4_call_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="bus5_alarm_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="bus6_notification_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="bus7_system_sound_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="Built-In Mic" Direction="capture" Mmap="false">
<Pcm Card="SoundCard" Device="1" SampleRate="48000" Format="32" Channels="2" PeriodSize="960" PeriodCount="4" StartThreshhold="1" StopThreshold="3840" AdditionalOutputDeviceDelay="5"/>
<Stream Address="Built-In Back Mic" Direction="capture" Mmap="false">
<Pcm Card="SoundCard" Device="1" SampleRate="48000" Format="32" Channels="2" PeriodSize="960" PeriodCount="4" StartThreshhold="1" StopThreshold="3840" AdditionalOutputDeviceDelay="5"/>
</Stream>
</Stream>
<Stream Address="bus_1000_input_zone_0" Direction="capture" Mmap="false">
<Pcm Card="SoundCard" Device="1" SampleRate="48000" Format="32" Channels="2" PeriodSize="960" PeriodCount="4" StartThreshhold="1" StopThreshold="3840" AdditionalOutputDeviceDelay="5"/>
Expand All @@ -43,4 +37,26 @@
<Stream Address="bus_2000_input_zone_1" Direction="capture" Mmap="false">
<Pcm Card="SoundCard" Device="2" SampleRate="48000" Format="32" Channels="2" PeriodSize="960" PeriodCount="4" StartThreshhold="1" StopThreshold="3840" AdditionalOutputDeviceDelay="5"/>
</Stream>

<!-- zone 2 -->
<Stream Address="bus200_audio_zone_2" Direction="playback" Mmap="false">
<Pcm Card="SoundCard" Device="3" SampleRate="48000" Format="32" Channels="2" PeriodSize="1024" PeriodCount="4" StartThreshhold="4096" AdditionalOutputDeviceDelay="5"/>
</Stream>
<Stream Address="bus_3000_input_zone_2" Direction="capture" Mmap="false">
<Pcm Card="SoundCard" Device="3" SampleRate="48000" Format="32" Channels="2" PeriodSize="960" PeriodCount="4" StartThreshhold="1" StopThreshold="3840" AdditionalOutputDeviceDelay="5"/>
</Stream>

<!-- zone 3 -->
<Stream Address="bus300_audio_zone_3" Direction="playback" Mmap="false">
<Pcm Card="SoundCard" Device="4" SampleRate="48000" Format="32" Channels="2" PeriodSize="1024" PeriodCount="4" StartThreshhold="4096" AdditionalOutputDeviceDelay="5"/>
</Stream>
<!--
there is only 3 capture pcm devices on SoundCard.
Based on the limitation, zone 3 uses the same capture pcm device with zone 2.
To be refined after a new design
-->
<Stream Address="bus_4000_input_zone_3" Direction="capture" Mmap="false">
<Pcm Card="SoundCard" Device="3" SampleRate="48000" Format="32" Channels="2" PeriodSize="960" PeriodCount="4" StartThreshhold="1" StopThreshold="3840" AdditionalOutputDeviceDelay="5"/>
</Stream>

</Streams>
15 changes: 12 additions & 3 deletions groups/multi-passenger/true/audio/audio_policy_configuration_attached_devices.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@
<item>bus2_voice_command_out</item>
<item>bus3_call_ring_out</item>
<item>bus4_call_out</item>
<item>bus5_alarm_out</item>
<item>bus6_notification_out</item>
<item>bus7_system_sound_out</item>

<!-- TODO update for input-->
<item>bus_1000_input_zone_0</item>
Expand All @@ -42,4 +39,16 @@

<!-- TODO update for input-->
<item>bus_2000_input_zone_1</item>

<!-- zone 2 -->
<item>bus200_audio_zone_2</item>

<!-- TODO update for input-->
<item>bus_3000_input_zone_2</item>

<!-- zone 3 -->
<item>bus300_audio_zone_3</item>

<!-- TODO update for input-->
<item>bus_4000_input_zone_3</item>
</attachedDevices>
Loading