audio: new AIDL configuration xml am: 950f2c12fb
Original change: https://googleplex-android-review.googlesource.com/c/device/google/lynx/+/24298380 Change-Id: Ie332a9d3e1de406de7d8d21823f9e391a21e4d48 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
David Li
126
audio/lynx/aidl_config/audio_platform_configuration.xml
Normal file
126
audio/lynx/aidl_config/audio_platform_configuration.xml
Normal file
@@ -0,0 +1,126 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||
<!-- Copyright (C) 2023 The Android Open Source Project
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<audioPlatformConfiguration xmlns:xi="http://www.w3.org/2001/XInclude">
|
||||
<features>
|
||||
<feature name="ThermalThrottle">
|
||||
<argument name="Type" value="SKIN" />
|
||||
<argument name="Name" value="VIRTUAL-SKIN" />
|
||||
</feature>
|
||||
<feature name="BatteryThrottle">
|
||||
<argument name="Type" value="BCL_VOLTAGE" />
|
||||
<argument name="Name" value="BCL_AUDIO_BAACL" />
|
||||
<argument name="Strategy" value="MediaSpeakerAndScreenOn" />
|
||||
</feature>
|
||||
<feature name="PlaybackThermalThrottle">
|
||||
<argument name="PollWaitMs" value="20000" />
|
||||
<argument name="ThermistorName" value="VIRTUAL-SKIN" />
|
||||
<argument name="ThermistorType" value="SKIN" />
|
||||
<argument name="ThrottlingSeverity" value="MODERATE" />
|
||||
</feature>
|
||||
</features>
|
||||
|
||||
<voipVolume>
|
||||
<path voipDevice="VoipDevice::kUsb">
|
||||
<gain>0.01</gain>
|
||||
<gain>0.02</gain>
|
||||
<gain>0.04</gain>
|
||||
<gain>0.10</gain>
|
||||
<gain>0.21</gain>
|
||||
<gain>0.47</gain>
|
||||
<gain>1.00</gain>
|
||||
</path>
|
||||
</voipVolume>
|
||||
|
||||
<devices>
|
||||
<device name="bluetooth" />
|
||||
<device name="usb">
|
||||
<argument name="MaxSamplingRate" value="192000" />
|
||||
<argument name="UnsupportedFormat" value="S24_LE" />
|
||||
<argument name="MaxCapPacketInterval" value="125" />
|
||||
<argument name="MaxCapSampleRate" value="192000" />
|
||||
<argument name="MaxCapBitWidth" value="32" />
|
||||
<argument name="MaxCapChannel" value="2" />
|
||||
<argument name="EnableHifi192kMultichannel" value="0" />
|
||||
</device>
|
||||
<device name="speaker" codec="cs35l41">
|
||||
<argument name="SpeakerNum" value="2" />
|
||||
<argument name="Rotation" />
|
||||
<argument name="AcousticShockProtection" />
|
||||
</device>
|
||||
</devices>
|
||||
|
||||
<tuners>
|
||||
<tuner type="playback" name="waves">
|
||||
<argument name="Sink" value="SPK" />
|
||||
<argument name="ThermistorsName" value="VIRTUAL-SKIN" />
|
||||
</tuner>
|
||||
<tuner type="telephony" name="fortemedia">
|
||||
<argument name="VoIP_DLCHs" value="SPK:2,USB:2" />
|
||||
<argument name="VoIP_Rate" value="32000" />
|
||||
<argument name="BOOST_USB_SWB_CLK" value="y" />
|
||||
<argument name="CCA" value="y" />
|
||||
</tuner>
|
||||
<tuner type="capture" name="gs_capture" />
|
||||
</tuners>
|
||||
|
||||
<latencies>
|
||||
<latency source="primary-playback" sink="speaker" milliseconds="20" />
|
||||
<latency source="primary-playback" sink="usb-device" milliseconds="10" />
|
||||
<latency source="primary-playback" sink="usb-headset" milliseconds="10" />
|
||||
<latency source="primary-playback" sink="bluetooth-a2dp-device"
|
||||
milliseconds="10" />
|
||||
<latency source="primary-playback" sink="bluetooth-low-energy-speaker"
|
||||
milliseconds="10" />
|
||||
|
||||
<latency source="deep-buffer-playback" sink="speaker" milliseconds="70" />
|
||||
<latency source="deep-buffer-playback" sink="usb-device" milliseconds="70" />
|
||||
<latency source="deep-buffer-playback" sink="usb-headset" milliseconds="70" />
|
||||
<latency source="deep-buffer-playback" sink="bluetooth-a2dp-device"
|
||||
milliseconds="180" />
|
||||
|
||||
<latency source="compress-offload-playback" sink="speaker" milliseconds="40" />
|
||||
<latency source="compress-offload-playback" sink="usb-device"
|
||||
milliseconds="40" />
|
||||
<latency source="compress-offload-playback" sink="usb-headset"
|
||||
milliseconds="40" />
|
||||
<latency source="compress-offload-playback" sink="bluetooth-a2dp-device"
|
||||
milliseconds="70" />
|
||||
|
||||
<latency source="immersive-playback" sink="bluetooth-a2dp-device"
|
||||
milliseconds="100" />
|
||||
|
||||
<latency source="microphones" sink="primary-capture" milliseconds="160" />
|
||||
<latency source="back-microphones" sink="primary-capture" milliseconds="160" />
|
||||
<latency source="bluetooth-sco-headset" sink="primary-capture"
|
||||
milliseconds="40" />
|
||||
</latencies>
|
||||
|
||||
<spatialCapture>
|
||||
<enablement useCase="primary-capture" deviceInterface="microphones">
|
||||
<source>MIC</source>
|
||||
<source>CAMCORDER</source>
|
||||
<source>VOICE_RECOGNITION</source>
|
||||
</enablement>
|
||||
<enablement useCase="primary-capture" deviceInterface="back-microphones">
|
||||
<source>MIC</source>
|
||||
<source>CAMCORDER</source>
|
||||
<source>VOICE_RECOGNITION</source>
|
||||
</enablement>
|
||||
</spatialCapture>
|
||||
|
||||
<xi:include href="audio_policy_volumes.xml" />
|
||||
<xi:include href="default_volume_tables.xml" />
|
||||
</audioPlatformConfiguration>
|
||||
@@ -1,76 +0,0 @@
|
||||
<?xml version="1.0" encoding="ISO-8859-1"?>
|
||||
<!-- Copyright (c) 2023, The Linux Foundation. All rights reserved. -->
|
||||
<!-- -->
|
||||
<!-- Redistribution and use in source and binary forms, with or without -->
|
||||
<!-- modification, are permitted provided that the following conditions are -->
|
||||
<!-- met: -->
|
||||
<!-- * Redistributions of source code must retain the above copyright -->
|
||||
<!-- notice, this list of conditions and the following disclaimer. -->
|
||||
<!-- * Redistributions in binary form must reproduce the above -->
|
||||
<!-- copyright notice, this list of conditions and the following -->
|
||||
<!-- disclaimer in the documentation and/or other materials provided -->
|
||||
<!-- with the distribution. -->
|
||||
<!-- * Neither the name of The Linux Foundation nor the names of its -->
|
||||
<!-- contributors may be used to endorse or promote products derived -->
|
||||
<!-- from this software without specific prior written permission. -->
|
||||
<!-- -->
|
||||
<!-- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED -->
|
||||
<!-- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -->
|
||||
<!-- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT -->
|
||||
<!-- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS -->
|
||||
<!-- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -->
|
||||
<!-- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -->
|
||||
<!-- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -->
|
||||
<!-- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -->
|
||||
<!-- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -->
|
||||
<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -->
|
||||
<audio_platform_configuration>
|
||||
<product_lists>
|
||||
<product name="Blackbird">
|
||||
<id value="18d1:5033" />
|
||||
</product>
|
||||
<product name="Condor">
|
||||
<id value="18d1:5034" />
|
||||
</product>
|
||||
<product name="Condor_Sprint">
|
||||
<id value="18d1:5038" />
|
||||
</product>
|
||||
<product name="Condor_Sprint2">
|
||||
<id value="18d1:5036" />
|
||||
</product>
|
||||
</product_lists>
|
||||
|
||||
<features>
|
||||
<feature name="ThermalThrottle=Type:SKIN,Name:VIRTUAL-SKIN" />
|
||||
<feature
|
||||
name="BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL,Strategy:MediaSpeakerAndScreenOn" />
|
||||
<feature
|
||||
name="PlaybackThermalThrottle=PollWaitMs:20000,ThermistorName:VIRTUAL-SKIN,ThermistorType:SKIN,ThrottlingSeverity:MODERATE" />
|
||||
</features>
|
||||
|
||||
<!-- The voip_db_mapping: format is "device="x" value="f1,f2..." -->
|
||||
<!-- device should be "handset","speaker","usb","bt","bt_hearing_aid" or "digital_dock" -->
|
||||
<voip_db_mapping>
|
||||
<voip_path device="usb" value="0.01,0.02,0.04,0.1,0.21,0.47,1.0" />
|
||||
</voip_db_mapping>
|
||||
|
||||
<!-- The device_builder: format is "type="x" codec_name="y" argu="z". name and argu are optional. -->
|
||||
<device_builder>
|
||||
<device type="bt" />
|
||||
<device type="usb" argu="MaxSamplingRate=96000,UnsupportedFormat=S24_LE" />
|
||||
<device type="speaker" codec_name="cs35l41" argu="SpeakerNum=4,Rotation,AcousticShockProtection" />
|
||||
</device_builder>
|
||||
|
||||
<!-- The spatial_capture_conditions: format is "use_case="x" audio_source="y" -->
|
||||
<!-- use_case defines in aidl/audio/usecase/use_case.h, audio_source is definied in aidl interfaces. -->
|
||||
<spatial_capture_conditions>
|
||||
<conditions use_case="primary-capture" audio_source="MIC,CAMCORDER,VOICE_RECOGNITION" />
|
||||
</spatial_capture_conditions>
|
||||
|
||||
<!-- The tuner_builder: format is "type="x" codec_name="y" argu="z". argu is optional. -->
|
||||
<tuner_builder>
|
||||
<tuner type="playback" name="waves" argu="Sink=SPK ThermistorsName=VIRTUAL-SKIN" />
|
||||
<tuner type="telephony" name="fortemedia" argu="VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000 BOOST_USB_SWB_CLK=y CCA=y" />
|
||||
<tuner type="capture" name="gs_capture" />
|
||||
</tuner_builder>
|
||||
</audio_platform_configuration>
|
||||
@@ -21,7 +21,7 @@ AUDIO_TABLE_FOLDER := lynx
|
||||
|
||||
ifeq ($(BUILD_AUDIO_AIDL_VERSION),true)
|
||||
PRODUCT_COPY_FILES += \
|
||||
device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration_aidl.xml \
|
||||
device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \
|
||||
device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
|
||||
device/google/lynx/audio/$(AUDIO_TABLE_FOLDER)/aidl_config/mixer_paths_aidl.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_aidl.xml
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user