From d4d0a243ab92d869462bc4e404cb40ad110a2c62 Mon Sep 17 00:00:00 2001 From: dianlujitao Date: Sun, 2 Feb 2020 21:03:24 +0800 Subject: sdm660-common: Update audio config from LA.UM.8.2.r1-05100-sdm660.0 Change-Id: I0874bdd23666419ff475cb9b2da78e7f5c12013b --- audio/audio_effects.xml | 46 ++++++++++--- audio/audio_output_policy.conf | 2 +- audio/audio_policy_configuration.xml | 128 +++++++++++++++++++++++++++-------- sdm660.mk | 3 +- 4 files changed, 135 insertions(+), 44 deletions(-) diff --git a/audio/audio_effects.xml b/audio/audio_effects.xml index 434f090..e5ce555 100644 --- a/audio/audio_effects.xml +++ b/audio/audio_effects.xml @@ -1,29 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + - - + - + @@ -32,19 +56,19 @@ - + - + - + - + @@ -54,6 +78,7 @@ + @@ -62,7 +87,6 @@ - diff --git a/audio/audio_output_policy.conf b/audio/audio_output_policy.conf index a74791b..c6338e5 100644 --- a/audio/audio_output_policy.conf +++ b/audio/audio_output_policy.conf @@ -48,7 +48,7 @@ outputs { } 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 + formats 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 diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml index c548ecf..3bfeaac 100644 --- a/audio/audio_policy_configuration.xml +++ b/audio/audio_policy_configuration.xml @@ -1,5 +1,5 @@ - @@ -155,11 +158,21 @@ samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/> - + + + + + + + + + + + + + + + + + samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> + samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> @@ -267,66 +295,106 @@ samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/> - - - - + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,compress_passthrough"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,hifi_playback"/> + sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,hifi_playback"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - diff --git a/sdm660.mk b/sdm660.mk index 5ac7299..c8e8fcc 100644 --- a/sdm660.mk +++ b/sdm660.mk @@ -127,8 +127,7 @@ PRODUCT_COPY_FILES += \ $(TOPDIR)frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \ $(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ $(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ - $(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \ - $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml + $(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml # ANT+ PRODUCT_PACKAGES += \ -- cgit v1.2.3