Merge "configs: Update config files for multi-zone input bus support" (32860267) · Commits · e / devices / Fairphone 4 / android_hardware_qcom_audio

configs/common_au/audio_policy_configuration.xml

+28 −1

Original line number	Diff line number	Diff line
		@@ -61,6 +61,9 @@
		<item>Rear Seat Bus</item>
		<item>Built-In Mic</item>
		<item>Built-In Back Mic</item>
		<item>Primary In Bus</item>
		<item>Front Passenger In Bus</item>
		<item>Rear Seat In Bus</item>
		</attachedDevices>
		<defaultOutputDevice>Media Bus</defaultOutputDevice>
		<mixPorts>
		@@ -254,6 +257,30 @@
		</devicePort>
		<devicePort tagName="Telephony Rx" type="AUDIO_DEVICE_IN_TELEPHONY_RX" role="source">
		</devicePort>
		<devicePort tagName="Primary In Bus" type="AUDIO_DEVICE_IN_BUS" role="source" address="BUS04_INPUT">
		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
		samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
		<gains>
		<gain name="" mode="AUDIO_GAIN_MODE_JOINT"
		minValueMB="-6000" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/>
		</gains>
		</devicePort>
		<devicePort tagName="Front Passenger In Bus" type="AUDIO_DEVICE_IN_BUS" role="source" address="BUS09_INPUT_FRONT_PASSENGER">
		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
		samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
		<gains>
		<gain name="" mode="AUDIO_GAIN_MODE_JOINT"
		minValueMB="-6000" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/>
		</gains>
		</devicePort>
		<devicePort tagName="Rear Seat In Bus" type="AUDIO_DEVICE_IN_BUS" role="source" address="BUS17_INPUT_REAR_SEAT">
		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
		samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
		<gains>
		<gain name="" mode="AUDIO_GAIN_MODE_JOINT"
		minValueMB="-6000" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/>
		</gains>
		</devicePort>
		</devicePorts>
		<routes>
		<route type="mix" sink="Media Bus"
		@@ -283,7 +310,7 @@
		<route type="mix" sink="Telephony Tx"
		sources="voice_tx,incall_music_uplink"/>
		<route type="mix" sink="primary input"
		sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic"/>
		sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,Primary In Bus,Front Passenger In Bus,Rear Seat In Bus"/>
		<route type="mix" sink="fast input"
		sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic"/>
		<route type="mix" sink="voice_rx"

configs/common_au/car_audio_configuration.xml

+9 −0

Original line number	Diff line number	Diff line
		@@ -61,6 +61,9 @@
		</device>
		</group>
		</volumeGroups>
		<inputDevices>
		<inputDevice address="BUS04_INPUT"/>
		</inputDevices>
		<displays>
		<display port="0"/>
		</displays>
		@@ -91,6 +94,9 @@
		</device>
		</group>
		</volumeGroups>
		<inputDevices>
		<inputDevice address="BUS09_INPUT_FRONT_PASSENGER"/>
		</inputDevices>
		<displays>
		<display port="1"/>
		</displays>
		@@ -114,6 +120,9 @@
		</device>
		</group>
		</volumeGroups>
		<inputDevices>
		<inputDevice address="BUS17_INPUT_REAR_SEAT"/>
		</inputDevices>
		<displays>
		<display port="2"/>
		</displays>

configs/msmnile_au/audio_io_policy.conf

+1 −0

Original line number	Diff line number	Diff line
		@@ -120,6 +120,7 @@ outputs {

		inputs {
		primary {
		flags AUDIO_INPUT_FLAG_PRIMARY\|AUDIO_INPUT_FLAG_FRONT_PASSENGER\|AUDIO_INPUT_FLAG_REAR_SEAT
		formats AUDIO_FORMAT_PCM_16_BIT
		sampling_rates 8000\|16000\|32000\|44100\|48000\|88200\|96000\|176400\|192000
		bit_width 16

configs/msmnile_au/audio_platform_info.xml

+8 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,8 @@
		<device name="SND_DEVICE_IN_HANDSET_MIC" acdb_id="11"/>
		<device name="SND_DEVICE_IN_SPEAKER_MIC" acdb_id="11"/>
		<device name="SND_DEVICE_IN_BUS" acdb_id="11"/>
		<device name="SND_DEVICE_IN_BUS_PAX" acdb_id="11"/>
		<device name="SND_DEVICE_IN_BUS_RSE" acdb_id="11"/>
		<device name="SND_DEVICE_IN_HEADSET_MIC" acdb_id="11"/>
		<device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" acdb_id="95"/>
		<device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" acdb_id="95"/>
		@@ -118,6 +120,9 @@
		<usecase name="USECASE_AUDIO_PLAYBACK_MMAP" type="out" id="28" />
		<usecase name="USECASE_AUDIO_RECORD_MMAP" type="in" id="28" />
		<usecase name="USECASE_AUDIO_RECORD" type="in" id="0" />
		<usecase name="USECASE_AUDIO_RECORD_BUS" type="in" id="0" />
		<usecase name="USECASE_AUDIO_RECORD_BUS_FRONT_PASSENGER" type="in" id="55" />
		<usecase name="USECASE_AUDIO_RECORD_BUS_REAR_SEAT" type="in" id="54" />
		<usecase name="USECASE_AUDIO_HFP_SCO" type="in" id="29" />
		<usecase name="USECASE_AUDIO_HFP_SCO" type="out" id="29" />
		<usecase name="USECASE_AUDIO_HFP_SCO_WB" type="in" id="29" />
		@@ -173,6 +178,9 @@
		<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"/>
		<device name="SND_DEVICE_IN_BUS" interface="TERT_TDM_TX_0"/>
		<device name="SND_DEVICE_IN_BUS_PAX" interface="QUAT_TDM_TX_0"/>
		<device name="SND_DEVICE_IN_BUS_RSE" interface="QUIN_TDM_TX_0"/>
		<device name="SND_DEVICE_IN_VOICE_HEADSET_MIC" interface="TERT_TDM_TX_0"/>
		<device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC" interface="TERT_TDM_TX_0"/>
		<device name="SND_DEVICE_IN_VOICE_SPEAKER_MIC_HFP" interface="TERT_TDM_TX_0"/>

configs/msmnile_au/mixer_paths_adp.xml

+15 −1

Original line number	Diff line number	Diff line
		@@ -1328,10 +1328,20 @@
		</path>

		<path name="audio-record">
		<ctl name="TERT_TDM_TX_0 Channels" value="One" />
		<ctl name="TERT_TDM_TX_0 Channels" value="Four" />
		<ctl name="MultiMedia1 Mixer TERT_TDM_TX_0" value="1" />
		</path>

		<path name="front-passenger-record">
		<ctl name="QUAT_TDM_TX_0 Channels" value="Eight" />
		<ctl name="MultiMedia23 Mixer QUAT_TDM_TX_0" value="1" />
		</path>

		<path name="rear-seat-record">
		<ctl name="QUIN_TDM_TX_0 Channels" value="Eight" />
		<ctl name="MultiMedia22 Mixer QUIN_TDM_TX_0" value="1" />
		</path>

		<path name="audio-record headset-mic">
		<ctl name="TERT_TDM_TX_0 Channels" value="One" />
		<ctl name="MultiMedia1 Mixer TERT_TDM_TX_0" value="1" />
		@@ -1956,6 +1966,10 @@
		<!--ctl name="TERT_TDM_RX_0 Channels" value="Six" /-->
		</path>

		<path name="bus-mic">
		<!--ctl name="TERT_TDM_TX_0 Channels" value="Four" /-->
		</path>

		<path name="sidetone-iir">
		</path>