commit 30e06a26609a41b1ca75ae9df47b4d0bde5de73d
author Dhanalakshmi Siddani <dsiddani@codeaurora.org> Tue Mar 27 23:11:34 2018 +0530
committer Dhanalakshmi Siddani <dsiddani@codeaurora.org> Wed Apr 18 00:24:26 2018 +0530
tree d38dd806a89a27ef2408d9e6e8026d902f96c99d
parent fbb7423a7905edecc572b3626ba5ef1e1f60bda8

audio: Enable FFV for msm8953 target

- Add 6/8mic mixer controls in AHAL and STHAL to enable FFV.
- Enable compile flags and define libffv path on LA platform.

CRs-Fixed: 2225936
Change-Id: Ife7bcfd04a6a758a38ec82b79c69dc3ec7c4612c

hal/Android.mk

diff --git a/hal/Android.mk b/hal/Android.mk
index 523a593..921252c 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -395,6 +395,15 @@
     LOCAL_CFLAGS += -DDYNAMIC_ECNS_ENABLED
 endif
 
+ifeq ($(strip $($AUDIO_FEATURE_ENABLED_KEEP_ALIVE_ARM_FFV)), true)
+    LOCAL_CFLAGS += -DRUN_KEEP_ALIVE_IN_ARM_FFV
+endif
+
+ifeq ($(strip $($AUDIO_FEATURE_ENABLED_FFV_FFV)), true)
+    LOCAL_CFLAGS += -DFFV_ENABLED
+    LOCAL_SRC_FILES += audio_extn/ffv.c
+endif
+
 LOCAL_CFLAGS += -Wall -Werror
 
 LOCAL_COPY_HEADERS_TO   := mm-audio

hal/audio_extn/ffv.c

diff --git a/hal/audio_extn/ffv.c b/hal/audio_extn/ffv.c
index 027849c..71aeb3d 100644
--- a/hal/audio_extn/ffv.c
+++ b/hal/audio_extn/ffv.c
@@ -59,8 +59,22 @@
 #define AUDIO_PARAMETER_FFV_EC_REF_DEVICE "ffv_ec_ref_dev"
 #define AUDIO_PARAMETER_FFV_CHANNEL_INDEX "ffv_channel_index"
 
-#define FFV_LIB "libffv.so"
-#define FFV_CONFIG_FILE_PATH "/etc/BF_1out.cfg"
+#if LINUX_ENABLED
+#define ST_FFV_CONFIG_FILE_PATH "/etc/BF_1out.cfg"
+#ifdef __LP64__
+#define FFV_LIB "/usr/lib64/libffv.so"
+#else
+#define FFV_LIB "/usr/lib/libffv.so"
+#endif
+#else
+#define ST_FFV_CONFIG_FILE_PATH "/vendor/etc/BF_1out.cfg"
+#ifdef __LP64__
+#define FFV_LIB "/vendor/lib64/libffv.so"
+#else
+#define FFV_LIB "/vendor/lib/libffv.so"
+#endif
+#endif
+
 #define FFV_SAMPLING_RATE_16000 16000
 #define FFV_EC_REF_LOOPBACK_DEVICE_MONO "ec-ref-loopback-mono"
 #define FFV_EC_REF_LOOPBACK_DEVICE_STEREO "ec-ref-loopback-stereo"