summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cerqueira <ricardo@cyngn.com>2016-06-20 00:41:47 +0100
committerRicardo Cerqueira <ricardo@cyngn.com>2016-06-20 00:41:47 +0100
commita11ff3c73787b32744fdde5757836fdfe1298170 (patch)
treec80cf5a7f981ca18d41e27a4b41e6b49b4e4097b
parente1b5f35df9772e892d3320209bc7e74b01a1bcde (diff)
downloadandroid_hardware_qcom_audio-a11ff3c73787b32744fdde5757836fdfe1298170.tar.gz
android_hardware_qcom_audio-a11ff3c73787b32744fdde5757836fdfe1298170.tar.bz2
android_hardware_qcom_audio-a11ff3c73787b32744fdde5757836fdfe1298170.zip
ssr: Fix building with OSS materialsstable/cm-13.0-caf-8937-ZNH2KB
Change-Id: I466816af5e1258f61401edf3eaf37ed7a862292e
-rw-r--r--hal/Android.mk3
-rw-r--r--hal/audio_extn/ssr.c12
2 files changed, 15 insertions, 0 deletions
diff --git a/hal/Android.mk b/hal/Android.mk
index 4f0affa5..1009e4ae 100644
--- a/hal/Android.mk
+++ b/hal/Android.mk
@@ -110,6 +110,9 @@ endif
ifeq ($(strip $(AUDIO_FEATURE_ENABLED_SSR)),true)
LOCAL_CFLAGS += -DSSR_ENABLED
+ ifeq ($(QCPATH),)
+ LOCAL_CFLAGS += -D_OSS
+ endif
LOCAL_SRC_FILES += audio_extn/ssr.c
LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/mm-audio/surround_sound_3mic/
LOCAL_C_INCLUDES += $(TARGET_OUT_HEADERS)/common/inc/
diff --git a/hal/audio_extn/ssr.c b/hal/audio_extn/ssr.c
index cf393c5c..ed89d6ea 100644
--- a/hal/audio_extn/ssr.c
+++ b/hal/audio_extn/ssr.c
@@ -36,7 +36,19 @@
#include "audio_extn.h"
#include "platform.h"
#include "platform_api.h"
+#ifndef _OSS
#include "surround_rec_interface.h"
+#else
+typedef struct {
+ const char *name;
+ char *(*get_param_fn)(void *h);
+} get_param_data_t;
+
+typedef struct {
+ const char *name;
+ void (*set_param_fn)(void *h, const char *val);
+} set_param_data_t;
+#endif
#ifdef SSR_ENABLED
#define COEFF_ARRAY_SIZE 4