commit c283efdf20311b7693e7cacb200ed2eee02ba90d
author Linux Build Service Account <lnxbuild@localhost> Fri Jul 13 08:02:01 2018 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Jul 13 08:02:01 2018 -0700
tree 5c3b5a0ee709facd1491c16b48e020df4ba7ee41
parent 4623d7e39511e3ea3ab7fd93ecb104be297e8a68
parent d3f6922ce5700dc6ba9eaea71dc4202897c76629

Merge "post_proc: Update acdb_audio_cal_cfg structure to support Instance ID"

post_proc/Android.mk

diff --git a/post_proc/Android.mk b/post_proc/Android.mk
index be06ae2..5da769c 100644
--- a/post_proc/Android.mk
+++ b/post_proc/Android.mk
@@ -110,6 +110,10 @@
 LOCAL_CFLAGS += -DHW_ACC_HPX
 endif
 
+ifeq ($(strip $(AUDIO_FEATURE_ENABLED_INSTANCE_ID)), true)
+    LOCAL_CFLAGS += -DINSTANCE_ID_ENABLED
+endif
+
 LOCAL_MODULE:= libhwacceffectswrapper
 LOCAL_VENDOR_MODULE := true
 

post_proc/bass_boost.c

diff --git a/post_proc/bass_boost.c b/post_proc/bass_boost.c
index a4e2292..68cd46f 100644
--- a/post_proc/bass_boost.c
+++ b/post_proc/bass_boost.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015, 2017, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2015, 2017-2018, The Linux Foundation. All rights reserved.
  * Not a Contribution.
  *
  * Copyright (C) 2013 The Android Open Source Project
@@ -63,6 +63,10 @@
         uint32_t sampling_rate;
         uint32_t cal_type;
         uint32_t module_id;
+#ifdef INSTANCE_ID_ENABLED
+        uint16_t instance_id;
+        uint16_t reserved;
+#endif
         uint32_t param_id;
 } acdb_audio_cal_cfg_t;