Merge baf78dbd65d82f052d4a5e6ce34443330aea2589 on remote branch (00ce93d6) · Commits · e / devices / Fairphone 4 / android_hardware_qcom_audio

configs/audio_vendor_product.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -141,6 +141,7 @@ MM_AUDIO += capi_v2_sumx
		MM_AUDIO += capi_v2_synth
		MM_AUDIO += capi_v2_avc
		MM_AUDIO += capi_v2_asrc
		MM_AUDIO += capi_v2_ecmx
		MM_AUDIO += icc_module.so.1
		MM_AUDIO += sec_module.so.1
		MM_AUDIO += audio-nxp-auto

configs/common_au/audio_policy_configuration.xml

+16 −0

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>Alerts Bus</item>
		<item>Front Passenger Bus</item>
		<item>Rear Seat Bus</item>
		<item>Built-In Mic</item>
		@@ -105,6 +106,10 @@
		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
		samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
		</mixPort>
		<mixPort name="alerts" role="source">
		<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"/>
		@@ -227,6 +232,15 @@
		minValueMB="-6000" maxValueMB="600" defaultValueMB="0" stepValueMB="100"/>
		</gains>
		</devicePort>
		<devicePort tagName="Alerts Bus" role="sink" type="AUDIO_DEVICE_OUT_BUS"
		address="BUS05_ALERTS">
		<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="Front Passenger Bus" role="sink" type="AUDIO_DEVICE_OUT_BUS"
		address="BUS08_FRONT_PASSENGER">
		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
		@@ -321,6 +335,8 @@
		sources="nav_guidance"/>
		<route type="mix" sink="Phone Bus"
		sources="phone"/>
		<route type="mix" sink="Alerts Bus"
		sources="alerts"/>
		<route type="mix" sink="Front Passenger Bus"
		sources="front_passenger"/>
		<route type="mix" sink="Rear Seat Bus"

configs/common_au/car_audio_configuration.xml

+8 −4

Original line number	Diff line number	Diff line
		@@ -42,10 +42,6 @@
		<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>
		@@ -60,6 +56,14 @@
		<context context="call_ring"/>
		</device>
		</group>
		<group>
		<device address="BUS05_ALERTS">
		<context context="emergency"/>
		<context context="safety"/>
		<context context="vehicle_status"/>
		<context context="announcement"/>
		</device>
		</group>
		</volumeGroups>
		<inputDevices>
		<inputDevice address="BUS04_INPUT"/>

configs/msmnile_au/audio_effects.xml

+0 −21

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@
		<library name="proxy" path="libeffectproxy.so"/>
		<library name="offload_bundle" path="libqcompostprocbundle.so"/>
		<library name="audio_pre_processing" path="libqcomvoiceprocessing.so"/>
		<library name="volume_listener" path="libvolumelistener.so"/>
		<library name="audiosphere" path="libasphere.so"/>
		<library name="shoebox" path="libshoebox.so"/>
		<library name="audio_bmt" path="libqtiautobundle.so"/>
		@@ -89,11 +88,6 @@
		<effect name="dynamics_processing" library="dynamics_processing" uuid="e0e6539b-1781-7261-676f-6d7573696340"/>
		<effect name="aec" library="audio_pre_processing" uuid="0f8d0d2a-59e5-45fe-b6e4-248c8a799109"/>
		<effect name="ns" library="audio_pre_processing" uuid="1d97bb0b-9e2f-4403-9ae3-58c2554306f8"/>
		<effect name="music_helper" library="volume_listener" uuid="08b8b058-0590-11e5-ac71-0025b32654a0"/>
		<effect name="ring_helper" library="volume_listener" uuid="0956df94-0590-11e5-bdbe-0025b32654a0"/>
		<effect name="alarm_helper" library="volume_listener" uuid="09f303e2-0590-11e5-8fdb-0025b32654a0"/>
		<effect name="voice_helper" library="volume_listener" uuid="0ace5c08-0590-11e5-ae9e-0025b32654a0"/>
		<effect name="notification_helper" library="volume_listener" uuid="0b776dde-0590-11e5-81ba-0025b32654a0"/>
		<effect name="audiosphere" library="audiosphere" uuid="184e62ab-2d19-4364-9d1b-c0a40733866c"/>
		<effect name="shoebox" library="shoebox" uuid="1eab784c-1a36-4b2a-b7fc-e34c44cab89e"/>
		<effect name="audio_bmt" library="audio_bmt" uuid="e039757b-a367-44e9-9bbb-634af0c51cb7"/>
		@@ -105,21 +99,6 @@
		<effect name="audio_synth" library="audio_synth" uuid="a124b54f-4026-4ed2-9316-4ba2d5effdb8"/>
		</effects>
		<postprocess>
		<stream type="music">
		<apply effect="music_helper"/>
		</stream>
		<stream type="ring">
		<apply effect="ring_helper"/>
		</stream>
		<stream type="alarm">
		<apply effect="alarm_helper"/>
		</stream>
		<stream type="voice_call">
		<apply effect="voice_helper"/>
		</stream>
		<stream type="notification">
		<apply effect="notification_helper"/>
		</stream>
		</postprocess>
		<preprocess>
		<stream type="voice_communication">

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
		}
		alerts {
		flags AUDIO_OUTPUT_FLAG_ALERTS
		formats AUDIO_FORMAT_PCM_16_BIT
		sampling_rates 48000
		bit_width 16
		app_type 69937
		}
		front_passenger {
		flags AUDIO_OUTPUT_FLAG_FRONT_PASSENGER
		formats AUDIO_FORMAT_PCM_16_BIT