Revert "Enable the spatial audio function"
This reverts commit 2d45a1ff43
.
Reason for revert: AK3 SA will be postponed to U-QPR3
Test: manual
Change-Id: I4dec5d0163d32e2b686abf3ce609c1736ef19895
This commit is contained in:
parent
8e184e600f
commit
ffe7c6b38a
5 changed files with 14 additions and 32 deletions
|
@ -10,7 +10,6 @@
|
||||||
<library name="proxy" path="libeffectproxy.so"/>
|
<library name="proxy" path="libeffectproxy.so"/>
|
||||||
<library name="offload_effect" path="liboffloadeffect.so"/>
|
<library name="offload_effect" path="liboffloadeffect.so"/>
|
||||||
<library name="haptic_generator" path="libhapticgenerator.so"/>
|
<library name="haptic_generator" path="libhapticgenerator.so"/>
|
||||||
<library name="spatializer" path="libspatialaudio.so"/>
|
|
||||||
</libraries>
|
</libraries>
|
||||||
<effects>
|
<effects>
|
||||||
<effectProxy name="bassboost" library="proxy" uuid="2f0871a2-c93c-4824-9664-42eb2909f2ef">
|
<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="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="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="dynamics_processing" library="dynamics_processing" uuid="e0e6539b-1781-7261-676f-6d7573696340"/>
|
||||||
<effect name="spatializer" library="spatializer" uuid="cc4677de-ff72-11eb-9a03-0242ac130003"/>
|
|
||||||
</effects>
|
</effects>
|
||||||
<postprocess>
|
<postprocess>
|
||||||
</postprocess>
|
</postprocess>
|
||||||
|
|
|
@ -227,10 +227,6 @@
|
||||||
<be_cfg be_id="OUT_A2DP_BE_CFG" latency="70000"/>
|
<be_cfg be_id="OUT_A2DP_BE_CFG" latency="70000"/>
|
||||||
</usecase>
|
</usecase>
|
||||||
|
|
||||||
<usecase id="UC_IMMERSIVE_PLAYBACK" type="playback">
|
|
||||||
<be_cfg be_id="OUT_A2DP_BE_CFG" latency="100000"/>
|
|
||||||
</usecase>
|
|
||||||
|
|
||||||
<usecase id="UC_AUDIO_RECORD" type="capture">
|
<usecase id="UC_AUDIO_RECORD" type="capture">
|
||||||
<be_cfg be_id="IN_CAMCORDER_LANDSCAPE_BE_CFG" latency="160000"/>
|
<be_cfg be_id="IN_CAMCORDER_LANDSCAPE_BE_CFG" latency="160000"/>
|
||||||
<be_cfg be_id="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG" latency="160000"/>
|
<be_cfg be_id="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG" latency="160000"/>
|
||||||
|
|
|
@ -63,10 +63,6 @@
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
|
<profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
|
||||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
||||||
</mixPort>
|
</mixPort>
|
||||||
<mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
|
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
|
|
||||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
|
||||||
</mixPort>
|
|
||||||
<mixPort name="incall playback" role="source"
|
<mixPort name="incall playback" role="source"
|
||||||
flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
|
flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
@ -162,17 +158,17 @@
|
||||||
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
|
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
|
||||||
</devicePort>
|
</devicePort>
|
||||||
<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"
|
<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"
|
||||||
encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
|
encodedFormats="AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
||||||
</devicePort>
|
</devicePort>
|
||||||
<devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink"
|
<devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink"
|
||||||
encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
|
encodedFormats="AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
||||||
</devicePort>
|
</devicePort>
|
||||||
<devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink"
|
<devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink"
|
||||||
encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
|
encodedFormats="AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
||||||
</devicePort>
|
</devicePort>
|
||||||
|
@ -212,21 +208,21 @@
|
||||||
<route type="mix" sink="Earpiece"
|
<route type="mix" sink="Earpiece"
|
||||||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
|
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
|
||||||
<route type="mix" sink="BT A2DP Out"
|
<route type="mix" sink="BT A2DP Out"
|
||||||
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out,immersive_out"/>
|
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="BT A2DP Headphones"
|
<route type="mix" sink="BT A2DP Headphones"
|
||||||
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out,immersive_out"/>
|
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="BT A2DP Speaker"
|
<route type="mix" sink="BT A2DP Speaker"
|
||||||
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out,immersive_out"/>
|
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="BT BLE Headset"
|
<route type="mix" sink="BT BLE Headset"
|
||||||
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out,immersive_out"/>
|
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="BT BLE Speaker"
|
<route type="mix" sink="BT BLE Speaker"
|
||||||
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out,immersive_out"/>
|
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="BT BLE Broadcast"
|
<route type="mix" sink="BT BLE Broadcast"
|
||||||
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out,immersive_out"/>
|
sources="primary output,deep buffer,haptic,voip_rx,compressed_offload,raw,mmap_no_irq_out"/>
|
||||||
<route type="mix" sink="USB Device Out"
|
<route type="mix" sink="USB Device Out"
|
||||||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
|
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload"/>
|
||||||
<route type="mix" sink="USB Headset Out"
|
<route type="mix" sink="USB Headset Out"
|
||||||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
|
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload"/>
|
||||||
<route type="mix" sink="HDMI Out"
|
<route type="mix" sink="HDMI Out"
|
||||||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
|
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
|
||||||
<route type="mix" sink="BT SCO"
|
<route type="mix" sink="BT SCO"
|
||||||
|
|
|
@ -63,10 +63,6 @@
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
|
<profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
|
||||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
||||||
</mixPort>
|
</mixPort>
|
||||||
<mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
|
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
|
|
||||||
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
|
|
||||||
</mixPort>
|
|
||||||
<mixPort name="incall playback" role="source"
|
<mixPort name="incall playback" role="source"
|
||||||
flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
|
flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
|
||||||
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
|
||||||
|
@ -180,9 +176,9 @@
|
||||||
<route type="mix" sink="Earpiece"
|
<route type="mix" sink="Earpiece"
|
||||||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
|
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
|
||||||
<route type="mix" sink="USB Device Out"
|
<route type="mix" sink="USB Device Out"
|
||||||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
|
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload"/>
|
||||||
<route type="mix" sink="USB Headset Out"
|
<route type="mix" sink="USB Headset Out"
|
||||||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload,immersive_out"/>
|
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,hifi_playback,compressed_offload"/>
|
||||||
<route type="mix" sink="HDMI Out"
|
<route type="mix" sink="HDMI Out"
|
||||||
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
|
sources="primary output,deep buffer,haptic,raw,mmap_no_irq_out,voip_rx,compressed_offload"/>
|
||||||
<route type="mix" sink="BT SCO"
|
<route type="mix" sink="BT SCO"
|
||||||
|
|
|
@ -112,7 +112,7 @@ PRODUCT_COPY_FILES += \
|
||||||
PRODUCT_PROPERTY_OVERRIDES += \
|
PRODUCT_PROPERTY_OVERRIDES += \
|
||||||
ro.bluetooth.a2dp_offload.supported=true \
|
ro.bluetooth.a2dp_offload.supported=true \
|
||||||
persist.bluetooth.a2dp_offload.disabled=false \
|
persist.bluetooth.a2dp_offload.disabled=false \
|
||||||
persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus
|
persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac
|
||||||
|
|
||||||
# POF
|
# POF
|
||||||
PRODUCT_PRODUCT_PROPERTIES += \
|
PRODUCT_PRODUCT_PROPERTIES += \
|
||||||
|
@ -186,10 +186,6 @@ PRODUCT_PACKAGES += \
|
||||||
libspatialaudio \
|
libspatialaudio \
|
||||||
librondo
|
librondo
|
||||||
|
|
||||||
# declare use of spatial audio
|
|
||||||
PRODUCT_PROPERTY_OVERRIDES += \
|
|
||||||
ro.audio.spatializer_enabled=true
|
|
||||||
|
|
||||||
# Audio CCA property
|
# Audio CCA property
|
||||||
PRODUCT_PROPERTY_OVERRIDES += \
|
PRODUCT_PROPERTY_OVERRIDES += \
|
||||||
persist.vendor.audio.cca.enabled=true
|
persist.vendor.audio.cca.enabled=true
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue