Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit f9a2a65c authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'LA.UM.9.14.r1-24200-LAHAINA.QSSI13.0' into... 

Merge tag 'LA.UM.9.14.r1-24200-LAHAINA.QSSI13.0' into staging/lineage-21.0_merge-LA.UM.9.14.r1-24200-LAHAINA.QSSI13.0

"LA.UM.9.14.r1-24200-LAHAINA.QSSI13.0"

* tag 'LA.UM.9.14.r1-24200-LAHAINA.QSSI13.0':
  hal: disable unused feature to reduce memory footprint
  configs:rb3gen2: add speaker-and-hdmi path for low-latency-playback
  configs: create blocklist for audio to load different framework ko files
  configs:removed unsupported sched_boost param for perf opt
  hal: fix libadm.so right path in LE platform
  hal: rb3gen2: Enable use of hdmi for voip/voice
  primary-hal: Fix stability issues
  audio-hal: Enable AUDIO_FEATURE_ENABLED_DAEMON_SUPPORT for msmnile_gvmq_vcu
  configs: rb3gen2: modified format for mixer_paths_yupikidprb3
  configs : rb3gen2: added support for HDMI In backend interface
  configs : rb3gen2: added support for HDMI backend interface
  config: activate AUDIO_USE_STUB_HAL for audiolite
  hal: add support for rb3gen2 specific audio platform xml
  HAL: Fix for crash due to structure mismatch during st deinit
  hal: sndmonitor: Fix for Code vulnerability
  hal: disable unused feature to reduce memory footprint

 Conflicts:
	configs/lahaina/lahaina.mk
	hal/Android.mk

Change-Id: I77e701d2bf4e52d94b40a1e2e495df6b4995e144
parents 32b7a1b2 b2f45def

configs/audio_vendor_product.mk

+4 −0
Original line number Original line Diff line number Diff line
@@ -5,6 +5,10 @@ AUDIO_USE_STUB_HAL := true 
endif # TARGET_USES_QMAA_OVERRIDE_AUDIO

endif # TARGET_USES_QMAA_OVERRIDE_AUDIO

endif # TARGET_USES_QMAA

endif # TARGET_USES_QMAA





ifeq ($(TARGET_USES_AUDIOLITE),true)

AUDIO_USE_STUB_HAL := true

endif #ends TARGET_USES_AUDIOLITE



#MM_AUDIO product packages

#MM_AUDIO product packages

MM_AUDIO += audiod

MM_AUDIO += audiod

MM_AUDIO += libacdbloader

MM_AUDIO += libacdbloader

configs/bengal/bengal.mk

+70 −32
Original line number Original line Diff line number Diff line
@@ -15,76 +15,114 @@ ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true) 
USE_CUSTOM_AUDIO_POLICY := 1

USE_CUSTOM_AUDIO_POLICY := 1

AUDIO_FEATURE_QSSI_COMPLIANCE := true

AUDIO_FEATURE_QSSI_COMPLIANCE := true

AUDIO_FEATURE_ENABLED_COMPRESS_CAPTURE := 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_COMPRESS_VOIP := false

AUDIO_FEATURE_ENABLED_DYNAMIC_ECNS := true

AUDIO_FEATURE_ENABLED_DYNAMIC_ECNS := true

AUDIO_FEATURE_ENABLED_EXTN_FORMATS := true

AUDIO_FEATURE_ENABLED_EXTN_FORMATS := true

AUDIO_FEATURE_ENABLED_EXTN_FLAC_DECODER := true

AUDIO_FEATURE_ENABLED_EXTN_RESAMPLER := true

AUDIO_FEATURE_ENABLED_FM_POWER_OPT := true

AUDIO_FEATURE_ENABLED_HDMI_SPK := true

AUDIO_FEATURE_ENABLED_PCM_OFFLOAD := true

AUDIO_FEATURE_ENABLED_PCM_OFFLOAD := true

AUDIO_FEATURE_ENABLED_PCM_OFFLOAD_24 := true

AUDIO_FEATURE_ENABLED_FLAC_OFFLOAD := true

AUDIO_FEATURE_ENABLED_VORBIS_OFFLOAD := true

AUDIO_FEATURE_ENABLED_WMA_OFFLOAD := true

AUDIO_FEATURE_ENABLED_ALAC_OFFLOAD := true

AUDIO_FEATURE_ENABLED_APE_OFFLOAD := true

AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD := true

AUDIO_FEATURE_ENABLED_MPEGH_SW_DECODER := true

AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true

AUDIO_FEATURE_ENABLED_SSR := true

AUDIO_FEATURE_ENABLED_DTS_EAGLE := false

AUDIO_FEATURE_ENABLED_DTS_EAGLE := false

BOARD_USES_SRS_TRUEMEDIA := false

BOARD_USES_SRS_TRUEMEDIA := false

DTS_CODEC_M_ := false

DTS_CODEC_M_ := false

MM_AUDIO_ENABLED_SAFX := true

AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false

AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false

AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true

AUDIO_FEATURE_ENABLED_USB_TUNNEL := true

AUDIO_FEATURE_ENABLED_A2DP_OFFLOAD := true

AUDIO_FEATURE_ENABLED_A2DP_OFFLOAD := true

AUDIO_FEATURE_ENABLED_3D_AUDIO := true

AUDIO_FEATURE_ENABLED_AHAL_EXT := false

AUDIO_FEATURE_ENABLED_AHAL_EXT := false

AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true

DOLBY_ENABLE := false

DOLBY_ENABLE := false

endif

endif





AUDIO_FEATURE_ENABLED_DLKM := true

AUDIO_FEATURE_ENABLED_DLKM := true

BOARD_SUPPORTS_SOUND_TRIGGER := true

BOARD_SUPPORTS_GCS := false

BOARD_SUPPORTS_GCS := false

AUDIO_FEATURE_ENABLED_INSTANCE_ID := true

AUDIO_FEATURE_ENABLED_INSTANCE_ID := true

AUDIO_USE_DEEP_AS_PRIMARY_OUTPUT := false

AUDIO_USE_DEEP_AS_PRIMARY_OUTPUT := false

AUDIO_FEATURE_ENABLED_VBAT_MONITOR := true

AUDIO_FEATURE_ENABLED_VBAT_MONITOR := true

AUDIO_FEATURE_ENABLED_NT_PAUSE_TIMEOUT := true

AUDIO_FEATURE_ENABLED_NT_PAUSE_TIMEOUT := true

AUDIO_FEATURE_ENABLED_ANC_HEADSET := true

AUDIO_FEATURE_ENABLED_CUSTOMSTEREO := true

AUDIO_FEATURE_ENABLED_CUSTOMSTEREO := true

AUDIO_FEATURE_ENABLED_FLUENCE := true

AUDIO_FEATURE_ENABLED_FLUENCE := true

AUDIO_FEATURE_ENABLED_HDMI_EDID := true

AUDIO_FEATURE_ENABLED_HDMI_PASSTHROUGH := true

#AUDIO_FEATURE_ENABLED_KEEP_ALIVE := true

#AUDIO_FEATURE_ENABLED_KEEP_ALIVE := true

AUDIO_FEATURE_ENABLED_DISPLAY_PORT := true

AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := false

AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := false

AUDIO_FEATURE_ENABLED_HFP := true

AUDIO_FEATURE_ENABLED_INCALL_MUSIC := true

AUDIO_FEATURE_ENABLED_INCALL_MUSIC := true

AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true

AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true

AUDIO_FEATURE_ENABLED_KPI_OPTIMIZE := true

AUDIO_FEATURE_ENABLED_KPI_OPTIMIZE := true

AUDIO_FEATURE_ENABLED_SPKR_PROTECTION := true

AUDIO_FEATURE_ENABLED_SPKR_PROTECTION := true

AUDIO_FEATURE_ENABLED_ACDB_LICENSE := false

AUDIO_FEATURE_ENABLED_ACDB_LICENSE := false

AUDIO_FEATURE_ENABLED_DEV_ARBI := false

AUDIO_FEATURE_ENABLED_DEV_ARBI := false

AUDIO_FEATURE_ENABLED_DYNAMIC_LOG := true

MM_AUDIO_ENABLED_FTM := true

MM_AUDIO_ENABLED_FTM := true

TARGET_USES_QCOM_MM_AUDIO := true

TARGET_USES_QCOM_MM_AUDIO := true

AUDIO_FEATURE_ENABLED_SOURCE_TRACKING := true

AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true

BOARD_SUPPORTS_QAHW := false

BOARD_SUPPORTS_QAHW := false

AUDIO_FEATURE_ENABLED_RAS := true

AUDIO_FEATURE_ENABLED_RAS := true

AUDIO_FEATURE_ENABLED_SND_MONITOR := true

AUDIO_FEATURE_ENABLED_SND_MONITOR := true

AUDIO_FEATURE_ENABLED_USB_BURST_MODE := true

AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true

AUDIO_FEATURE_ENABLED_BATTERY_LISTENER := true

AUDIO_FEATURE_ENABLED_BATTERY_LISTENER := true

##AUDIO_FEATURE_FLAGS

##AUDIO_FEATURE_FLAGS





ifeq ($(TARGET_1G_DDR_RAM), true)

AUDIO_FEATURE_ENABLED_AUDIOSPHERE := false

AUDIO_FEATURE_ENABLED_3D_AUDIO := false

BOARD_SUPPORTS_SOUND_TRIGGER := false

AUDIO_FEATURE_ENABLED_HFP := false

AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := false

BOARD_SUPPORTS_OPENSOURCE_STHAL := false

AUDIO_DO_NOT_USE_OMX_CODEC := true

AUDIO_FEATURE_ENABLED_COMPRESS_INPUT := false

AUDIO_FEATURE_ENABLED_CONCURRENT_CAPTURE := false

AUDIO_FEATURE_ENABLED_EXTN_FLAC_DECODER := false

AUDIO_FEATURE_ENABLED_EXTN_RESAMPLER := false

AUDIO_FEATURE_ENABLED_FM_POWER_OPT := false

AUDIO_FEATURE_ENABLED_HDMI_SPK := false

AUDIO_FEATURE_ENABLED_PCM_OFFLOAD_24 := false

AUDIO_FEATURE_ENABLED_FLAC_OFFLOAD := false

AUDIO_FEATURE_ENABLED_VORBIS_OFFLOAD := false

AUDIO_FEATURE_ENABLED_WMA_OFFLOAD := false

AUDIO_FEATURE_ENABLED_ALAC_OFFLOAD := false

AUDIO_FEATURE_ENABLED_APE_OFFLOAD := false

AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD := false

AUDIO_FEATURE_ENABLED_MPEGH_SW_DECODER := false

AUDIO_FEATURE_ENABLED_PROXY_DEVICE := false

AUDIO_FEATURE_ENABLED_SSR := false

MM_AUDIO_ENABLED_SAFX := false

AUDIO_FEATURE_ENABLED_USB_TUNNEL := false

AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := false

AUDIO_FEATURE_ENABLED_ANC_HEADSET := false

AUDIO_FEATURE_ENABLED_HDMI_EDID := false

AUDIO_FEATURE_ENABLED_HDMI_PASSTHROUGH := false

AUDIO_FEATURE_ENABLED_DISPLAY_PORT := false

AUDIO_FEATURE_ENABLED_DYNAMIC_LOG := false

AUDIO_FEATURE_ENABLED_SOURCE_TRACKING := false

AUDIO_FEATURE_ENABLED_GEF_SUPPORT := false

AUDIO_FEATURE_ENABLED_USB_BURST_MODE := false

PURGE_UNUSED_MEMORY := true

else

AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true

AUDIO_FEATURE_ENABLED_3D_AUDIO := true

BOARD_SUPPORTS_SOUND_TRIGGER := true

AUDIO_FEATURE_ENABLED_HFP := true

AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true

BOARD_SUPPORTS_OPENSOURCE_STHAL := true

BOARD_SUPPORTS_OPENSOURCE_STHAL := true

AUDIO_FEATURE_ENABLED_COMPRESS_INPUT := true

AUDIO_FEATURE_ENABLED_CONCURRENT_CAPTURE := true

AUDIO_FEATURE_ENABLED_EXTN_FLAC_DECODER := true

AUDIO_FEATURE_ENABLED_EXTN_RESAMPLER := true

AUDIO_FEATURE_ENABLED_FM_POWER_OPT := true

AUDIO_FEATURE_ENABLED_HDMI_SPK := true

AUDIO_FEATURE_ENABLED_PCM_OFFLOAD_24 := true

AUDIO_FEATURE_ENABLED_FLAC_OFFLOAD := true

AUDIO_FEATURE_ENABLED_VORBIS_OFFLOAD := true

AUDIO_FEATURE_ENABLED_WMA_OFFLOAD := true

AUDIO_FEATURE_ENABLED_ALAC_OFFLOAD := true

AUDIO_FEATURE_ENABLED_APE_OFFLOAD := true

AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD := true

AUDIO_FEATURE_ENABLED_MPEGH_SW_DECODER := true

AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true

AUDIO_FEATURE_ENABLED_SSR := true

MM_AUDIO_ENABLED_SAFX := true

AUDIO_FEATURE_ENABLED_USB_TUNNEL := true

AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true

AUDIO_FEATURE_ENABLED_ANC_HEADSET := true

AUDIO_FEATURE_ENABLED_HDMI_EDID := true

AUDIO_FEATURE_ENABLED_HDMI_PASSTHROUGH := true

AUDIO_FEATURE_ENABLED_DISPLAY_PORT := true

AUDIO_FEATURE_ENABLED_DYNAMIC_LOG := true

AUDIO_FEATURE_ENABLED_SOURCE_TRACKING := true

AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true

AUDIO_FEATURE_ENABLED_USB_BURST_MODE := true

endif





AUDIO_HARDWARE := audio.a2dp.default

AUDIO_HARDWARE := audio.a2dp.default

AUDIO_HARDWARE += audio.usb.default

AUDIO_HARDWARE += audio.usb.default