Merge 445f39bcf180660c2e2a532cc7cae644336ae587 on remote branch
Change-Id: Ifccf9474f02e9a1256d08985488df77424d1e767
diff --git a/configs/qssi/audio_system_product.mk b/configs/qssi/audio_system_product.mk
new file mode 100644
index 0000000..6b36f76
--- /dev/null
+++ b/configs/qssi/audio_system_product.mk
@@ -0,0 +1,31 @@
+MM_AUDIO := libaudiohal
+MM_AUDIO += audiosphere
+MM_AUDIO += audiosphere.xml
+MM_AUDIO += vendor.qti.voiceprint-V1.0-java
+MM_AUDIO += libbinauralrenderer_wrapper.qti
+MM_AUDIO += libhoaeffects_csim
+MM_AUDIO += libhoaeffects.qti
+MM_AUDIO += liblistenjni.qti
+MM_AUDIO += liblistensoundmodel2.qti
+MM_AUDIO += libvr_amb_engine
+MM_AUDIO += libvraudio_client.qti
+MM_AUDIO += libvraudio
+MM_AUDIO += libvr_object_engine
+MM_AUDIO += libvr_sam_wrapper
+MM_AUDIO += vendor.qti.voiceprint@1.0
+MM_AUDIO += libaudio-resampler
+MM_AUDIO += libaudioprocessing
+MM_AUDIO += libaudiopolicymanagerdefault
+MM_AUDIO += libaudiopolicyenginedefault
+
+MM_AUDIO += mixerops_objdump
+MM_AUDIO += test-mixer
+MM_AUDIO += test-resampler
+MM_AUDIO += mixerops_benchmark
+MM_AUDIO += resampler_tests
+
+MM_AUDIO_DBG := MhaPlayerDemoApp
+MM_AUDIO_DBG += MhaRecorderDemoApp
+
+PRODUCT_PACKAGES += $(MM_AUDIO)
+PRODUCT_PACKAGES_DEBUG += $(MM_AUDIO_DBG)
\ No newline at end of file
diff --git a/configs/qssi/qssi.mk b/configs/qssi/qssi.mk
index 7dce898..424888d 100644
--- a/configs/qssi/qssi.mk
+++ b/configs/qssi/qssi.mk
@@ -45,67 +45,17 @@
DEVICE_PACKAGE_OVERLAYS += hardware/qcom/audio/configs/common/overlay
endif
-# Low latency audio buffer size in frames
-PRODUCT_PROPERTY_OVERRIDES += \
- vendor.audio_hal.period_size=192
-
-#disable tunnel encoding
-PRODUCT_PROPERTY_OVERRIDES += \
-vendor.audio.tunnel.encode=false
-
-#Buffer size in kbytes for compress offload playback
-PRODUCT_PROPERTY_OVERRIDES += \
-vendor.audio.offload.buffer.size.kb=32
-
-#Enable audio track offload by default
-PRODUCT_PROPERTY_OVERRIDES += \
-vendor.audio.offload.track.enable=true
-
-#enable voice path for PCM VoIP by default
-PRODUCT_PROPERTY_OVERRIDES += \
-vendor.voice.path.for.pcm.voip=true
-
-#Enable multi channel aac through offload
-PRODUCT_PROPERTY_OVERRIDES += \
-vendor.audio.offload.multiaac.enable=true
-
-#Disable Multiple offload sesison
-PRODUCT_PROPERTY_OVERRIDES += \
-vendor.audio.offload.multiple.enabled=false
-
-#parser input buffer size(256kb) in byte stream mode
-PRODUCT_PROPERTY_OVERRIDES += \
-vendor.audio.parser.ip.buffer.size=262144
-
-#flac sw decoder 24 bit decode capability
-PRODUCT_PROPERTY_OVERRIDES += \
-vendor.audio.flac.sw.decoder.24bit=true
-
-#split a2dp DSP supported encoder list
-PRODUCT_PROPERTY_OVERRIDES += \
-persist.vendor.bt.a2dp_offload_cap=sbc-aptx-aptxtws-aptxhd-aac-ldac
-
-#enable software decoders for ALAC and APE
-PRODUCT_PROPERTY_OVERRIDES += \
-vendor.audio.use.sw.alac.decoder=true
-PRODUCT_PROPERTY_OVERRIDES += \
-vendor.audio.use.sw.ape.decoder=true
-
-#enable hw aac encoder by default
-PRODUCT_PROPERTY_OVERRIDES += \
-vendor.audio.hw.aac.encoder=true
-
ifneq ($(GENERIC_ODM_IMAGE),true)
# Reduce client buffer size for fast audio output tracks
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_PRODUCT_PROPERTIES += \
af.fast_track_multiplier=1
#Enable offload audio video playback by default
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_PRODUCT_PROPERTIES += \
audio.offload.video=true
#Enable music through deep buffer
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_PRODUCT_PROPERTIES += \
audio.deep_buffer.media=true
#audio becoming noisy intent broadcast delay
@@ -129,11 +79,11 @@
audio.sys.offload.pstimeout.secs=3
#Set AudioFlinger client heap size
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_PRODUCT_PROPERTIES += \
ro.af.client_heap_size_kbyte=7168
#enable deep buffer
-PRODUCT_PROPERTY_OVERRIDES += \
+PRODUCT_PRODUCT_PROPERTIES += \
media.stagefright.audio.deep=false
endif
@@ -141,14 +91,10 @@
# 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
+PRODUCT_PRODUCT_PROPERTIES += 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
+PRODUCT_PRODUCT_PROPERTIES += aaudio.mmap_exclusive_policy=2
+PRODUCT_PRODUCT_PROPERTIES += aaudio.hw_burst_min_usec=2000
# for HIDL related packages
PRODUCT_PACKAGES += \