configs: audio: convert audio_effects.conf to .xml

3 files changed, 29 insertions, 187 deletions

diff --git a/board/audio.mk b/board/audio.mk
index a91e587..d9ce55d 100644
--- a/board/audio.mk
+++ b/board/audio.mk
@@ -2,7 +2,7 @@
 PRODUCT_COPY_FILES += \
     $(DEVICE_PATH)/configs/audio/audio_policy.conf:system/etc/audio_policy.conf \
     $(DEVICE_PATH)/configs/audio/audio_device.xml:system/etc/audio_device.xml \
-    $(DEVICE_PATH)/configs/audio/audio_effects.conf:system/etc/audio_effects.conf
+    $(DEVICE_PATH)/configs/audio/audio_effects.xml:system/etc/audio_effects.xml
 
 # Media config
 PRODUCT_COPY_FILES += \
diff --git a/configs/audio/audio_effects.conf b/configs/audio/audio_effects.conf
deleted file mode 100644
index bd5e4c0..0000000
--- a/configs/audio/audio_effects.conf
+++ /dev/null
@@ -1,186 +0,0 @@
-# List of effect libraries to load. Each library element must contain a "path" element
-# giving the full path of the library .so file.
-#    libraries {
-#        <lib name> {
-#          path <lib path>
-#        }
-#    }
-libraries {
-# This is a proxy library that will be an abstraction for
-# the HW and SW effects
-
-  #proxy {
-    #path /system/lib/soundfx/libeffectproxy.so
-  #}
-
-# This is the SW implementation library of the effect
-  #libSW {
-    #path /system/lib/soundfx/libswwrapper.so
-  #}
-
-# This is the HW implementation library for the effect
-  #libHW {
-    #path /system/lib/soundfx/libhwwrapper.so
-  #}
-
-  bundle {
-    path /system/lib/soundfx/libbundlewrapper.so
-  }
-  reverb {
-    path /system/lib/soundfx/libreverbwrapper.so
-  }
-  visualizer {
-    path /system/lib/soundfx/libvisualizer.so
-  }
-  downmix {
-    path /system/lib/soundfx/libdownmix.so
-  }
-  loudness_enhancer {
-    path /system/lib/soundfx/libldnhncr.so
-  }
-  pre_processing {
-    path /system/lib/soundfx/libaudiopreprocessing.so
-  }  
-}
-
-# Default pre-processing library. Add to audio_effect.conf "libraries" section if
-# audio HAL implements support for default software audio pre-processing effects
-#
-#  pre_processing {
-#    path /system/lib/soundfx/libaudiopreprocessing.so
-#  }
-
-# list of effects to load. Each effect element must contain a "library" and a "uuid" element.
-# The value of the "library" element must correspond to the name of one library element in the
-# "libraries" element.
-# The name of the effect element is indicative, only the value of the "uuid" element
-# designates the effect.
-# The uuid is the implementation specific UUID as specified by the effect vendor. This is not the
-# generic effect type UUID.
-#    effects {
-#        <fx name> {
-#            library <lib name>
-#            uuid <effect uuid>
-#        }
-#        ...
-#    }
-
-effects {
-
-# additions for the proxy implementation
-# Proxy implementation
-  #effectname {
-    #library proxy
-    #uuid  xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
-
-    # SW implemetation of the effect. Added as a node under the proxy to
-    # indicate this as a sub effect.
-      #libsw {
-         #library libSW
-         #uuid  yyyyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy
-      #} End of SW effect
-
-    # HW implementation of the effect. Added as a node under the proxy to
-    # indicate this as a sub effect.
-      #libhw {
-         #library libHW
-         #uuid  zzzzzzzz-zzzz-zzzz-zzzz-zzzzzzzzzzzz
-      #}End of HW effect
-  #} End of effect proxy
-
-  bassboost {
-    library bundle
-    uuid 8631f300-72e2-11df-b57e-0002a5d5c51b
-  }
-  virtualizer {
-    library bundle
-    uuid 1d4033c0-8557-11df-9f2d-0002a5d5c51b
-  }
-  equalizer {
-    library bundle
-    uuid ce772f20-847d-11df-bb17-0002a5d5c51b
-  }
-  volume {
-    library bundle
-    uuid 119341a0-8469-11df-81f9-0002a5d5c51b
-  }
-  reverb_env_aux {
-    library reverb
-    uuid 4a387fc0-8ab3-11df-8bad-0002a5d5c51b
-  }
-  reverb_env_ins {
-    library reverb
-    uuid c7a511a0-a3bb-11df-860e-0002a5d5c51b
-  }
-  reverb_pre_aux {
-    library reverb
-    uuid f29a1400-a3bb-11df-8ddc-0002a5d5c51b
-  }
-  reverb_pre_ins {
-    library reverb
-    uuid 172cdf00-a3bc-11df-a72f-0002a5d5c51b
-  }
-  visualizer {
-    library visualizer
-    uuid d069d9e0-8329-11df-9168-0002a5d5c51b
-  }
-  downmix {
-    library downmix
-    uuid 93f04452-e4fe-41cc-91f9-e475b6d1d69f
-  }
-  loudness_enhancer {
-    library loudness_enhancer
-    uuid fa415329-2034-4bea-b5dc-5b381c8d1e2c
-  }
-  agc {
-    library pre_processing
-    uuid aa8130e0-66fc-11e0-bad0-0002a5d5c51b
-  }
-  aec {
-    library pre_processing
-    uuid bb392ec0-8d4d-11e0-a896-0002a5d5c51b
-  }
-  ns {
-    library pre_processing
-    uuid c06c8400-8e06-11e0-9cb6-0002a5d5c51b
-  }
-}
-# Audio preprocessor configurations.
-# The pre processor configuration consists in a list of elements each describing
-# pre processor settings for a given input source. Valid input source names are:
-# "mic", "camcorder", "voice_recognition", "voice_communication"
-# Each input source element contains a list of effects elements. The name of the effect
-# element must be the name of one of the effects in the "effects" list of the file.
-# Each effect element may optionally contain a list of parameters and their
-# default value to apply when the pre processor effect is created.
-# A parameter is defined by a "param" element and a "value" element. Each of these elements
-# consists in one or more elements specifying a type followed by a value.
-# The types defined are: "int", "short", "float", "bool" and "string"
-# When both "param" and "value" are a single int, a simple form is allowed where just
-# the param and value pair is present in the parameter description
-#    pre_processing {
-#        <input source name> {
-#            <fx name> {
-#                <param 1 name> {
-#                    param {
-#                        int|short|float|bool|string <value>
-#                        [ int|short|float|bool|string <value> ]
-#                        ...
-#                    }
-#                    value {
-#                        int|short|float|bool|string <value>
-#                        [ int|short|float|bool|string <value> ]
-#                        ...
-#                    }
-#                }
-#                <param 2 name > {<param> <value>}
-#                ...
-#            }
-#            ...
-#        }
-#        ...
-#    }
-
-#
-# TODO: add default audio pre processor configurations after debug and tuning phase
-#
diff --git a/configs/audio/audio_effects.xml b/configs/audio/audio_effects.xml
new file mode 100644
index 0000000..9ad7a18
--- /dev/null
+++ b/configs/audio/audio_effects.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<audio_effects_conf version="2.0" xmlns="http://schemas.android.com/audio/audio_effects_conf/v2_0">
+    <libraries>
+        <library name="bundle" path="libbundlewrapper.so"/>
+        <library name="reverb" path="libreverbwrapper.so"/>
+        <library name="visualizer" path="libvisualizer.so"/>
+        <library name="downmix" path="libdownmix.so"/>
+        <library name="loudness_enhancer" path="libldnhncr.so"/>
+        <library name="pre_processing" path="libaudiopreprocessing.so"/>
+    </libraries>
+    <effects>
+        <effect name="bassboost" library="bundle" uuid="8631f300-72e2-11df-b57e-0002a5d5c51b"/>
+        <effect name="virtualizer" library="bundle" uuid="1d4033c0-8557-11df-9f2d-0002a5d5c51b"/>
+        <effect name="equalizer" library="bundle" uuid="ce772f20-847d-11df-bb17-0002a5d5c51b"/>
+        <effect name="volume" library="bundle" uuid="119341a0-8469-11df-81f9-0002a5d5c51b"/>
+        <effect name="reverb_env_aux" library="reverb" uuid="4a387fc0-8ab3-11df-8bad-0002a5d5c51b"/>
+        <effect name="reverb_env_ins" library="reverb" uuid="c7a511a0-a3bb-11df-860e-0002a5d5c51b"/>
+        <effect name="reverb_pre_aux" library="reverb" uuid="f29a1400-a3bb-11df-8ddc-0002a5d5c51b"/>
+        <effect name="reverb_pre_ins" library="reverb" uuid="172cdf00-a3bc-11df-a72f-0002a5d5c51b"/>
+        <effect name="visualizer" library="visualizer" uuid="d069d9e0-8329-11df-9168-0002a5d5c51b"/>
+        <effect name="downmix" library="downmix" uuid="93f04452-e4fe-41cc-91f9-e475b6d1d69f"/>
+        <effect name="loudness_enhancer" library="loudness_enhancer" uuid="fa415329-2034-4bea-b5dc-5b381c8d1e2c"/>
+        <effect name="agc" library="pre_processing" uuid="aa8130e0-66fc-11e0-bad0-0002a5d5c51b"/>
+        <effect name="aec" library="pre_processing" uuid="bb392ec0-8d4d-11e0-a896-0002a5d5c51b"/>
+        <effect name="ns" library="pre_processing" uuid="c06c8400-8e06-11e0-9cb6-0002a5d5c51b"/>
+    </effects>
+</audio_effects_conf>
+