From 4aa384038c6453e66deb6d88181b5d8ce0ab61a2 Mon Sep 17 00:00:00 2001
From: Weiyin Jiang <wjiang@codeaurora.org>
Date: Mon, 10 Jul 2017 18:54:07 +0800
Subject: [PATCH] configs: Add flag to control support for 3D audio

Introduce feature flag to control support for
3D audio

Change-Id: I280d0619236c3fc46b0f8623fab58d7f641f6127
---
 configs/msm8996/audio_effects.conf |  3 ---
 configs/msm8998/audio_effects.conf | 10 +++++++---
 configs/msm8998/msm8998.mk         |  2 +-
 configs/sdm660/audio_effects.conf  |  3 ---
 configs/sdm845/audio_effects.conf  | 10 +++++++---
 configs/sdm845/sdm845.mk           |  2 +-
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/configs/msm8996/audio_effects.conf b/configs/msm8996/audio_effects.conf
index 97811d7e..1d35ed8d 100644
--- a/configs/msm8996/audio_effects.conf
+++ b/configs/msm8996/audio_effects.conf
@@ -42,9 +42,6 @@ libraries {
   audio_pre_processing {
     path /vendor/lib/soundfx/libqcomvoiceprocessing.so
   }
-  loudness_enhancer {
-    path /vendor/lib/soundfx/libldnhncr.so
-  }
   volume_listener {
     path /vendor/lib/soundfx/libvolumelistener.so
   }
diff --git a/configs/msm8998/audio_effects.conf b/configs/msm8998/audio_effects.conf
index cc80e31d..ddf578f9 100644
--- a/configs/msm8998/audio_effects.conf
+++ b/configs/msm8998/audio_effects.conf
@@ -42,15 +42,15 @@ libraries {
   audio_pre_processing {
     path /vendor/lib/soundfx/libqcomvoiceprocessing.so
   }
-  loudness_enhancer {
-    path /vendor/lib/soundfx/libldnhncr.so
-  }
   volume_listener {
     path /vendor/lib/soundfx/libvolumelistener.so
   }
   audiosphere {
     path /vendor/lib/soundfx/libasphere.so
   }
+  shoebox {
+    path /vendor/lib/soundfx/libshoebox.so
+  }
 }
 
 # Default pre-processing library. Add to audio_effect.conf "libraries" section if
@@ -259,6 +259,10 @@ effects {
     library audiosphere
     uuid 184e62ab-2d19-4364-9d1b-c0a40733866c
   }
+  shoebox {
+    library shoebox
+    uuid 1eab784c-1a36-4b2a-b7fc-e34c44cab89e
+  }
 }
 
 # additional effect from vendor
diff --git a/configs/msm8998/msm8998.mk b/configs/msm8998/msm8998.mk
index 5dde69d1..d240afdb 100644
--- a/configs/msm8998/msm8998.mk
+++ b/configs/msm8998/msm8998.mk
@@ -30,7 +30,7 @@ AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false
 AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
 AUDIO_FEATURE_ENABLED_USB_TUNNEL_AUDIO := true
 AUDIO_FEATURE_ENABLED_SPLIT_A2DP := true
-AUDIO_FEATURE_ENABLED_3D_AUDIO := false
+AUDIO_FEATURE_ENABLED_3D_AUDIO := true
 AUDIO_FEATURE_ENABLED_VOICE_PRINT := false
 USE_LEGACY_AUDIO_DAEMON := false
 USE_LEGACY_AUDIO_MEASUREMENT := false
diff --git a/configs/sdm660/audio_effects.conf b/configs/sdm660/audio_effects.conf
index cc80e31d..7de84e88 100644
--- a/configs/sdm660/audio_effects.conf
+++ b/configs/sdm660/audio_effects.conf
@@ -42,9 +42,6 @@ libraries {
   audio_pre_processing {
     path /vendor/lib/soundfx/libqcomvoiceprocessing.so
   }
-  loudness_enhancer {
-    path /vendor/lib/soundfx/libldnhncr.so
-  }
   volume_listener {
     path /vendor/lib/soundfx/libvolumelistener.so
   }
diff --git a/configs/sdm845/audio_effects.conf b/configs/sdm845/audio_effects.conf
index cc80e31d..ddf578f9 100644
--- a/configs/sdm845/audio_effects.conf
+++ b/configs/sdm845/audio_effects.conf
@@ -42,15 +42,15 @@ libraries {
   audio_pre_processing {
     path /vendor/lib/soundfx/libqcomvoiceprocessing.so
   }
-  loudness_enhancer {
-    path /vendor/lib/soundfx/libldnhncr.so
-  }
   volume_listener {
     path /vendor/lib/soundfx/libvolumelistener.so
   }
   audiosphere {
     path /vendor/lib/soundfx/libasphere.so
   }
+  shoebox {
+    path /vendor/lib/soundfx/libshoebox.so
+  }
 }
 
 # Default pre-processing library. Add to audio_effect.conf "libraries" section if
@@ -259,6 +259,10 @@ effects {
     library audiosphere
     uuid 184e62ab-2d19-4364-9d1b-c0a40733866c
   }
+  shoebox {
+    library shoebox
+    uuid 1eab784c-1a36-4b2a-b7fc-e34c44cab89e
+  }
 }
 
 # additional effect from vendor
diff --git a/configs/sdm845/sdm845.mk b/configs/sdm845/sdm845.mk
index 27ac441d..e16e6d7b 100644
--- a/configs/sdm845/sdm845.mk
+++ b/configs/sdm845/sdm845.mk
@@ -30,7 +30,7 @@ AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false
 AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true
 AUDIO_FEATURE_ENABLED_USB_TUNNEL_AUDIO := true
 AUDIO_FEATURE_ENABLED_SPLIT_A2DP := true
-AUDIO_FEATURE_ENABLED_3D_AUDIO := false
+AUDIO_FEATURE_ENABLED_3D_AUDIO := true
 DOLBY_ENABLE := false
 endif