Revert "Add ViPERFX [4/4]"

This reverts commit fe9c021cf6584de668abfe4f56327c8cfe1211b3.

2 files changed, 28 insertions, 28 deletions

diff --git a/audio_effects.conf b/audio_effects.conf
index 750e49b..48801d9 100644
--- a/audio_effects.conf
+++ b/audio_effects.conf
@@ -6,14 +6,11 @@
 #        }
 #    }
 libraries {
-  v4a_fx {
-    path /system/lib/soundfx/libv4a_fx_ics.so
-  }
   bundle {
-    path /system/lib/soundfx/libv4a_fx_ics.so
+    path /system/lib/soundfx/libbundlewrapper.so
   }
   reverb {
-    path /system/lib/soundfx/libv4a_fx_ics.so
+    path /system/lib/soundfx/libreverbwrapper.so
   }
   visualizer {
     path /system/lib/soundfx/libvisualizer.so
@@ -22,7 +19,7 @@ libraries {
     path /system/lib/soundfx/libqcomvoiceprocessing.so
   }
   downmix {
-    path /system/lib/soundfx/libv4a_fx_ics.so
+    path /system/lib/soundfx/libdownmix.so
   }
   loudness_enhancer {
     path /system/lib/soundfx/libldnhncr.so
@@ -45,49 +42,45 @@ libraries {
 #    }
 
 effects {
-  v4a_standard_fx {
-    library v4a_fx
-    uuid 41d3c987-e6cf-11e3-a88a-11aba5d5c51b
-  }
   bassboost {
-    library v4a_fx
-    uuid 41d3c987-e6cf-11e3-a88a-11aba5d5c51b
+    library bundle
+    uuid 8631f300-72e2-11df-b57e-0002a5d5c51b
   }
   virtualizer {
-    library v4a_fx
-    uuid 41d3c987-e6cf-11e3-a88a-11aba5d5c51b
+    library bundle
+    uuid 1d4033c0-8557-11df-9f2d-0002a5d5c51b
   }
   equalizer {
-    library v4a_fx
-    uuid 41d3c987-e6cf-11e3-a88a-11aba5d5c51b
+    library bundle
+    uuid ce772f20-847d-11df-bb17-0002a5d5c51b
   }
   volume {
-    library v4a_fx
-    uuid 41d3c987-e6cf-11e3-a88a-11aba5d5c51b
+    library bundle
+    uuid 119341a0-8469-11df-81f9-0002a5d5c51b
   }
   reverb_env_aux {
-    library v4a_fx
-    uuid 41d3c987-e6cf-11e3-a88a-11aba5d5c51b
+    library reverb
+    uuid 4a387fc0-8ab3-11df-8bad-0002a5d5c51b
   }
   reverb_env_ins {
-    library v4a_fx
-    uuid 41d3c987-e6cf-11e3-a88a-11aba5d5c51b
+    library reverb
+    uuid c7a511a0-a3bb-11df-860e-0002a5d5c51b
   }
   reverb_pre_aux {
-    library v4a_fx
-    uuid 41d3c987-e6cf-11e3-a88a-11aba5d5c51b
+    library reverb
+    uuid f29a1400-a3bb-11df-8ddc-0002a5d5c51b
   }
   reverb_pre_ins {
-    library v4a_fx
-    uuid 41d3c987-e6cf-11e3-a88a-11aba5d5c51b
+    library reverb
+    uuid 172cdf00-a3bc-11df-a72f-0002a5d5c51b
   }
   visualizer {
     library visualizer
     uuid d069d9e0-8329-11df-9168-0002a5d5c51b
   }
   downmix {
-    library v4a_fx
-    uuid 41d3c987-e6cf-11e3-a88a-11aba5d5c51b
+    library downmix
+    uuid 93f04452-e4fe-41cc-91f9-e475b6d1d69f
   }
   aec {
     library qcom_pre_processing
diff --git a/audio_policy.conf b/audio_policy.conf
index d48f26d..02914f1 100644
--- a/audio_policy.conf
+++ b/audio_policy.conf
@@ -29,6 +29,13 @@ audio_hw_modules {
         devices AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL
         flags AUDIO_OUTPUT_FLAG_PRIMARY
       }
+      deep_buffer {
+         sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000
+         channel_masks AUDIO_CHANNEL_OUT_STEREO
+         formats AUDIO_FORMAT_PCM_16_BIT
+         devices AUDIO_DEVICE_OUT_SPEAKER|AUDIO_DEVICE_OUT_EARPIECE|AUDIO_DEVICE_OUT_WIRED_HEADSET|AUDIO_DEVICE_OUT_WIRED_HEADPHONE|AUDIO_DEVICE_OUT_ALL_SCO|AUDIO_DEVICE_OUT_AUX_DIGITAL
+         flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER
+      }
       hdmi {
         sampling_rates 44100|48000
         channel_masks dynamic