diff options
| -rw-r--r-- | audio/audio_effects.xml | 84 | ||||
| -rw-r--r-- | audio/sound_trigger_mixer_paths.xml | 64 | ||||
| -rw-r--r-- | audio/sound_trigger_mixer_paths_wcd9330.xml | 48 |
3 files changed, 147 insertions, 49 deletions
diff --git a/audio/audio_effects.xml b/audio/audio_effects.xml index 5cc0651..ad6d474 100644 --- a/audio/audio_effects.xml +++ b/audio/audio_effects.xml @@ -3,21 +3,87 @@ <libraries> <library name="bundle" path="libbundlewrapper.so"/> <library name="reverb" path="libreverbwrapper.so"/> - <library name="visualizer" path="libvisualizer.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"/> + <library name="volume_listener" path="libvolumelistener.so"/> + <library name="audiosphere" path="libasphere.so"/> + <library name="shoebox" path="libshoebox.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"/> + <effectProxy name="bassboost" library="proxy" uuid="14804144-a5ee-4d24-aa88-0002a5d5c51b"> + <libsw library="qcbassboost" uuid="23aca180-44bd-11e2-bcfd-0800200c9a66"/> + <libhw library="offload_bundle" uuid="2c4a8c24-1581-487f-94f6-0002a5d5c51b"/> + </effectProxy> + <effectProxy name="virtualizer" library="proxy" uuid="d3467faa-acc7-4d34-acaf-0002a5d5c51b"> + <libsw library="qcvirt" uuid="e6c98a16-22a3-11e2-b87b-f23c91aec05e"/> + <libhw library="offload_bundle" uuid="509a4498-561a-4bea-b3b1-0002a5d5c51b"/> + </effectProxy> + <effectProxy name="equalizer" library="proxy" uuid="c8e70ecd-48ca-456e-8a4f-0002a5d5c51b"> + <libsw library="bundle" uuid="ce772f20-847d-11df-bb17-0002a5d5c51b"/> + <libhw library="offload_bundle" uuid="a0dac280-401c-11e3-9379-0002a5d5c51b"/> + </effectProxy> <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"/> + <effectProxy name="reverb_env_aux" library="proxy" uuid="48404ac9-d202-4ccc-bf84-0002a5d5c51b"> + <libsw library="qcreverb" uuid="a8c1e5f3-293d-43cd-95ec-d5e26c02e217"/> + <libhw library="offload_bundle" uuid="79a18026-18fd-4185-8233-0002a5d5c51b"/> + </effectProxy> + <effectProxy name="reverb_env_ins" library="proxy" uuid="b707403a-a1c1-4291-9573-0002a5d5c51b"> + <libsw library="qcreverb" uuid="791fff8b-8129-4655-83a4-59bc61034c3a"/> + <libhw library="offload_bundle" uuid="eb64ea04-973b-43d2-8f5e-0002a5d5c51b"/> + </effectProxy> + <effectProxy name="reverb_pre_aux" library="proxy" uuid="1b78f587-6d1c-422e-8b84-0002a5d5c51b"> + <libsw library="qcreverb" uuid="53ef1db5-c0c0-445b-b060-e34d20ebb70a"/> + <libhw library="offload_bundle" uuid="6987be09-b142-4b41-9056-0002a5d5c51b"/> + </effectProxy> + <effectProxy name="reverb_pre_ins" library="proxy" uuid="f3e178d2-ebcb-408e-8357-0002a5d5c51b"> + <libsw library="qcreverb" uuid="b08a0e38-22a5-11e2-b87b-f23c91aec05e"/> + <libhw library="offload_bundle" uuid="aa2bebf6-47cf-4613-9bca-0002a5d5c51b"/> + </effectProxy> + <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"/> + <effect name="aec" library="audio_pre_processing" uuid="0f8d0d2a-59e5-45fe-b6e4-248c8a799109"/> + <effect name="ns" library="audio_pre_processing" uuid="1d97bb0b-9e2f-4403-9ae3-58c2554306f8"/> + <effect name="music_helper" library="volume_listener" uuid="08b8b058-0590-11e5-ac71-0025b32654a0"/> + <effect name="ring_helper" library="volume_listener" uuid="0956df94-0590-11e5-bdbe-0025b32654a0"/> + <effect name="alarm_helper" library="volume_listener" uuid="09f303e2-0590-11e5-8fdb-0025b32654a0"/> + <effect name="voice_helper" library="volume_listener" uuid="0ace5c08-0590-11e5-ae9e-0025b32654a0"/> + <effect name="notification_helper" library="volume_listener" uuid="0b776dde-0590-11e5-81ba-0025b32654a0"/> + <effect name="audiosphere" library="audiosphere" uuid="184e62ab-2d19-4364-9d1b-c0a40733866c"/> + <effect name="shoebox" library="shoebox" uuid="1eab784c-1a36-4b2a-b7fc-e34c44cab89e"/> </effects> + <postprocess> + <stream type="music"> + <apply effect="music_helper"/> + </stream> + <stream type="ring"> + <apply effect="ring_helper"/> + </stream> + <stream type="alarm"> + <apply effect="alarm_helper"/> + </stream> + <stream type="voice_call"> + <apply effect="voice_helper"/> + </stream> + <stream type="notification"> + <apply effect="notification_helper"/> + </stream> + </postprocess> + <preprocess> + <stream type="voice_communication"> + <apply effect="aec"/> + <apply effect="ns"/> + </stream> + </preprocess> </audio_effects_conf> diff --git a/audio/sound_trigger_mixer_paths.xml b/audio/sound_trigger_mixer_paths.xml index 8b72d81..f6c99d3 100644 --- a/audio/sound_trigger_mixer_paths.xml +++ b/audio/sound_trigger_mixer_paths.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!--- Copyright (c) 2014-2016, The Linux Foundation. All rights reserved. --> +<!--- Copyright (c) 2014-2016, The Linux Foundation. All rights reserved. --> <!--- --> <!--- Redistribution and use in source and binary forms, with or without --> <!--- modification, are permitted provided that the following conditions are --> @@ -28,14 +28,22 @@ <mixer> <!-- These are the initial mixer settings --> - <ctl name="LSM1 MUX" value="None" /> - <ctl name="LSM2 MUX" value="None" /> - <ctl name="LSM3 MUX" value="None" /> - <ctl name="LSM4 MUX" value="None" /> - <ctl name="LSM5 MUX" value="None" /> - <ctl name="LSM6 MUX" value="None" /> - <ctl name="LSM7 MUX" value="None" /> - <ctl name="LSM8 MUX" value="None" /> + <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="0" /> + <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="0" /> + <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="0" /> + <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="0" /> + <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="0" /> + <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="0" /> + <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="0" /> + <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="0" /> + <ctl name="LSM1 Port" value="None" /> + <ctl name="LSM2 Port" value="None" /> + <ctl name="LSM3 Port" value="None" /> + <ctl name="LSM4 Port" value="None" /> + <ctl name="LSM5 Port" value="None" /> + <ctl name="LSM6 Port" value="None" /> + <ctl name="LSM7 Port" value="None" /> + <ctl name="LSM8 Port" value="None" /> <ctl name="SLIMBUS_5_TX LSM Function" value="None" /> <ctl name="MADONOFF Switch" value="0" /> <ctl name="MAD Input" value="DMIC1" /> @@ -51,36 +59,44 @@ <path name="listen-voice-wakeup-1"> <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" /> - <ctl name="LSM1 MUX" value="SLIMBUS_5_TX" /> + <ctl name="LSM1 Port" value="SLIMBUS_5_TX" /> + <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="1" /> </path> <path name="listen-voice-wakeup-2"> <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" /> - <ctl name="LSM2 MUX" value="SLIMBUS_5_TX" /> + <ctl name="LSM2 Port" value="SLIMBUS_5_TX" /> + <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="1" /> </path> <path name="listen-voice-wakeup-3"> <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" /> - <ctl name="LSM3 MUX" value="SLIMBUS_5_TX" /> + <ctl name="LSM3 Port" value="SLIMBUS_5_TX" /> + <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="1" /> </path> <path name="listen-voice-wakeup-4"> <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" /> - <ctl name="LSM4 MUX" value="SLIMBUS_5_TX" /> + <ctl name="LSM4 Port" value="SLIMBUS_5_TX" /> + <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="1" /> </path> <path name="listen-voice-wakeup-5"> <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" /> - <ctl name="LSM5 MUX" value="SLIMBUS_5_TX" /> + <ctl name="LSM5 Port" value="SLIMBUS_5_TX" /> + <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="1" /> </path> <path name="listen-voice-wakeup-6"> <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" /> - <ctl name="LSM6 MUX" value="SLIMBUS_5_TX" /> + <ctl name="LSM6 Port" value="SLIMBUS_5_TX" /> + <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="1" /> </path> <path name="listen-voice-wakeup-7"> <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" /> - <ctl name="LSM7 MUX" value="SLIMBUS_5_TX" /> + <ctl name="LSM7 Port" value="SLIMBUS_5_TX" /> + <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="1" /> </path> <path name="listen-voice-wakeup-8"> <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" /> - <ctl name="LSM8 MUX" value="SLIMBUS_5_TX" /> + <ctl name="LSM8 Port" value="SLIMBUS_5_TX" /> + <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="1" /> </path> <path name="listen-cpe-handset-mic"> @@ -91,6 +107,13 @@ <ctl name="CPE AFE MAD Enable" value="1"/> </path> + <path name="listen-cpe-handset-mic-ecpp"> + <ctl name="CLK MODE" value="INTERNAL" /> + <ctl name="EC BUF MUX INP" value="DEC1" /> + <ctl name="ADC MUX1" value="DMIC" /> + <ctl name="DMIC MUX1" value="DMIC0" /> + </path> + <!-- path name used for low bandwidth FTRT codec interface --> <path name="listen-cpe-handset-mic low-speed-intf"> <ctl name="MADONOFF Switch" value="1" /> @@ -99,13 +122,6 @@ <ctl name="CPE AFE MAD Enable" value="1"/> </path> - <path name="listen-cpe-handset-mic-ecpp"> - <ctl name="CLK MODE" value="INTERNAL" /> - <ctl name="EC BUF MUX INP" value="DEC1" /> - <ctl name="ADC MUX1" value="DMIC" /> - <ctl name="DMIC MUX1" value="DMIC0" /> - </path> - <path name="listen-ape-handset-mic"> <ctl name="MAD_BROADCAST Switch" value="1" /> <ctl name="TX13 INP MUX" value="MAD_BRDCST" /> diff --git a/audio/sound_trigger_mixer_paths_wcd9330.xml b/audio/sound_trigger_mixer_paths_wcd9330.xml index 4f8557d..2ad8750 100644 --- a/audio/sound_trigger_mixer_paths_wcd9330.xml +++ b/audio/sound_trigger_mixer_paths_wcd9330.xml @@ -28,51 +28,67 @@ <mixer> <!-- These are the initial mixer settings --> - <ctl name="LSM1 MUX" value="None" /> - <ctl name="LSM2 MUX" value="None" /> - <ctl name="LSM3 MUX" value="None" /> - <ctl name="LSM4 MUX" value="None" /> - <ctl name="LSM5 MUX" value="None" /> - <ctl name="LSM6 MUX" value="None" /> - <ctl name="LSM7 MUX" value="None" /> - <ctl name="LSM8 MUX" value="None" /> + <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="0" /> + <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="0" /> + <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="0" /> + <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="0" /> + <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="0" /> + <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="0" /> + <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="0" /> + <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="0" /> + <ctl name="LSM1 Port" value="None" /> + <ctl name="LSM2 Port" value="None" /> + <ctl name="LSM3 Port" value="None" /> + <ctl name="LSM4 Port" value="None" /> + <ctl name="LSM5 Port" value="None" /> + <ctl name="LSM6 Port" value="None" /> + <ctl name="LSM7 Port" value="None" /> + <ctl name="LSM8 Port" value="None" /> <ctl name="SLIMBUS_5_TX LSM Function" value="None" /> <ctl name="MADONOFF Switch" value="0" /> <ctl name="MAD Input" value="DMIC1" /> <ctl name="CPE AFE MAD Enable" value="0"/> <path name="listen-voice-wakeup-1"> - <ctl name="LSM1 MUX" value="SLIMBUS_5_TX" /> <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" /> + <ctl name="LSM1 Port" value="SLIMBUS_5_TX" /> + <ctl name="LSM1 Mixer SLIMBUS_5_TX" value="1" /> </path> <path name="listen-voice-wakeup-2"> - <ctl name="LSM2 MUX" value="SLIMBUS_5_TX" /> <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" /> + <ctl name="LSM2 Port" value="SLIMBUS_5_TX" /> + <ctl name="LSM2 Mixer SLIMBUS_5_TX" value="1" /> </path> <path name="listen-voice-wakeup-3"> - <ctl name="LSM3 MUX" value="SLIMBUS_5_TX" /> <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" /> + <ctl name="LSM3 Port" value="SLIMBUS_5_TX" /> + <ctl name="LSM3 Mixer SLIMBUS_5_TX" value="1" /> </path> <path name="listen-voice-wakeup-4"> - <ctl name="LSM4 MUX" value="SLIMBUS_5_TX" /> <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" /> + <ctl name="LSM4 Port" value="SLIMBUS_5_TX" /> + <ctl name="LSM4 Mixer SLIMBUS_5_TX" value="1" /> </path> <path name="listen-voice-wakeup-5"> - <ctl name="LSM5 MUX" value="SLIMBUS_5_TX" /> <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" /> + <ctl name="LSM5 Port" value="SLIMBUS_5_TX" /> + <ctl name="LSM5 Mixer SLIMBUS_5_TX" value="1" /> </path> <path name="listen-voice-wakeup-6"> - <ctl name="LSM6 MUX" value="SLIMBUS_5_TX" /> <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" /> + <ctl name="LSM6 Port" value="SLIMBUS_5_TX" /> + <ctl name="LSM6 Mixer SLIMBUS_5_TX" value="1" /> </path> <path name="listen-voice-wakeup-7"> - <ctl name="LSM7 MUX" value="SLIMBUS_5_TX" /> <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" /> + <ctl name="LSM7 Port" value="SLIMBUS_5_TX" /> + <ctl name="LSM7 Mixer SLIMBUS_5_TX" value="1" /> </path> <path name="listen-voice-wakeup-8"> - <ctl name="LSM8 MUX" value="SLIMBUS_5_TX" /> <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" /> + <ctl name="LSM8 Port" value="SLIMBUS_5_TX" /> + <ctl name="LSM8 Mixer SLIMBUS_5_TX" value="1" /> </path> <path name="listen-cpe-handset-mic"> |