Merge "config: lito: Update audio config files" (eee1d597) · Commits · e / os / android_hardware_qcom_audio

configs/lito/audio_io_policy.conf

+8 −2

Original line number	Diff line number	Diff line
		@@ -84,16 +84,22 @@ outputs {
		}

		inputs {
		record_16bit {
		formats AUDIO_FORMAT_PCM_16_BIT
		sampling_rates 8000\|16000\|32000\|44100\|48000\|88200\|96000\|176400\|192000
		bit_width 16
		app_type 69938
		}
		record_24bit {
		formats AUDIO_FORMAT_PCM_24_BIT_PACKED\|AUDIO_FORMAT_PCM_24_BIT
		sampling_rates 44100\|48000\|88200\|96000\|176400\|192000
		bit_width 24
		app_type 69938
		app_type 69948
		}
		record_32bit {
		formats AUDIO_FORMAT_PCM_32_BIT\|AUDIO_FORMAT_PCM_FLOAT
		sampling_rates 44100\|48000\|88200\|96000\|176400\|192000
		bit_width 32
		app_type 69938
		app_type 69949
		}
		}

configs/lito/audio_policy_configuration.xml

+6 −3

Original line number	Diff line number	Diff line
		@@ -262,15 +262,18 @@
		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
		samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>
		</devicePort>
		<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink">
		<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"
		encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE">
		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
		samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
		</devicePort>
		<devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink">
		<devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink"
		encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE">
		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
		samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
		</devicePort>
		<devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink">
		<devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink"
		encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE">
		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
		samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
		</devicePort>

configs/lito/lito.mk

+65 −6

Original line number	Diff line number	Diff line
		#BOARD_USES_GENERIC_AUDIO := true
		#
		#AUDIO_FEATURE_FLAGS
		ifeq ($(TARGET_USES_QMAA_OVERRIDE_AUDIO), false)
		ifeq ($(TARGET_USES_QMAA),true)
		AUDIO_USE_STUB_HAL := true
		endif
		endif

		ifneq ($(AUDIO_USE_STUB_HAL), true)
		BOARD_USES_ALSA_AUDIO := true
		TARGET_USES_AOSP_FOR_AUDIO := false

		ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true)
		USE_CUSTOM_AUDIO_POLICY := 1
		AUDIO_FEATURE_QSSI_COMPLIANCE := false
		AUDIO_FEATURE_ENABLED_COMPRESS_CAPTURE := false
		AUDIO_FEATURE_ENABLED_COMPRESS_INPUT := true
		AUDIO_FEATURE_ENABLED_CONCURRENT_CAPTURE := true
		AUDIO_FEATURE_ENABLED_COMPRESS_VOIP := false
		AUDIO_FEATURE_ENABLED_DYNAMIC_ECNS := true
		AUDIO_FEATURE_ENABLED_EXTN_FORMATS := true
		@@ -30,18 +40,18 @@ DTS_CODEC_M_ := false
		MM_AUDIO_ENABLED_SAFX := true
		AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false
		AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
		AUDIO_FEATURE_ENABLED_USB_TUNNEL_AUDIO := true
		AUDIO_FEATURE_ENABLED_SPLIT_A2DP := true
		AUDIO_FEATURE_ENABLED_USB_TUNNEL := true
		AUDIO_FEATURE_ENABLED_A2DP_OFFLOAD := true
		AUDIO_FEATURE_ENABLED_3D_AUDIO := true
		AUDIO_FEATURE_ENABLED_AHAL_EXT := true
		DOLBY_ENABLE := false
		endif

		USE_XML_AUDIO_POLICY_CONF := 1
		AUDIO_FEATURE_ENABLED_DLKM := true
		BOARD_SUPPORTS_SOUND_TRIGGER := true
		BOARD_SUPPORTS_GCS := false
		AUDIO_FEATURE_ENABLED_INSTANCE_ID := true
		AUDIO_USE_LL_AS_PRIMARY_OUTPUT := true
		AUDIO_USE_DEEP_AS_PRIMARY_OUTPUT := false
		AUDIO_FEATURE_ENABLED_VBAT_MONITOR := true
		AUDIO_FEATURE_ENABLED_ANC_HEADSET := true
		AUDIO_FEATURE_ENABLED_CUSTOMSTEREO := true
		@@ -86,8 +96,11 @@ PRODUCT_COPY_FILES += \
		vendor/qcom/opensource/audio-hal/primary-hal/configs/lito/audio_platform_info_intcodec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_intcodec.xml \
		vendor/qcom/opensource/audio-hal/primary-hal/configs/lito/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \
		vendor/qcom/opensource/audio-hal/primary-hal/configs/lito/sound_trigger_mixer_paths_qrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths_qrd.xml \
		vendor/qcom/opensource/audio-hal/primary-hal/configs/lito/mixer_paths_mtp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_mtp.xml \
		vendor/qcom/opensource/audio-hal/primary-hal/configs/lito/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \
		vendor/qcom/opensource/audio-hal/primary-hal/configs/lito/mixer_paths_qrd.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_qrd.xml \
		vendor/qcom/opensource/audio-hal/primary-hal/configs/lito/audio_configs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_configs.xml \
		vendor/qcom/opensource/audio-hal/primary-hal/configs/lito/audio_configs_stock.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_configs_stock.xml \
		frameworks/native/data/etc/android.hardware.audio.pro.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.pro.xml

		#XML Audio configuration files
		ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true)
		@@ -118,6 +131,11 @@ persist.vendor.audio.fluence.voicerec=false\
		persist.vendor.audio.fluence.speaker=true\
		persist.vendor.audio.fluence.tmic.enabled=false

		##speaker protection v3 switch and ADSP AFE API version
		PRODUCT_PROPERTY_OVERRIDES += \
		persist.vendor.audio.spv3.enable=true\
		persist.vendor.audio.avs.afe_api_version=2

		#disable tunnel encoding
		PRODUCT_PROPERTY_OVERRIDES += \
		vendor.audio.tunnel.encode=false
		@@ -187,6 +205,18 @@ vendor.audio.flac.sw.decoder.24bit=true
		PRODUCT_PROPERTY_OVERRIDES += \
		persist.vendor.bt.a2dp_offload_cap=sbc-aptx-aptxtws-aptxhd-aac-ldac

		# A2DP offload support
		PRODUCT_PROPERTY_OVERRIDES += \
		ro.bluetooth.a2dp_offload.supported=true

		# Disable A2DP offload
		PRODUCT_PROPERTY_OVERRIDES += \
		persist.bluetooth.a2dp_offload.disabled=false

		# A2DP offload DSP supported encoder list
		PRODUCT_PROPERTY_OVERRIDES += \
		persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac

		#enable software decoders for ALAC and APE
		PRODUCT_PROPERTY_OVERRIDES += \
		vendor.audio.use.sw.alac.decoder=true
		@@ -221,10 +251,29 @@ vendor.audio_hal.period_multiplier=3
		PRODUCT_PROPERTY_OVERRIDES += \
		vendor.audio.adm.buffering.ms=2

		#enable headset calibration
		PRODUCT_PROPERTY_OVERRIDES += \
		audio.volume.headset.gain.depcal=true

		#enable dualmic fluence for voice communication
		PRODUCT_PROPERTY_OVERRIDES += \
		persist.audio.fluence.voicecomm=true
		endif

		USE_XML_AUDIO_POLICY_CONF := 1

		#enable keytone FR
		PRODUCT_PROPERTY_OVERRIDES += \
		vendor.audio.hal.output.suspend.supported=true

		#Enable AAudio MMAP/NOIRQ data path
		#2 is AAUDIO_POLICY_AUTO so it will try MMAP then fallback to Legacy path
		PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_policy=2
		#Allow EXCLUSIVE then fall back to SHARED.
		PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_exclusive_policy=2
		PRODUCT_PROPERTY_OVERRIDES += aaudio.hw_burst_min_usec=2000


		#enable mirror-link feature
		PRODUCT_PROPERTY_OVERRIDES += \
		vendor.audio.enable.mirrorlink=false
		@@ -248,4 +297,14 @@ PRODUCT_PACKAGES += \
		android.hardware.audio.common@4.0-util \
		android.hardware.audio@4.0-impl \
		android.hardware.audio.effect@4.0 \
		android.hardware.audio.effect@4.0-impl
		android.hardware.audio.effect@4.0-impl \
		vendor.qti.hardware.audiohalext@1.0 \
		vendor.qti.hardware.audiohalext@1.0-impl \
		vendor.qti.hardware.audiohalext-utils

		PRODUCT_PACKAGES_ENG += \
		VoicePrintTest \
		VoicePrintDemo

		PRODUCT_PACKAGES_DEBUG += \
		AudioSettings