From 606cb329a8cd74d41d524caa734c153a5480b0e1 Mon Sep 17 00:00:00 2001 From: Vachounet Date: Wed, 21 Jun 2017 12:24:54 +0200 Subject: [PATCH] potter: update audio_effects.conf * Get rid of QCOM and Moto closed source things --- audio/audio_effects.conf | 224 +++++++++++++++++++++++---------------- 1 file changed, 130 insertions(+), 94 deletions(-) diff --git a/audio/audio_effects.conf b/audio/audio_effects.conf index 0c0779d..612e4f2 100644 --- a/audio/audio_effects.conf +++ b/audio/audio_effects.conf @@ -6,46 +6,33 @@ # } # } 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 - #} - - mmieffects { - path /system/lib/soundfx/libmmieffectswrapper.so - } - - mot_speaker_helper { - path /system/lib/soundfx/libspeakerbundle.so - } - bundle { path /system/lib/soundfx/libbundlewrapper.so } reverb { path /system/lib/soundfx/libreverbwrapper.so } - visualizer { + visualizer_sw { path /system/lib/soundfx/libvisualizer.so } + visualizer_hw { + path /system/lib/soundfx/libqcomvisualizer.so + } downmix { path /system/lib/soundfx/libdownmix.so } loudness_enhancer { path /system/lib/soundfx/libldnhncr.so } + proxy { + path /system/lib/soundfx/libeffectproxy.so + } + offload_bundle { + path /system/lib/soundfx/libqcompostprocbundle.so + } + audio_pre_processing { + path /system/lib/soundfx/libqcomvoiceprocessing.so + } } # Default pre-processing library. Add to audio_effect.conf "libraries" section if @@ -94,78 +81,140 @@ effects { #} End of effect proxy bassboost { - library bundle - uuid 8631f300-72e2-11df-b57e-0002a5d5c51b + library proxy + uuid 14804144-a5ee-4d24-aa88-0002a5d5c51b + + libsw { + library bundle + uuid 8631f300-72e2-11df-b57e-0002a5d5c51b + } + + libhw { + library offload_bundle + uuid 2c4a8c24-1581-487f-94f6-0002a5d5c51b + } } virtualizer { - library bundle - uuid 1d4033c0-8557-11df-9f2d-0002a5d5c51b + library proxy + uuid d3467faa-acc7-4d34-acaf-0002a5d5c51b + + libsw { + library bundle + uuid 1d4033c0-8557-11df-9f2d-0002a5d5c51b + } + + libhw { + library offload_bundle + uuid 509a4498-561a-4bea-b3b1-0002a5d5c51b + } } equalizer { - library bundle - uuid ce772f20-847d-11df-bb17-0002a5d5c51b + 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 + } } volume { library bundle uuid 119341a0-8469-11df-81f9-0002a5d5c51b } - mmieffects { - library mmieffects - uuid bce61ec2-eca4-445c-9dcb-91cc7cce01ba - } reverb_env_aux { - library reverb - uuid 4a387fc0-8ab3-11df-8bad-0002a5d5c51b + library proxy + uuid 48404ac9-d202-4ccc-bf84-0002a5d5c51b + + libsw { + library reverb + uuid 4a387fc0-8ab3-11df-8bad-0002a5d5c51b + } + + libhw { + library offload_bundle + uuid 79a18026-18fd-4185-8233-0002a5d5c51b + } } reverb_env_ins { - library reverb - uuid c7a511a0-a3bb-11df-860e-0002a5d5c51b + library proxy + uuid b707403a-a1c1-4291-9573-0002a5d5c51b + + libsw { + library reverb + uuid c7a511a0-a3bb-11df-860e-0002a5d5c51b + } + + libhw { + library offload_bundle + uuid eb64ea04-973b-43d2-8f5e-0002a5d5c51b + } } reverb_pre_aux { - library reverb - uuid f29a1400-a3bb-11df-8ddc-0002a5d5c51b + library proxy + uuid 1b78f587-6d1c-422e-8b84-0002a5d5c51b + + libsw { + library reverb + uuid f29a1400-a3bb-11df-8ddc-0002a5d5c51b + } + + libhw { + library offload_bundle + uuid 6987be09-b142-4b41-9056-0002a5d5c51b + } } reverb_pre_ins { - library reverb - uuid 172cdf00-a3bc-11df-a72f-0002a5d5c51b + library proxy + uuid f3e178d2-ebcb-408e-8357-0002a5d5c51b + + libsw { + library reverb + uuid 172cdf00-a3bc-11df-a72f-0002a5d5c51b + } + + libhw { + library offload_bundle + uuid aa2bebf6-47cf-4613-9bca-0002a5d5c51b + } } visualizer { - library visualizer - uuid d069d9e0-8329-11df-9168-0002a5d5c51b + 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 + } } downmix { library downmix uuid 93f04452-e4fe-41cc-91f9-e475b6d1d69f } + hw_acc { + library offload_bundle + uuid 7d1580bd-297f-4683-9239-e475b6d1d69f + } loudness_enhancer { library loudness_enhancer uuid fa415329-2034-4bea-b5dc-5b381c8d1e2c } - music_helper { - library proxy - uuid 00905020-4e52-11e4-83aa-0002a5d5c51b - - libsw { - library mot_speaker_helper - uuid bce61ec2-eca4-445c-9dcb-91cc7cce01ab - } - - libhw { - library mot_speaker_helper - uuid bce61ec2-eca4-445c-9dcb-91cc7cce01b0 - } + aec { + library audio_pre_processing + uuid 0f8d0d2a-59e5-45fe-b6e4-248c8a799109 } - voice_helper { - library mot_speaker_helper - uuid bce61ec2-eca4-445c-9dcb-91cc7cce01ac - } - ring_helper { - library mot_speaker_helper - uuid bce61ec2-eca4-445c-9dcb-91cc7cce01ad - } - notification_helper { - library mot_speaker_helper - uuid bce61ec2-eca4-445c-9dcb-91cc7cce01ae + ns { + library audio_pre_processing + uuid 1d97bb0b-9e2f-4403-9ae3-58c2554306f8 } } @@ -221,30 +270,17 @@ effects { # ... # } +# Added aec, ns effects for voice_commuincation, which are supported by the board + +pre_processing { + voice_communication { + aec { + } + ns { + } + } +} + # # TODO: add default audio pre processor configurations after debug and tuning phase # - -# Audio output session configurations. -# New for L, similar to above but for playback streams -# Enables FX settings for a given stream type. Valid stream types are: -# "default", "voice_call", "system", "ring", "music", "alarm", "notification", -# "bluetooth_sco", "enforced_audible", "dtmf", "tts" - -output_session_processing { - music { - music_helper { } - } - ring { - ring_helper { } - } - alarm { - ring_helper { } - } - voice_call { - voice_helper { } - } - notification { - notification_helper { } - } -}