summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuK1337 <priv.luk@gmail.com>2017-12-20 01:08:56 +0100
committerHemant Sharma <hemantbeast@gmail.com>2018-01-14 15:57:10 +0000
commit18a6d4bc030b5b07118f42b1a7dbcd9f7dbab24c (patch)
treeb6a0d28fe707528b82754dc0af54bc7912751a3a
parentb390f06e55551a166058dc2f25d85cb7d18c7c8c (diff)
armani: Convert audio_effects.conf to XML
* Converted using : https://github.com/luk1337/aeffects-conf2xml Change-Id: I09ffaa34b91cc4e2d8ddb8dcb66095a4faee48ae
-rw-r--r--configs/audio_effects.conf211
-rw-r--r--configs/audio_effects.xml33
-rw-r--r--device.mk2
3 files changed, 34 insertions, 212 deletions
diff --git a/configs/audio_effects.conf b/configs/audio_effects.conf
deleted file mode 100644
index 374386e..0000000
--- a/configs/audio_effects.conf
+++ /dev/null
@@ -1,211 +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 {
- bundle {
- path /vendor/lib/soundfx/libbundlewrapper.so
- }
- reverb {
- path /vendor/lib/soundfx/libreverbwrapper.so
- }
- qcbassboost {
- path /vendor/lib/soundfx/libqcbassboost.so
- }
- qcvirt {
- path /vendor/lib/soundfx/libqcvirt.so
- }
- qcreverb {
- path /vendor/lib/soundfx/libqcreverb.so
- }
- visualizer_sw {
- path /vendor/lib/soundfx/libvisualizer.so
- }
- visualizer_hw {
- path /system/lib/soundfx/libqcomvisualizer.so
- }
- downmix {
- path /vendor/lib/soundfx/libdownmix.so
- }
- proxy {
- path /vendor/lib/soundfx/libeffectproxy.so
- }
- offload_bundle {
- path /system/lib/soundfx/libqcompostprocbundle.so
- }
- audio_pre_processing {
- path /system/lib/soundfx/libqcomvoiceprocessing.so
- }
- loudness_enhancer {
- path /system/lib/soundfx/libldnhncr.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 qcbassboost
- uuid 23aca180-44bd-11e2-bcfd-0800200c9a66
- }
- virtualizer {
- library qcvirt
- uuid e6c98a16-22a3-11e2-b87b-f23c91aec05e
- }
- equalizer {
- library bundle
- uuid ce772f20-847d-11df-bb17-0002a5d5c51b
- }
- volume {
- library bundle
- uuid 119341a0-8469-11df-81f9-0002a5d5c51b
- }
- reverb_env_aux {
- library qcreverb
- uuid a8c1e5f3-293d-43cd-95ec-d5e26c02e217
- }
- reverb_env_ins {
- library qcreverb
- uuid 791fff8b-8129-4655-83a4-59bc61034c3a
- }
- reverb_pre_aux {
- library qcreverb
- uuid 53ef1db5-c0c0-445b-b060-e34d20ebb70a
- }
- reverb_pre_ins {
- library qcreverb
- uuid b08a0e38-22a5-11e2-b87b-f23c91aec05e
- }
- visualizer {
- library proxy
- uuid 1d0a1a53-7d5d-48f2-8e71-27fbd10d842c
-
- libsw {
- library visualizer_sw
- uuid d069d9e0-8329-11df-9168-0002a5d5c51b
- }
-
- libhw {
- library visualizer_hw
- uuid 7a8044a0-1a71-11e3-a184-0002a5d5c51b
- }
- }
- loudness_enhancer {
- library loudness_enhancer
- uuid fa415329-2034-4bea-b5dc-5b381c8d1e2c
- }
- downmix {
- library downmix
- uuid 93f04452-e4fe-41cc-91f9-e475b6d1d69f
- }
-# aec {
-# library audio_pre_processing
-# uuid 0f8d0d2a-59e5-45fe-b6e4-248c8a799109
-# }
-# ns {
-# library audio_pre_processing
-# uuid 1d97bb0b-9e2f-4403-9ae3-58c2554306f8
-# }
-}
-
-# Default pre-processing effects. Add to audio_effect.conf "effects" section if
-# audio HAL implements support for them.
-#
-# 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_effects.xml b/configs/audio_effects.xml
new file mode 100644
index 0000000..fe7078f
--- /dev/null
+++ b/configs/audio_effects.xml
@@ -0,0 +1,33 @@
+<?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="qcbassboost" path="libqcbassboost.so"/>
+ <library name="qcvirt" path="libqcvirt.so"/>
+ <library name="qcreverb" path="libqcreverb.so"/>
+ <library name="visualizer_sw" path="libvisualizer.so"/>
+ <library name="visualizer_hw" path="libqcomvisualizer.so"/>
+ <library name="downmix" path="libdownmix.so"/>
+ <library name="loudness_enhancer" path="libldnhncr.so"/>
+ <library name="proxy" path="libeffectproxy.so"/>
+ <library name="offload_bundle" path="libqcompostprocbundle.so"/>
+ <library name="audio_pre_processing" path="libqcomvoiceprocessing.so"/>
+ </libraries>
+ <effects>
+ <effect name="bassboost" library="qcbassboost" uuid="23aca180-44bd-11e2-bcfd-0800200c9a66"/>
+ <effect name="virtualizer" library="qcvirt" uuid="e6c98a16-22a3-11e2-b87b-f23c91aec05e"/>
+ <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="qcreverb" uuid="a8c1e5f3-293d-43cd-95ec-d5e26c02e217"/>
+ <effect name="reverb_env_ins" library="qcreverb" uuid="791fff8b-8129-4655-83a4-59bc61034c3a"/>
+ <effect name="reverb_pre_aux" library="qcreverb" uuid="53ef1db5-c0c0-445b-b060-e34d20ebb70a"/>
+ <effect name="reverb_pre_ins" library="qcreverb" uuid="b08a0e38-22a5-11e2-b87b-f23c91aec05e"/>
+ <effectProxy name="visualizer" library="proxy" uuid="1d0a1a53-7d5d-48f2-8e71-27fbd10d842c">
+ <libsw library="visualizer_sw" uuid="d069d9e0-8329-11df-9168-0002a5d5c51b"/>
+ <libhw library="visualizer_hw" uuid="7a8044a0-1a71-11e3-a184-0002a5d5c51b"/>
+ </effectProxy>
+ <effect name="downmix" library="downmix" uuid="93f04452-e4fe-41cc-91f9-e475b6d1d69f"/>
+ <effect name="loudness_enhancer" library="loudness_enhancer" uuid="fa415329-2034-4bea-b5dc-5b381c8d1e2c"/>
+ </effects>
+</audio_effects_conf>
diff --git a/device.mk b/device.mk
index 9e18d86..c388577 100644
--- a/device.mk
+++ b/device.mk
@@ -63,7 +63,7 @@ PRODUCT_PACKAGES += \
tinymix
PRODUCT_COPY_FILES += \
- $(LOCAL_PATH)/configs/audio_effects.conf:system/vendor/etc/audio_effects.conf \
+ $(LOCAL_PATH)/configs/audio_effects.xml:system/vendor/etc/audio_effects.xml \
$(LOCAL_PATH)/configs/audio_platform_info.xml:system/vendor/etc/audio_platform_info.xml \
$(LOCAL_PATH)/configs/audio_policy.conf:system/vendor/etc/audio_policy.conf \
$(LOCAL_PATH)/configs/mixer_paths.xml:system/vendor/etc/mixer_paths.xml