From f5855c15aa0c34ad6781ecd92d1c0bbd368fd8d1 Mon Sep 17 00:00:00 2001
From: ZeeLog <Danjel.Zammit@gmail.com>
Date: Fri, 9 Apr 2021 10:57:33 +0200
Subject: [PATCH] G: Align audio feature flags/props with CAF

* restore some board flags which are still active
* update audio properties
* build dependencies (32bit) for newly added features
---
 BoardConfig.mk |  2 ++
 device.mk      |  7 +++----
 vendor.prop    | 43 ++++++++++++++++++++++++-------------------
 3 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 4fd710f2..0b28272d 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -40,6 +40,8 @@ TARGET_KERNEL_VERSION := 4.9
 BOARD_ANT_WIRELESS_DEVICE := "vfs-prerelease"
 
 # Audio
+AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true
+AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true
 AUDIO_USE_LL_AS_PRIMARY_OUTPUT := true
 BOARD_SUPPORTS_SOUND_TRIGGER := true
 BOARD_USES_ALSA_AUDIO := true
diff --git a/device.mk b/device.mk
index e941faa7..51f13d8d 100644
--- a/device.mk
+++ b/device.mk
@@ -71,15 +71,14 @@ PRODUCT_PACKAGES += \
     sound_trigger.primary.msm8953:32
 
 PRODUCT_PACKAGES += \
-    libaudiopreprocessing \
-    libaudioroute \
     libaacwrapper \
     libaudio-resampler \
+    libhfp:32 \
     libqcomvisualizer \
     libqcomvoiceprocessing \
     libqcompostprocbundle \
-    libvolumelistener \
-    libtinycompress
+    libsndmonitor:32 \
+    libspkrprot:32
 
 # Audio configuration
 PRODUCT_COPY_FILES += \
diff --git a/vendor.prop b/vendor.prop
index ce7f36d5..57ba307f 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -1,43 +1,48 @@
 # Audio
-af.fast_track_multiplier=1
-audio.chk.cal.us=0
+af.fast_track_multiplier=2
 audio.deep_buffer.media=true
-audio.offload.disable=false
+audio.offload.disable=true
 audio.offload.min.duration.secs=30
 audio.offload.video=true
+persist.vendor.audio.fluence.speaker=true
+persist.vendor.audio.fluence.voicecall=true
+persist.vendor.audio.fluence.voicerec=false
 persist.vendor.audio.hw.binder.size_kbyte=1024
-persist.vendor.audio.speaker.prot.enable=false
-ro.audio.soundfx.dirac=true
+ro.config.media_vol_steps=25
+ro.vendor.audio.sdk.fluencetype=fluence
 ro.vendor.audio.sdk.ssr=false
-vendor.audio.dolby.ds2.enabled=false
-vendor.audio.dolby.ds2.hardbypass=false
-vendor.audio.feature.hifi_audio.enable=true
+vendor.audio.feature.anc_headset.enable=true
+vendor.audio.feature.compress_meta_data.enable=true
 vendor.audio.feature.compr_voip.enable=true
-vendor.audio.feature.src_trkn.enable=true
-vendor.audio.feature.wsa.enable=true
-vendor.audio.feature.fluence.enable=true
 vendor.audio.feature.custom_stereo.enable=true
-vendor.audio.feature.anc_headset.enable=true
+vendor.audio.feature.fluence.enable=true
 vendor.audio.feature.fm.enable=true
-vendor.audio.feature.multi_voice_session.enable=true
+vendor.audio.feature.hfp.enable=true
+vendor.audio.feature.hifi_audio.enable=true
 vendor.audio.feature.incall_music.enable=true
+vendor.audio.feature.kpi_optimize.enable=true
+vendor.audio.feature.multi_voice_session.enable=true
+vendor.audio.feature.snd_mon.enable=true
+vendor.audio.feature.spkr_prot.enable=true
+vendor.audio.feature.src_trkn.enable=true
+vendor.audio.feature.vbat.enable=true
+vendor.audio.feature.wsa.enable=true
 vendor.audio.flac.sw.decoder.24bit=true
-vendor.audio_hal.period_size=192
-vendor.audio.hw.aac.encoder=true
+vendor.audio.hal.boot.timeout.ms=20000
 vendor.audio.offload.buffer.size.kb=64
 vendor.audio.offload.gapless.enabled=true
 vendor.audio.offload.multiaac.enable=true
 vendor.audio.offload.multiple.enabled=false
-vendor.audio.offload.passthrough=false
-vendor.audio.offload.track.enable=false
+vendor.audio.offload.track.enable=true
 vendor.audio.parser.ip.buffer.size=262144
 vendor.audio.playback.mch.downsample=true
-vendor.audio.pp.asphere.enabled=false
-vendor.audio.read.wsatz.type=true
 vendor.audio.safx.pbe.enabled=true
 vendor.audio.tunnel.encode=false
 vendor.audio.use.sw.alac.decoder=true
 vendor.audio.use.sw.ape.decoder=true
+vendor.audio_hal.period_size=192
+vendor.audio.read.wsatz.type=true
+vendor.fastrpc.disable.adsprpcd_sensorspd.daemon=1
 vendor.voice.conc.fallbackpath=deep-buffer
 vendor.voice.path.for.pcm.voip=true
 vendor.voice.playback.conc.disabled=true