From 29ad28b2737e82cc22a087654c499f0d2fabd4f9 Mon Sep 17 00:00:00 2001 From: SGCMarkus Date: Tue, 15 Feb 2022 19:08:04 +0100 Subject: [PATCH] sm8250-common: add common audio configs and audio hal --- BoardConfigCommon.mk | 17 ++ audio/audio_effects.xml | 47 +++ audio/audio_ext_spkr.conf | 24 ++ audio/audio_policy_configuration.xml | 270 +++++++++++++++++ audio/sound_trigger_mixer_paths.xml | 301 +++++++++++++++++++ audio/sound_trigger_platform_info.xml | 418 ++++++++++++++++++++++++++ sm8250.mk | 36 +++ 7 files changed, 1113 insertions(+) create mode 100644 audio/audio_effects.xml create mode 100644 audio/audio_ext_spkr.conf create mode 100644 audio/audio_policy_configuration.xml create mode 100644 audio/sound_trigger_mixer_paths.xml create mode 100644 audio/sound_trigger_platform_info.xml diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 038e4d4..3413478 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -75,6 +75,23 @@ AB_OTA_PARTITIONS += \ vbmeta_system \ vendor +# Audio +AUDIO_FEATURE_ENABLED_AHAL_EXT := false +AUDIO_FEATURE_ENABLED_DLKM := true +AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := false +AUDIO_FEATURE_ENABLED_DTS_EAGLE := false +AUDIO_FEATURE_ENABLED_DYNAMIC_LOG := false +AUDIO_FEATURE_ENABLED_EXT_AMPLIFIER := false +AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true +AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true +AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false +AUDIO_FEATURE_ENABLED_INSTANCE_ID := true +AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true +AUDIO_FEATURE_ENABLED_SSR := false +BOARD_SUPPORTS_SOUND_TRIGGER := true +BOARD_USES_ALSA_AUDIO := true +USE_CUSTOM_AUDIO_POLICY := 1 + # Metadata BOARD_USES_METADATA_PARTITION := true diff --git a/audio/audio_effects.xml b/audio/audio_effects.xml new file mode 100644 index 0000000..d025277 --- /dev/null +++ b/audio/audio_effects.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/audio_ext_spkr.conf b/audio/audio_ext_spkr.conf new file mode 100644 index 0000000..7febc2e --- /dev/null +++ b/audio/audio_ext_spkr.conf @@ -0,0 +1,24 @@ +global_config { + name default-file-untested +} + +ring { + #dB to attenuate playback to meet safety level at each volume step + #16 steps total, 15...0. In case of truncated list, last attenuation + #given will be applied to all lower volume steps + attenuation 36,36,35,35,33,33,33,27,27,21,21,13,13,3,3,3 +} + +voice { + #dB to attenuate playback to meet safety level at each volume step + #16 steps total, 15...0. In case of truncated list, last attenuation + #given will be applied to all lower volume steps + attenuation 36,36,35,35,33,33,33,27,27,21,21,13,13,3,3,3 +} + +media { + #dB to attenuate playback to meet safety level at each volume step + #16 steps total, 15...0. In case of truncated list, last attenuation + #given will be applied to all lower volume steps + attenuation 36,36,35,35,33,33,33,27,27,21,21,13,13,3,3,3 +} diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml new file mode 100644 index 0000000..70489b1 --- /dev/null +++ b/audio/audio_policy_configuration.xml @@ -0,0 +1,270 @@ + + + + + + + + + + + + + Earpiece + Speaker + Telephony Tx + Built-In Mic + Built-In Back Mic + Telephony Rx + FM tuner + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/sound_trigger_mixer_paths.xml b/audio/sound_trigger_mixer_paths.xml new file mode 100644 index 0000000..3bf5f5d --- /dev/null +++ b/audio/sound_trigger_mixer_paths.xml @@ -0,0 +1,301 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/sound_trigger_platform_info.xml b/audio/sound_trigger_platform_info.xml new file mode 100644 index 0000000..68a2c49 --- /dev/null +++ b/audio/sound_trigger_platform_info.xml @@ -0,0 +1,418 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sm8250.mk b/sm8250.mk index c7078c7..5c04752 100644 --- a/sm8250.mk +++ b/sm8250.mk @@ -41,3 +41,39 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES_DEBUG += \ bootctl + +# Audio +PRODUCT_PACKAGES += \ + android.hardware.audio@6.0-impl \ + android.hardware.audio.effect@6.0-impl \ + android.hardware.audio.service \ + android.hardware.bluetooth.audio@2.0-impl \ + android.hardware.soundtrigger@2.3-impl \ + audio.a2dp.default \ + audio.bluetooth.default \ + audio.primary.kona \ + audio.r_submix.default \ + audio.usb.default \ + libaudiopreprocessing \ + libbundlewrapper \ + libdownmix \ + libdynproc \ + libeffectproxy \ + libldnhncr \ + libqcomvisualizer \ + libqcomvoiceprocessing \ + libqcreverb \ + libreverbwrapper \ + libvisualizer + +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ + $(LOCAL_PATH)/audio/audio_ext_spkr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_ext_spkr.conf \ + $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ + $(LOCAL_PATH)/audio/sound_trigger_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_mixer_paths.xml \ + $(LOCAL_PATH)/audio/sound_trigger_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_platform_info.xml \ + +PRODUCT_COPY_FILES += \ + frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \ + frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \ + frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml