From bd4e03c5609225c64de92159d3dc37271da7a850 Mon Sep 17 00:00:00 2001 From: Sebastiano Barezzi Date: Wed, 9 Feb 2022 14:43:09 +0100 Subject: [PATCH] sdm710-common: Add audio configs * From grus-user 11 RKQ1.20082.002 V12.5.1.0.RFBMIXM release-keys Change-Id: I512f924fab709fddf177953038a2856db5dbe8fa --- audio/audio_effects.xml | 121 +++++++ audio/audio_output_policy.conf | 132 ++++++++ audio/audio_policy_configuration.xml | 465 +++++++++++++++++++++++++++ audio/audio_tuning_mixer.txt | 41 +++ sdm710.mk | 9 + 5 files changed, 768 insertions(+) create mode 100644 audio/audio_effects.xml create mode 100644 audio/audio_output_policy.conf create mode 100644 audio/audio_policy_configuration.xml create mode 100644 audio/audio_tuning_mixer.txt diff --git a/audio/audio_effects.xml b/audio/audio_effects.xml new file mode 100644 index 0000000..425ae22 --- /dev/null +++ b/audio/audio_effects.xml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/audio_output_policy.conf b/audio/audio_output_policy.conf new file mode 100644 index 0000000..ba1fa51 --- /dev/null +++ b/audio/audio_output_policy.conf @@ -0,0 +1,132 @@ +# List of profiles for the output device session where stream is routed. +# A stream opened with the inputs attributes which match the "flags" and +# "formats" as specified in the profile is routed to a device at +# sample rate specified under "sampling_rates" and bit width under +# "bit_width" and the topology extracted from the acdb data against +# the "app_type". +# +# the flags and formats are specified using the strings corresponding to +# enums in audio.h and audio_policy.h. They are concatenated with "|" +# without space or "\n". +# the flags and formats should match the ones in "audio_policy.conf" + +outputs { + default { + flags AUDIO_OUTPUT_FLAG_PRIMARY + formats AUDIO_FORMAT_PCM_16_BIT + sampling_rates 48000 + bit_width 16 + app_type 69937 + } + default_24bit { + flags AUDIO_OUTPUT_FLAG_PRIMARY + formats AUDIO_FORMAT_PCM_24_BIT_PACKED + sampling_rates 48000 + bit_width 24 + app_type 69937 + } + proaudio { + flags AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_RAW + formats AUDIO_FORMAT_PCM_16_BIT + sampling_rates 48000 + bit_width 16 + app_type 69943 + } +voip_rx { + flags AUDIO_OUTPUT_FLAG_VOIP_RX|AUDIO_OUTPUT_FLAG_DIRECT + formats AUDIO_FORMAT_PCM_16_BIT + sampling_rates 8000|16000|32000|48000 + bit_width 16 + app_type 69946 + } + deep_buffer { + flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER + formats AUDIO_FORMAT_PCM_16_BIT + sampling_rates 48000 + bit_width 16 + app_type 69936 + } + deep_buffer_24 { + flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER + formats AUDIO_FORMAT_PCM_24_BIT_PACKED + sampling_rates 48000 + bit_width 24 + app_type 69940 + } + direct_pcm_16 { + flags AUDIO_OUTPUT_FLAG_DIRECT + formats AUDIO_FORMAT_PCM_16_BIT|AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT|AUDIO_FORMAT_PCM_32_BIT + sampling_rates 44100|48000|88200|96000|176400|192000 + bit_width 16 + app_type 69936 + } + direct_pcm_24 { + flags AUDIO_OUTPUT_FLAG_DIRECT + formats AUDIO_FORMAT_PCM_24_BIT_PACKED|AUDIO_FORMAT_PCM_8_24_BIT|AUDIO_FORMAT_PCM_32_BIT + sampling_rates 44100|48000|88200|96000|176400|192000|352800|384000 + bit_width 24 + app_type 69940 + } + direct_pcm_32 { + flags AUDIO_OUTPUT_FLAG_DIRECT + formats AUDIO_FORMAT_PCM_32_BIT + sampling_rates 44100|48000|88200|96000|176400|192000|352800|384000 + bit_width 32 + app_type 69942 + } + compress_passthrough { + flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING|AUDIO_OUTPUT_FLAG_COMPRESS_PASSTHROUGH + formats AUDIO_FORMAT_AC3|AUDIO_FORMAT_E_AC3|AUDIO_FORMAT_E_AC3_JOC|AUDIO_FORMAT_DTS|AUDIO_FORMAT_DTS_HD|AUDIO_FORMAT_DSD + sampling_rates 32000|44100|48000|88200|96000|176400|192000|352800 + bit_width 16 + app_type 69941 + } + compress_offload_16 { + flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING + formats AUDIO_FORMAT_MP3|AUDIO_FORMAT_PCM_16_BIT_OFFLOAD|AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_AAC_LC|AUDIO_FORMAT_AAC_HE_V1|AUDIO_FORMAT_AAC_HE_V2|AUDIO_FORMAT_WMA|AUDIO_FORMAT_WMA_PRO|AUDIO_FORMAT_VORBIS|AUDIO_FORMAT_AAC_ADTS_LC|AUDIO_FORMAT_AAC_ADTS_HE_V1|AUDIO_FORMAT_AAC_ADTS_HE_V2 + sampling_rates 44100|48000|88200|96000|176400|192000 + bit_width 16 + app_type 69936 + } + compress_offload_24 { + flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING + formats AUDIO_FORMAT_PCM_24_BIT_OFFLOAD|AUDIO_FORMAT_FLAC|AUDIO_FORMAT_ALAC|AUDIO_FORMAT_APE|AUDIO_FORMAT_VORBIS|AUDIO_FORMAT_WMA|AUDIO_FORMAT_WMA_PRO + sampling_rates 44100|48000|88200|96000|176400|192000 + bit_width 24 + app_type 69940 + } +} + +inputs { + primary { + flags AUDIO_INPUT_FLAG_NONE + formats AUDIO_FORMAT_PCM_16_BIT + sampling_rates 48000 + bit_width 16 + app_type 69938 + } + record_24bit { + profile none + flags AUDIO_INPUT_FLAG_NONE + formats AUDIO_FORMAT_PCM_24_BIT_PACKED + sampling_rates 16000|48000 + bit_width 24 + app_type 69945 + } + record_fluence1 { + flags AUDIO_INPUT_FLAG_COMPRESS + profile record_fluence + formats AUDIO_FORMAT_PCM_16_BIT + sampling_rates 48000 + bit_width 16 + app_type 69944 + } + record_fluence { + flags AUDIO_INPUT_FLAG_TIMESTAMP + profile record_fluence + formats AUDIO_FORMAT_PCM_16_BIT + sampling_rates 48000 + bit_width 16 + app_type 69944 + } +} diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml new file mode 100644 index 0000000..8e61e3b --- /dev/null +++ b/audio/audio_policy_configuration.xml @@ -0,0 +1,465 @@ + + + + + + + + + + + + + + + + + Earpiece + Speaker + Telephony Tx + Built-In Mic + Built-In Back Mic + FM Tuner + Telephony Rx + + Speaker + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/audio_tuning_mixer.txt b/audio/audio_tuning_mixer.txt new file mode 100644 index 0000000..fd48369 --- /dev/null +++ b/audio/audio_tuning_mixer.txt @@ -0,0 +1,41 @@ +#RAS_TEST_SPKR_PHONE_SPKR_STEREO +acdb_dev_id:136 +!Playback +Rxdevice:0 + +enable +INT4_MI2S_RX Channels:Two +RX4 MIX1 INP1:RX4 +RX5 MIX1 INP1:RX5 +COMP1 Switch:1 +COMP2 Switch:1 +SpkrLeft COMP Switch:1 +SpkrLeft BOOST Switch:1 +SpkrLeft VISENSE Switch:1 +SpkrLeft SWR DAC_Port Switch:1 +SpkrRight COMP Switch:1 +SpkrRight BOOST Switch:1 +SpkrRight VISENSE Switch:1 +SpkrRight SWR DAC_Port Switch:1 +SpkrLeft WSA PA Mute:0 +SpkrRight WSA PA Mute:0 +INT4_MI2S_RX Audio Mixer MultiMedia1:1 + +disable +INT4_MI2S_RX Channels:One +RX4 MIX1 INP1:ZERO +RX5 MIX1 INP1:ZERO +COMP1 Switch:0 +COMP2 Switch:0 +SpkrLeft COMP Switch:0 +SpkrLeft BOOST Switch:0 +SpkrLeft VISENSE Switch:0 +SpkrLeft SWR DAC_Port Switch:0 +SpkrRight COMP Switch:0 +SpkrRight BOOST Switch:0 +SpkrRight VISENSE Switch:0 +SpkrRight SWR DAC_Port Switch:0 +SpkrLeft WSA PA Mute:0 +SpkrRight WSA PA Mute:0 +INT4_MI2S_RX Audio Mixer MultiMedia1:0 + diff --git a/sdm710.mk b/sdm710.mk index 3420052..b8b73cf 100644 --- a/sdm710.mk +++ b/sdm710.mk @@ -34,6 +34,15 @@ PRODUCT_PACKAGES += \ libvolumelistener \ tinymix +# Audio configs +PRODUCT_COPY_FILES += \ + $(call find-copy-subdir-files,*,$(LOCAL_PATH)/audio/,$(TARGET_COPY_OUT_VENDOR)/etc) + +PRODUCT_COPY_FILES += \ + frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ + frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ + frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml + # Overlays PRODUCT_ENFORCE_RRO_TARGETS := *