From 094c57ce4a5bcfd5891ec261ca115756cdbd2893 Mon Sep 17 00:00:00 2001 From: millerliang Date: Fri, 12 Mar 2021 00:21:16 +0800 Subject: [PATCH] audio: add to support raw and mmap Add to support raw-playback and mmap-playback Bug: 165737390 Test: OboeTester->Test Output Signed-off-by: millerliang Change-Id: I2e9f530bd5d4c6d1f8d6bc3504d2fd0472631fcb --- .../config/audio_platform_configuration.xml | 4 +- .../config/audio_policy_configuration.xml | 26 +++++++----- ...cy_configuration_a2dp_offload_disabled.xml | 20 +++++---- ...icy_configuration_bluetooth_legacy_hal.xml | 20 +++++---- audio/oriole/config/mixer_paths.xml | 42 +++++++++++++++++-- .../config/audio_platform_configuration.xml | 4 +- .../config/audio_policy_configuration.xml | 26 +++++++----- ...cy_configuration_a2dp_offload_disabled.xml | 20 +++++---- ...icy_configuration_bluetooth_legacy_hal.xml | 20 +++++---- audio/raven/config/mixer_paths.xml | 42 +++++++++++++++++-- .../config/audio_platform_configuration.xml | 4 +- .../config/audio_policy_configuration.xml | 26 +++++++----- ...cy_configuration_a2dp_offload_disabled.xml | 20 +++++---- ...icy_configuration_bluetooth_legacy_hal.xml | 20 +++++---- audio/slider/config/mixer_paths.xml | 42 +++++++++++++++++-- .../config/audio_platform_configuration.xml | 4 +- .../config/audio_policy_configuration.xml | 20 +++++---- ...cy_configuration_a2dp_offload_disabled.xml | 20 +++++---- ...icy_configuration_bluetooth_legacy_hal.xml | 20 +++++---- audio/whitefin/config/mixer_paths.xml | 42 +++++++++++++++++-- 20 files changed, 321 insertions(+), 121 deletions(-) diff --git a/audio/oriole/config/audio_platform_configuration.xml b/audio/oriole/config/audio_platform_configuration.xml index 146401d..ee21759 100644 --- a/audio/oriole/config/audio_platform_configuration.xml +++ b/audio/oriole/config/audio_platform_configuration.xml @@ -111,9 +111,11 @@ - + + + diff --git a/audio/oriole/config/audio_policy_configuration.xml b/audio/oriole/config/audio_policy_configuration.xml index b7ee8a8..0112ac5 100644 --- a/audio/oriole/config/audio_policy_configuration.xml +++ b/audio/oriole/config/audio_policy_configuration.xml @@ -57,6 +57,10 @@ + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> diff --git a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml index 19794e1..b0ddcdf 100644 --- a/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/oriole/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -57,6 +57,10 @@ + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> diff --git a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 0c36d06..b42f3e2 100644 --- a/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/oriole/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -57,6 +57,10 @@ + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> diff --git a/audio/oriole/config/mixer_paths.xml b/audio/oriole/config/mixer_paths.xml index 6197d2d..a029f01 100644 --- a/audio/oriole/config/mixer_paths.xml +++ b/audio/oriole/config/mixer_paths.xml @@ -372,7 +372,7 @@ - + @@ -382,14 +382,14 @@ - + - + @@ -404,6 +404,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/raven/config/audio_platform_configuration.xml b/audio/raven/config/audio_platform_configuration.xml index 146401d..ee21759 100644 --- a/audio/raven/config/audio_platform_configuration.xml +++ b/audio/raven/config/audio_platform_configuration.xml @@ -111,9 +111,11 @@ - + + + diff --git a/audio/raven/config/audio_policy_configuration.xml b/audio/raven/config/audio_policy_configuration.xml index b7ee8a8..0112ac5 100644 --- a/audio/raven/config/audio_policy_configuration.xml +++ b/audio/raven/config/audio_policy_configuration.xml @@ -57,6 +57,10 @@ + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> diff --git a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml index 19794e1..b0ddcdf 100644 --- a/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/raven/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -57,6 +57,10 @@ + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> diff --git a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 0c36d06..b42f3e2 100644 --- a/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/raven/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -57,6 +57,10 @@ + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> diff --git a/audio/raven/config/mixer_paths.xml b/audio/raven/config/mixer_paths.xml index 656523b..5f7cb59 100644 --- a/audio/raven/config/mixer_paths.xml +++ b/audio/raven/config/mixer_paths.xml @@ -372,7 +372,7 @@ - + @@ -382,14 +382,14 @@ - + - + @@ -404,6 +404,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/slider/config/audio_platform_configuration.xml b/audio/slider/config/audio_platform_configuration.xml index 23d4955..d903af4 100644 --- a/audio/slider/config/audio_platform_configuration.xml +++ b/audio/slider/config/audio_platform_configuration.xml @@ -111,9 +111,11 @@ - + + + diff --git a/audio/slider/config/audio_policy_configuration.xml b/audio/slider/config/audio_policy_configuration.xml index b7ee8a8..0112ac5 100644 --- a/audio/slider/config/audio_policy_configuration.xml +++ b/audio/slider/config/audio_policy_configuration.xml @@ -57,6 +57,10 @@ + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> diff --git a/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml index 19794e1..b0ddcdf 100644 --- a/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/slider/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -57,6 +57,10 @@ + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> diff --git a/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml index 0c36d06..b42f3e2 100644 --- a/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/slider/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -57,6 +57,10 @@ + + + + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,haptic,raw,compressed_offload,mmap_no_irq_out"/> diff --git a/audio/slider/config/mixer_paths.xml b/audio/slider/config/mixer_paths.xml index 58d68cf..460cb39 100644 --- a/audio/slider/config/mixer_paths.xml +++ b/audio/slider/config/mixer_paths.xml @@ -336,7 +336,7 @@ - + @@ -346,14 +346,14 @@ - + - + @@ -368,6 +368,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/audio/whitefin/config/audio_platform_configuration.xml b/audio/whitefin/config/audio_platform_configuration.xml index 23d4955..d903af4 100644 --- a/audio/whitefin/config/audio_platform_configuration.xml +++ b/audio/whitefin/config/audio_platform_configuration.xml @@ -111,9 +111,11 @@ - + + + diff --git a/audio/whitefin/config/audio_policy_configuration.xml b/audio/whitefin/config/audio_policy_configuration.xml index 31f5c57..c501061 100644 --- a/audio/whitefin/config/audio_policy_configuration.xml +++ b/audio/whitefin/config/audio_policy_configuration.xml @@ -52,6 +52,10 @@ + + + + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/> diff --git a/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml index 4b62caa..a83de6d 100644 --- a/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml +++ b/audio/whitefin/config/audio_policy_configuration_a2dp_offload_disabled.xml @@ -52,6 +52,10 @@ + + + + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/> diff --git a/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml index d4955f4..f661328 100644 --- a/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml +++ b/audio/whitefin/config/audio_policy_configuration_bluetooth_legacy_hal.xml @@ -52,6 +52,10 @@ + + + + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/> + sources="primary output,deep buffer,raw,compressed_offload,mmap_no_irq_out"/> diff --git a/audio/whitefin/config/mixer_paths.xml b/audio/whitefin/config/mixer_paths.xml index e7899b2..03a9f5e 100644 --- a/audio/whitefin/config/mixer_paths.xml +++ b/audio/whitefin/config/mixer_paths.xml @@ -373,7 +373,7 @@ - + @@ -383,14 +383,14 @@ - + - + @@ -405,6 +405,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +