diff options
author | Eric Laurent <elaurent@google.com> | 2022-04-08 16:10:43 +0200 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-04-11 23:04:32 +0000 |
commit | 10e2860d2489c9d413746eaba060ab40c0513d67 (patch) | |
tree | 494478f620a1184ccbd42b1fd8a3f8f604fbf125 | |
parent | 9786526b6d00bcd0491498e0b9c86e57b30218e4 (diff) | |
download | raviole-10e2860d2489c9d413746eaba060ab40c0513d67.tar.gz |
Revert "DO NOT MERGE Audio configuration for spatial audio"
Bug: 223736548
Test: make
This reverts commit edfc5e86bde0ea87e286047161f8ee3e1a022303.
Change-Id: Ie693f24b76d00469ad71a36989e481023946c3bb
(cherry picked from commit f4f8fa1fed2444f555f8e9345dbe57e3d8f35c6b)
Merged-In: Ie693f24b76d00469ad71a36989e481023946c3bb
-rw-r--r-- | audio/oriole/audio-tables.mk | 3 | ||||
-rw-r--r-- | audio/oriole/config/audio_effects.xml | 2 | ||||
-rw-r--r-- | audio/oriole/config/bluetooth_audio_policy_configuration_7_0.xml | 44 | ||||
-rw-r--r-- | audio/raven/audio-tables.mk | 3 | ||||
-rw-r--r-- | audio/raven/config/audio_effects.xml | 2 | ||||
-rw-r--r-- | audio/raven/config/bluetooth_audio_policy_configuration_7_0.xml | 44 |
6 files changed, 2 insertions, 96 deletions
diff --git a/audio/oriole/audio-tables.mk b/audio/oriole/audio-tables.mk index abbf5897..52e48588 100644 --- a/audio/oriole/audio-tables.mk +++ b/audio/oriole/audio-tables.mk @@ -23,8 +23,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ - device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ - device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml + device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \ diff --git a/audio/oriole/config/audio_effects.xml b/audio/oriole/config/audio_effects.xml index e35bfbdd..17180575 100644 --- a/audio/oriole/config/audio_effects.xml +++ b/audio/oriole/config/audio_effects.xml @@ -10,7 +10,6 @@ <library name="proxy" path="libeffectproxy.so"/> <library name="offload_effect" path="liboffloadeffect.so"/> <library name="haptic_generator" path="libhapticgenerator.so"/> - <library name="spatializer" path="libspatialaudio.so"/> </libraries> <effects> <effectProxy name="bassboost" library="proxy" uuid="2f0871a2-c93c-4824-9664-42eb2909f2ef"> @@ -52,7 +51,6 @@ <effect name="ns" library="offload_effect" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/> <effect name="haptic_generator" library="haptic_generator" uuid="97c4acd1-8b82-4f2f-832e-c2fe5d7a9931"/> <effect name="dynamics_processing" library="dynamics_processing" uuid="e0e6539b-1781-7261-676f-6d7573696340"/> - <effect name="spatializer" library="spatializer" uuid="cc4677de-ff72-11eb-9a03-0242ac130003"/> </effects> <postprocess> </postprocess> diff --git a/audio/oriole/config/bluetooth_audio_policy_configuration_7_0.xml b/audio/oriole/config/bluetooth_audio_policy_configuration_7_0.xml deleted file mode 100644 index 3a07dedf..00000000 --- a/audio/oriole/config/bluetooth_audio_policy_configuration_7_0.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Bluetooth Audio HAL Audio Policy Configuration file --> -<module name="bluetooth" halVersion="2.0"> - <mixPorts> - <!-- A2DP Audio Ports --> - <mixPort name="a2dp output" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER AUDIO_OUTPUT_FLAG_FAST"/> - <!-- Hearing AIDs Audio Ports --> - <mixPort name="hearing aid output" role="source"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="24000 16000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </mixPort> - </mixPorts> - <devicePorts> - <!-- A2DP Audio Ports --> - <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100 48000 88200 96000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> - <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100 48000 88200 96000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> - <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100 48000 88200 96000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> - <!-- Hearing AIDs Audio Ports --> - <devicePort tagName="BT Hearing Aid Out" type="AUDIO_DEVICE_OUT_HEARING_AID" role="sink"/> - </devicePorts> - <routes> - <route type="mix" sink="BT A2DP Out" - sources="a2dp output"/> - <route type="mix" sink="BT A2DP Headphones" - sources="a2dp output"/> - <route type="mix" sink="BT A2DP Speaker" - sources="a2dp output"/> - <route type="mix" sink="BT Hearing Aid Out" - sources="hearing aid output"/> - </routes> -</module> diff --git a/audio/raven/audio-tables.mk b/audio/raven/audio-tables.mk index f2fc29a7..b79674ed 100644 --- a/audio/raven/audio-tables.mk +++ b/audio/raven/audio-tables.mk @@ -23,8 +23,7 @@ PRODUCT_COPY_FILES += \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ - device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ - device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml + device/google/raviole/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml # AudioEffectHAL Configuration PRODUCT_COPY_FILES += \ diff --git a/audio/raven/config/audio_effects.xml b/audio/raven/config/audio_effects.xml index e35bfbdd..17180575 100644 --- a/audio/raven/config/audio_effects.xml +++ b/audio/raven/config/audio_effects.xml @@ -10,7 +10,6 @@ <library name="proxy" path="libeffectproxy.so"/> <library name="offload_effect" path="liboffloadeffect.so"/> <library name="haptic_generator" path="libhapticgenerator.so"/> - <library name="spatializer" path="libspatialaudio.so"/> </libraries> <effects> <effectProxy name="bassboost" library="proxy" uuid="2f0871a2-c93c-4824-9664-42eb2909f2ef"> @@ -52,7 +51,6 @@ <effect name="ns" library="offload_effect" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/> <effect name="haptic_generator" library="haptic_generator" uuid="97c4acd1-8b82-4f2f-832e-c2fe5d7a9931"/> <effect name="dynamics_processing" library="dynamics_processing" uuid="e0e6539b-1781-7261-676f-6d7573696340"/> - <effect name="spatializer" library="spatializer" uuid="cc4677de-ff72-11eb-9a03-0242ac130003"/> </effects> <postprocess> </postprocess> diff --git a/audio/raven/config/bluetooth_audio_policy_configuration_7_0.xml b/audio/raven/config/bluetooth_audio_policy_configuration_7_0.xml deleted file mode 100644 index 3a07dedf..00000000 --- a/audio/raven/config/bluetooth_audio_policy_configuration_7_0.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Bluetooth Audio HAL Audio Policy Configuration file --> -<module name="bluetooth" halVersion="2.0"> - <mixPorts> - <!-- A2DP Audio Ports --> - <mixPort name="a2dp output" role="source" flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER AUDIO_OUTPUT_FLAG_FAST"/> - <!-- Hearing AIDs Audio Ports --> - <mixPort name="hearing aid output" role="source"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="24000 16000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </mixPort> - </mixPorts> - <devicePorts> - <!-- A2DP Audio Ports --> - <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100 48000 88200 96000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> - <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100 48000 88200 96000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> - <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100 48000 88200 96000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> - <!-- Hearing AIDs Audio Ports --> - <devicePort tagName="BT Hearing Aid Out" type="AUDIO_DEVICE_OUT_HEARING_AID" role="sink"/> - </devicePorts> - <routes> - <route type="mix" sink="BT A2DP Out" - sources="a2dp output"/> - <route type="mix" sink="BT A2DP Headphones" - sources="a2dp output"/> - <route type="mix" sink="BT A2DP Speaker" - sources="a2dp output"/> - <route type="mix" sink="BT Hearing Aid Out" - sources="hearing aid output"/> - </routes> -</module> |