Merge "config: update car audio config to support new context" (ff6fa787) · Commits · e / os / android_hardware_qcom_audio

configs/common_au/audio_policy_configuration.xml

+17 −1

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@
		<item>Sys Notification Bus</item>
		<item>Nav Guidance Bus</item>
		<item>Phone Bus</item>
		<item>Front Passenger Bus</item>
		<item>Rear Seat Bus</item>
		<item>Built-In Mic</item>
		<item>Built-In Back Mic</item>
		@@ -80,6 +81,10 @@
		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
		samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
		</mixPort>
		<mixPort name="front_passenger" role="source">
		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
		samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
		</mixPort>
		<mixPort name="rear_seat" role="source">
		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
		samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
		@@ -194,8 +199,17 @@
		minValueMB="-6000" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/>
		</gains>
		</devicePort>
		<devicePort tagName="Front Passenger Bus" role="sink" type="AUDIO_DEVICE_OUT_BUS"
		address="BUS08_FRONT_PASSENGER">
		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
		samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
		<gains>
		<gain name="" mode="AUDIO_GAIN_MODE_JOINT"
		minValueMB="-6000" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/>
		</gains>
		</devicePort>
		<devicePort tagName="Rear Seat Bus" role="sink" type="AUDIO_DEVICE_OUT_BUS"
		address="BUS08_REAR_SEAT">
		address="BUS16_REAR_SEAT">
		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
		samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
		<gains>
		@@ -250,6 +264,8 @@
		sources="nav_guidance"/>
		<route type="mix" sink="Phone Bus"
		sources="phone"/>
		<route type="mix" sink="Front Passenger Bus"
		sources="front_passenger"/>
		<route type="mix" sink="Rear Seat Bus"
		sources="rear_seat"/>
		<route type="mix" sink="Earpiece"

configs/common_au/car_audio_configuration.xml

+35 −4

Original line number	Diff line number	Diff line
		@@ -28,9 +28,9 @@
		- Volume groups
		in the car environment.
		-->
		<carAudioConfiguration version="1">
		<carAudioConfiguration version="2">
		<zones>
		<zone name="primary zone" isPrimary="true">
		<zone name="primary zone" isPrimary="true" occupantZoneId="0">
		<volumeGroups>
		<group>
		<device address="BUS00_MEDIA">
		@@ -42,6 +42,10 @@
		<context context="alarm"/>
		<context context="notification"/>
		<context context="system_sound"/>
		<context context="emergency"/>
		<context context="safety"/>
		<context context="vehicle_status"/>
		<context context="announcement"/>
		</device>
		</group>
		<group>
		@@ -68,10 +72,10 @@
		where port is the physical port of the display (See DisplayAddress.Phyisical)
		-->
		</zone>
		<zone name="rear seat zone">
		<zone name="front passenger zone" audioZoneId="1">
		<volumeGroups>
		<group>
		<device address="BUS08_REAR_SEAT">
		<device address="BUS08_FRONT_PASSENGER">
		<context context="music"/>
		<context context="navigation"/>
		<context context="voice_command"/>
		@@ -80,6 +84,10 @@
		<context context="alarm"/>
		<context context="notification"/>
		<context context="system_sound"/>
		<context context="emergency"/>
		<context context="safety"/>
		<context context="vehicle_status"/>
		<context context="announcement"/>
		</device>
		</group>
		</volumeGroups>
		@@ -87,5 +95,28 @@
		<display port="1"/>
		</displays>
		</zone>
		<zone name="rear seat zone" audioZoneId="2">
		<volumeGroups>
		<group>
		<device address="BUS16_REAR_SEAT">
		<context context="music"/>
		<context context="navigation"/>
		<context context="voice_command"/>
		<context context="call_ring"/>
		<context context="call"/>
		<context context="alarm"/>
		<context context="notification"/>
		<context context="system_sound"/>
		<context context="emergency"/>
		<context context="safety"/>
		<context context="vehicle_status"/>
		<context context="announcement"/>
		</device>
		</group>
		</volumeGroups>
		<displays>
		<display port="2"/>
		</displays>
		</zone>
		</zones>
		</carAudioConfiguration>

configs/msmnile_au/audio_io_policy.conf

+7 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,13 @@ outputs {
		bit_width 16
		app_type 69936
		}
		front_passenger {
		flags AUDIO_OUTPUT_FLAG_FRONT_PASSENGER
		formats AUDIO_FORMAT_PCM_16_BIT
		sampling_rates 48000
		bit_width 16
		app_type 69936
		}
		rear_seat {
		flags AUDIO_OUTPUT_FLAG_REAR_SEAT
		formats AUDIO_FORMAT_PCM_16_BIT

configs/msmnile_au/audio_platform_info.xml

+4 −1

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@
		<device name="SND_DEVICE_OUT_BUS_SYS" acdb_id="60"/>
		<device name="SND_DEVICE_OUT_BUS_NAV" acdb_id="14"/>
		<device name="SND_DEVICE_OUT_BUS_PHN" acdb_id="94"/>
		<device name="SND_DEVICE_OUT_BUS_PAX" acdb_id="60"/>
		<device name="SND_DEVICE_OUT_BUS_RSE" acdb_id="60"/>
		<device name="SND_DEVICE_OUT_BT_SCO" acdb_id="21"/>
		<device name="SND_DEVICE_OUT_BT_SCO_WB" acdb_id="39"/>
		@@ -100,6 +101,7 @@
		<usecase name="USECASE_AUDIO_PLAYBACK_SYS_NOTIFICATION" type="out" id="9"/>
		<usecase name="USECASE_AUDIO_PLAYBACK_NAV_GUIDANCE" type="out" id="1"/>
		<usecase name="USECASE_AUDIO_PLAYBACK_PHONE" type="out" id="12"/>
		<usecase name="USECASE_AUDIO_PLAYBACK_FRONT_PASSENGER" type="out" id="55"/>
		<usecase name="USECASE_AUDIO_PLAYBACK_REAR_SEAT" type="out" id="54"/>
		<usecase name="USECASE_VOICEMMODE1_CALL" type="in" id="2"/>
		<usecase name="USECASE_VOICEMMODE1_CALL" type="out" id="2"/>
		@@ -166,7 +168,8 @@
		<device name="SND_DEVICE_OUT_BUS_SYS" interface="TERT_TDM_RX_0"/>
		<device name="SND_DEVICE_OUT_BUS_NAV" interface="TERT_TDM_RX_1"/>
		<device name="SND_DEVICE_OUT_BUS_PHN" interface="TERT_TDM_RX_2"/>
		<device name="SND_DEVICE_OUT_BUS_RSE" interface="QUAT_TDM_RX_0"/>
		<device name="SND_DEVICE_OUT_BUS_PAX" interface="QUAT_TDM_RX_0"/>
		<device name="SND_DEVICE_OUT_BUS_RSE" interface="QUIN_TDM_RX_0"/>
		<device name="SND_DEVICE_IN_HANDSET_MIC" interface="TERT_TDM_TX_0"/>
		<device name="SND_DEVICE_IN_SPEAKER_MIC" interface="TERT_TDM_TX_0"/>
		<device name="SND_DEVICE_IN_HEADSET_MIC" interface="TERT_TDM_TX_0"/>

configs/msmnile_au/audio_policy_configuration.xml

+17 −1

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@
		<item>Sys Notification Bus</item>
		<item>Nav Guidance Bus</item>
		<item>Phone Bus</item>
		<item>Front Passenger Bus</item>
		<item>Rear Seat Bus</item>
		<item>Built-In Mic</item>
		<item>Built-In Back Mic</item>
		@@ -81,6 +82,10 @@
		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
		samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
		</mixPort>
		<mixPort name="front_passenger" role="source">
		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
		samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
		</mixPort>
		<mixPort name="rear_seat" role="source">
		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
		samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
		@@ -266,8 +271,17 @@
		minValueMB="-6000" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/>
		</gains>
		</devicePort>
		<devicePort tagName="Front Passenger Bus" role="sink" type="AUDIO_DEVICE_OUT_BUS"
		address="BUS08_FRONT_PASSENGER">
		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
		samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
		<gains>
		<gain name="" mode="AUDIO_GAIN_MODE_JOINT"
		minValueMB="-6000" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/>
		</gains>
		</devicePort>
		<devicePort tagName="Rear Seat Bus" role="sink" type="AUDIO_DEVICE_OUT_BUS"
		address="BUS08_REAR_SEAT">
		address="BUS16_REAR_SEAT">
		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
		samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
		<gains>
		@@ -384,6 +398,8 @@
		sources="nav_guidance"/>
		<route type="mix" sink="Phone Bus"
		sources="phone"/>
		<route type="mix" sink="Front Passenger Bus"
		sources="front_passenger"/>
		<route type="mix" sink="Rear Seat Bus"
		sources="rear_seat"/>
		<route type="mix" sink="Earpiece"