From 9e87105b6818f61bdb2d92972a58a1f5b6d1dd6a Mon Sep 17 00:00:00 2001 From: David Wronek Date: Wed, 28 May 2025 20:22:42 +0200 Subject: [PATCH] adsp crashing --- BoardConfigCommon.mk | 9 +--- audio/audio_policy_configuration.xml | 59 ++-------------------- audio/usbv2_audio_policy_configuration.xml | 47 +++++++++++++++++ common.mk | 17 ++++--- extract-files.py | 7 +-- proprietary-files.txt | 29 ++--------- 6 files changed, 68 insertions(+), 100 deletions(-) create mode 100644 audio/usbv2_audio_policy_configuration.xml diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 99ab542..b7cee3c 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -23,8 +23,6 @@ AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true AUDIO_FEATURE_ENABLED_GKI := true AUDIO_FEATURE_ENABLED_INSTANCE_ID := true -AUDIO_FEATURE_ENABLED_LSM_HIDL := true -AUDIO_FEATURE_ENABLED_AGM_HIDL := true AUDIO_FEATURE_ENABLED_PAL_HIDL := true AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true AUDIO_FEATURE_ENABLED_SSR := true @@ -32,9 +30,6 @@ AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true BOARD_SUPPORTS_OPENSOURCE_STHAL := true BOARD_SUPPORTS_SOUND_TRIGGER := true BOARD_USES_ALSA_AUDIO := true -TARGET_PROVIDES_AUDIO_HAL := true -TARGET_PROVIDES_LIBAGM := true -TARGET_PROVIDES_LIBAR_PAL := true TARGET_USES_QCOM_MM_AUDIO := true # Boot @@ -62,9 +57,7 @@ DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE := \ DEVICE_MANIFEST_FILE := \ $(COMMON_PATH)/vintf/manifest_pineapple.xml \ - $(COMMON_PATH)/vintf/manifest_samsung.xml \ - hardware/qcom-caf/sm8650/audio/primary-hal/configs/common/manifest_non_qmaa.xml \ - hardware/qcom-caf/sm8650/audio/primary-hal/configs/common/manifest_non_qmaa_extn.xml + $(COMMON_PATH)/vintf/manifest_samsung.xml DEVICE_MATRIX_FILE := hardware/qcom-caf/common/compatibility_matrix.xml diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml index c84a1cf..485c601 100644 --- a/audio/audio_policy_configuration.xml +++ b/audio/audio_policy_configuration.xml @@ -101,7 +101,6 @@ SPDX-License-Identifier: BSD-3-Clause-Clear - @@ -209,17 +208,6 @@ SPDX-License-Identifier: BSD-3-Clause-Clear - - - - - - @@ -315,14 +302,6 @@ SPDX-License-Identifier: BSD-3-Clause-Clear - - - - - - @@ -370,10 +349,6 @@ SPDX-License-Identifier: BSD-3-Clause-Clear stepValueMB="100"/> - - - - @@ -410,33 +385,26 @@ SPDX-License-Identifier: BSD-3-Clause-Clear sources="primary output,raw,mmap_no_irq_out,deep_buffer,direct_pcm,compressed_offload,voip_rx,haptics output,spatial output,Telephony Rx"/> - - - + sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,Wired Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,Wired Headset Mic"/> + sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,Wired Headset Mic,BLE In"/> + sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,Wired Headset Mic"/> - @@ -464,24 +432,7 @@ SPDX-License-Identifier: BSD-3-Clause-Clear --> - - - - - - - - - - - - - - - + diff --git a/audio/usbv2_audio_policy_configuration.xml b/audio/usbv2_audio_policy_configuration.xml new file mode 100644 index 0000000..e96f7a3 --- /dev/null +++ b/audio/usbv2_audio_policy_configuration.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common.mk b/common.mk index 5323112..f4b0da3 100644 --- a/common.mk +++ b/common.mk @@ -31,42 +31,43 @@ PRODUCT_PACKAGES += \ android.hardware.audio.service \ android.hardware.bluetooth.audio-impl \ android.hardware.soundtrigger@2.3-impl \ + audioadsprpcd \ audio.bluetooth.default \ + audio.primary.pineapple \ audio.r_submix.default \ audio.usbv2.default \ libagm_compress_plugin \ libagm_mixer_plugin \ libagm_pcm_plugin \ - libats \ libaudiochargerlistener \ libbatterylistener \ + libcustomva_intf \ libfmpal \ libhfp_pal \ + libhotword_intf \ libqcompostprocbundle \ libqcomvisualizer \ libqcomvoiceprocessing \ libvolumelistener \ - sound_trigger.primary.pineapple \ - vendor.qti.audio-adsprpc-service.rc \ - vendor.qti.hardware.AGMIPC@1.0-impl + sound_trigger.primary.pineapple AUDIO_HAL_DIR := hardware/qcom-caf/sm8650/audio/primary-hal AUDIO_PAL_DIR := hardware/qcom-caf/sm8650/audio/pal PRODUCT_COPY_FILES += \ - $(AUDIO_HAL_DIR)/configs/common/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ $(AUDIO_HAL_DIR)/configs/pineapple/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_pineapple/audio_effects.conf \ $(AUDIO_HAL_DIR)/configs/pineapple/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_pineapple/audio_effects.xml \ $(AUDIO_HAL_DIR)/configs/pineapple/microphone_characteristics.xml:$(TARGET_COPY_OUT_VENDOR)/etc/microphone_characteristics.xml \ + $(AUDIO_PAL_DIR)/configs/pineapple/card-defs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/card-defs.xml \ $(AUDIO_PAL_DIR)/configs/pineapple/Hapticsconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/Hapticsconfig.xml \ $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/sku_pineapple/audio_policy_configuration.xml \ - $(LOCAL_PATH)/audio/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ - $(LOCAL_PATH)/audio/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ + $(LOCAL_PATH)/audio/usbv2_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usbv2_audio_policy_configuration.xml PRODUCT_COPY_FILES += \ + frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml \ + frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.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 \ frameworks/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml \ frameworks/native/data/etc/android.hardware.audio.pro.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.pro.xml \ frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml diff --git a/extract-files.py b/extract-files.py index 15721f3..aca6113 100755 --- a/extract-files.py +++ b/extract-files.py @@ -40,13 +40,8 @@ lib_fixups: lib_fixups_user_type = { 'vendor.qti.diaghal@1.0', ): lib_fixup_vendor_suffix, ( - 'libagmclient', - 'libar-acdb', - 'libar-gpr', - 'libar-gsl', - 'libats', + 'libar-pal', 'liblx-osal', - 'vendor.qti.hardware.AGMIPC@1.0-impl', ): lib_fixup_remove, } diff --git a/proprietary-files.txt b/proprietary-files.txt index c0a88df..28927ce 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -2,7 +2,6 @@ # ADSP vendor/bin/adsprpcd -vendor/bin/audioadsprpcd vendor/bin/loadalgo vendor/etc/init/vendor.qti.adsprpc-guestos-service.rc vendor/lib64/libadsp_default_listener.so @@ -37,8 +36,6 @@ vendor/etc/models/acd/environment.eai vendor/etc/models/acd/event.eai vendor/etc/models/acd/music.eai vendor/etc/models/acd/speech.eai -vendor/lib64/hw/audio.primary.pineapple.so;DISABLE_CHECKELF -vendor/lib64/hw/vendor.samsung.hardware.audio@1.0-impl.so vendor/lib64/libAlacSwDec.so vendor/lib64/libApeSwDec.so vendor/lib64/libEvrcSwCodec.so @@ -47,44 +44,24 @@ vendor/lib64/libPeripheralStateUtils.so vendor/lib64/libVoiceSdk.so vendor/lib64/lib_lvacfs.so vendor/lib64/libadm.so -vendor/lib64/libagm.so;DISABLE_CHECKELF -vendor/lib64/libar-pal.so;DISABLE_CHECKELF -vendor/lib64/libarmemlog.so;DISABLE_CHECKELF -vendor/lib64/libaudio_log_utils.so vendor/lib64/libaudiofeaturestats.so vendor/lib64/liblistensoundmodel2vendor.so vendor/lib64/libprofileparamstorage.so -vendor/lib64/librecordalive.so -vendor/lib64/libsecaudiocoreutils.so -vendor/lib64/libsecaudioinfo.so -vendor/lib64/libsecaudiolevel.so +vendor/lib64/libqtigefar.so;DISABLE_CHECKELF vendor/lib64/libspatializerparamstorage.so vendor/lib64/libspeakercalibration.so vendor/lib64/libtensorflowlite_c.so vendor/lib64/libvui_dmgr.so vendor/lib64/libvui_dmgr_client.so vendor/lib64/libvui_intf.so;DISABLE_CHECKELF -vendor/lib64/vendor.qti.hardware.pal@1.0-impl.so -vendor/lib64/vendor.samsung.hardware.audio@1.0.so # Audio configs vendor/etc/mem_logger_config.xml # Audio FX modules -vendor/lib64/lib_SamsungRec_08020.so -vendor/lib64/lib_SoundAlive_3DPosition_ver202.so -vendor/lib64/lib_SoundAlive_AlbumArt_ver105.so -vendor/lib64/lib_SoundAlive_play_plus_ver800.so -vendor/lib64/lib_SoundBooster_ver2000.so vendor/lib64/soundfx/libasphere.so -vendor/lib64/soundfx/libaudioeffectoffload.so -vendor/lib64/soundfx/libaudiosaplus_sec.so -vendor/lib64/soundfx/libmyspace.so vendor/lib64/soundfx/libquasar.so -vendor/lib64/soundfx/libsamsungSoundbooster_plus.so vendor/lib64/soundfx/libshoebox.so -vendor/lib64/soundfx/libswdap.so -vendor/lib64/soundfx/libswspatializer.so # Bluetooth vendor/bin/hw/android.hardware.bluetooth@1.1-service-qti @@ -681,6 +658,10 @@ vendor/lib64/vendor.qti.hardware.trustedui@1.0.so vendor/lib64/vendor.qti.hardware.trustedui@1.1.so vendor/lib64/vendor.qti.hardware.trustedui@1.2.so +# UBWCP +vendor/bin/ubwcconvert +vendor/lib64/libubwcp.so + # Wi-Fi vendor/bin/cnss-daemon vendor/etc/wifi/indoorchannel.info