Add specific AEC effect descriptor

Use a specific AEC effect implementor UUID to distinguish
flo from other implementations based on QCOM Fluence.

Bug: 9126576.
Change-Id: If3f2d0d9a84112929b2d06df3a7f28c3575895d7

2 files changed, 82 insertions, 0 deletions

diff --git a/voice_processing/Android.mk b/voice_processing/Android.mk
new file mode 100644
index 0000000..45db19c
--- /dev/null
+++ b/voice_processing/Android.mk
@@ -0,0 +1,21 @@
+ifneq ($(filter flo deb,$(TARGET_DEVICE)),)
+
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+	voice_processing_descriptors.c
+
+LOCAL_C_INCLUDES += \
+	$(call include-path-for, audio-effects)
+
+LOCAL_MODULE := libqcomvoiceprocessingdescriptors
+
+LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/soundfx
+
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_SHARED_LIBRARY)
+
+endif
\ No newline at end of file
diff --git a/voice_processing/voice_processing_descriptors.c b/voice_processing/voice_processing_descriptors.c
new file mode 100644
index 0000000..d51a3f8
--- /dev/null
+++ b/voice_processing/voice_processing_descriptors.c
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2013 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <hardware/audio_effect.h>
+//------------------------------------------------------------------------------
+// Effect descriptors
+//------------------------------------------------------------------------------
+
+// UUIDs for effect types have been generated from http://www.itu.int/ITU-T/asn1/uuid.html
+// as the pre processing effects are not defined by OpenSL ES
+
+// Acoustic Echo Cancellation
+const effect_descriptor_t qcom_product_aec_descriptor = {
+        { 0x7b491460, 0x8d4d, 0x11e0, 0xbd61, { 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b } }, // type
+        { 0x1c04e560, 0xc720, 0x11e2, 0x9525, { 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b } }, // uuid
+        EFFECT_CONTROL_API_VERSION,
+        (EFFECT_FLAG_TYPE_PRE_PROC|EFFECT_FLAG_DEVICE_IND),
+        0,
+        0,
+        "Acoustic Echo Canceler",
+        "Qualcomm Fluence for Flo"
+};
+
+// Noise suppression
+const effect_descriptor_t qcom_product_ns_descriptor = {
+        { 0x58b4b260, 0x8e06, 0x11e0, 0xaa8e, { 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b } }, // type
+        { 0x4bb6faa0, 0xc720, 0x11e2, 0x91f5, { 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b } }, // uuid
+        EFFECT_CONTROL_API_VERSION,
+        (EFFECT_FLAG_TYPE_PRE_PROC|EFFECT_FLAG_DEVICE_IND),
+        0,
+        0,
+        "Noise Suppression",
+        "Qualcomm Fluence for Flo"
+};
+
+//ENABLE_AGC
+// Automatic Gain Control
+//const effect_descriptor_t qcom_product_agc_descriptor = {
+//        { 0x0a8abfe0, 0x654c, 0x11e0, 0xba26, { 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b } }, // type
+//        { 0x6e8188c0, 0xc720, 0x11e2, 0x830f, { 0x00, 0x02, 0xa5, 0xd5, 0xc5, 0x1b } }, // uuid
+//        EFFECT_CONTROL_API_VERSION,
+//        (EFFECT_FLAG_TYPE_PRE_PROC|EFFECT_FLAG_DEVICE_IND),
+//        0,
+//        0,
+//        "Automatic Gain Control",
+//        "Qualcomm Fluence for Flo"
+//};
+