From 20a2a95dd3dccf58e7bb4a647ce3bddf76a9488b Mon Sep 17 00:00:00 2001 From: justinweng Date: Tue, 25 Jan 2022 15:45:21 +0800 Subject: [PATCH] Audio configuration for spatial audio Update audio policy and effect configuration files to support spatial audio feature Bug: 237677573 Test: make Change-Id: I4a7e2eb3c44192954b7bcf804d14097e94e90eb0 --- .../config/audio_platform_configuration.xml | 1 + .../config/audio_policy_configuration.xml | 20 +++++++++++-------- ...cy_configuration_a2dp_offload_disabled.xml | 10 +++++++--- ...licy_configuration_le_offload_disabled.xml | 16 +++++++++------ ...with_le_audio_policy_configuration_7_0.xml | 8 ++++++-- audio/oriole/config/mixer_paths.xml | 12 +++++++++++ .../config/audio_platform_configuration.xml | 1 + .../config/audio_policy_configuration.xml | 20 +++++++++++-------- ...cy_configuration_a2dp_offload_disabled.xml | 10 +++++++--- ...licy_configuration_le_offload_disabled.xml | 16 +++++++++------ ...with_le_audio_policy_configuration_7_0.xml | 6 +++++- audio/raven/config/mixer_paths.xml | 12 +++++++++++ device-oriole.mk | 7 +++++++ device-raven.mk | 7 +++++++ 14 files changed, 109 insertions(+), 37 deletions(-) diff --git a/audio/oriole/config/audio_platform_configuration.xml b/audio/oriole/config/audio_platform_configuration.xml index a4232cd..676131b 100644 --- a/audio/oriole/config/audio_platform_configuration.xml +++ b/audio/oriole/config/audio_platform_configuration.xml @@ -182,6 +182,7 @@ + diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml index 5bd7ec8..fe4eafb 100644 --- a/audio/oriole/config/audio_policy_configuration.xml +++ b/audio/oriole/config/audio_policy_configuration.xml @@ -64,6 +64,10 @@ + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> - + + + - \ No newline at end of file + diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml index a39fcd0..93e3547 100644 --- a/audio/oriole/config/mixer_paths.xml +++ b/audio/oriole/config/mixer_paths.xml @@ -429,6 +429,18 @@ + + + + + + + + + + + + diff --git a/audio/raven/config/audio_platform_configuration.xml b/audio/raven/config/audio_platform_configuration.xml index a4232cd..676131b 100644 --- a/audio/raven/config/audio_platform_configuration.xml +++ b/audio/raven/config/audio_platform_configuration.xml @@ -182,6 +182,7 @@ + diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml index 5bd7ec8..fe4eafb 100644 --- a/audio/raven/config/audio_policy_configuration.xml +++ b/audio/raven/config/audio_policy_configuration.xml @@ -64,6 +64,10 @@ + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,compressed_offload,voip_rx,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out,voip_rx,hifi_playback,immersive_out"/> - + + + + + + + + + + + + + + + diff --git a/device-oriole.mk b/device-oriole.mk index 95b0201..f6f46a0 100644 --- a/device-oriole.mk +++ b/device-oriole.mk @@ -237,6 +237,13 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.le_audio_test=false endif +# declare use of spatial audio +PRODUCT_PROPERTY_OVERRIDES += \ + ro.audio.spatializer_enabled=true + +PRODUCT_PACKAGES += \ + libspatialaudio + # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml diff --git a/device-raven.mk b/device-raven.mk index da3ac3c..a510882 100644 --- a/device-raven.mk +++ b/device-raven.mk @@ -251,6 +251,13 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.bluetooth.le_audio_test=false endif +# declare use of spatial audio +PRODUCT_PROPERTY_OVERRIDES += \ + ro.audio.spatializer_enabled=true + +PRODUCT_PACKAGES += \ + libspatialaudio + # Device features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml