salami: Move audio configs to proprietary repo

No gain in keeping these in device trees nowadays and requires
more effort to keep in sync with OEM changes.

Change-Id: I3b5046be36d76db248359213230edbc6b40acc8b
This commit is contained in:
Bruno Martins
2025-03-29 11:25:55 +00:00
parent d92f30c7c9
commit 5ac1d4fa69
6 changed files with 7 additions and 5119 deletions

View File

@@ -1,428 +0,0 @@
<!-- Copyright (c) 2019, 2021, 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,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* Changes from Qualcomm Innovation Center are provided under the following license:
*
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted (subject to the limitations in the
* disclaimer below) 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 Qualcomm Innovation Center, Inc. nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
* NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
* GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
* HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER 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, WHETHER
* IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -->
<defs>
<card>
<id>100</id>
<name>kalamavirtualsndcard</name>
<pcm-device>
<id>100</id>
<name>PCM100</name>
<pcm_plugin>
<so-name>libagm_pcm_plugin.so</so-name>
</pcm_plugin>
<props>
<playback>1</playback>
<capture>0</capture>
<session_mode>0</session_mode>
</props>
</pcm-device>
<pcm-device>
<id>101</id>
<name>PCM101</name>
<pcm_plugin>
<so-name>libagm_pcm_plugin.so</so-name>
</pcm_plugin>
<props>
<playback>0</playback>
<capture>1</capture>
<session_mode>0</session_mode>
</props>
</pcm-device>
<pcm-device>
<id>102</id>
<name>PCM102</name>
<pcm_plugin>
<so-name>libagm_pcm_plugin.so</so-name>
</pcm_plugin>
<props>
<playback>1</playback>
<capture>0</capture>
<session_mode>0</session_mode>
</props>
</pcm-device>
<pcm-device>
<id>103</id>
<name>PCM103</name>
<pcm_plugin>
<so-name>libagm_pcm_plugin.so</so-name>
</pcm_plugin>
<props>
<playback>1</playback>
<capture>0</capture>
<session_mode>1</session_mode>
</props>
</pcm-device>
<pcm-device>
<id>104</id>
<name>PCM104</name>
<pcm_plugin>
<so-name>libagm_pcm_plugin.so</so-name>
</pcm_plugin>
<props>
<playback>0</playback>
<capture>1</capture>
<session_mode>1</session_mode>
</props>
</pcm-device>
<compress-device>
<id>105</id>
<name>COMPRESS105</name>
<compress_plugin>
<so-name>libagm_compress_plugin.so</so-name>
</compress_plugin>
<props>
<playback>1</playback>
<capture>0</capture>
<session_mode>0</session_mode>
</props>
</compress-device>
<pcm-device>
<id>106</id>
<name>VOICEMMODE1p</name>
<pcm_plugin>
<so-name>libagm_pcm_plugin.so</so-name>
</pcm_plugin>
<props>
<playback>1</playback>
<capture>0</capture>
<session_mode>1</session_mode>
</props>
</pcm-device>
<pcm-device>
<id>107</id>
<name>VOICEMMODE2p</name>
<pcm_plugin>
<so-name>libagm_pcm_plugin.so</so-name>
</pcm_plugin>
<props>
<playback>1</playback>
<capture>0</capture>
<session_mode>1</session_mode>
</props>
</pcm-device>
<pcm-device>
<id>108</id>
<name>VOICEMMODE1c</name>
<pcm_plugin>
<so-name>libagm_pcm_plugin.so</so-name>
</pcm_plugin>
<props>
<playback>0</playback>
<capture>1</capture>
<session_mode>1</session_mode>
</props>
</pcm-device>
<pcm-device>
<id>109</id>
<name>VOICEMMODE2c</name>
<pcm_plugin>
<so-name>libagm_pcm_plugin.so</so-name>
</pcm_plugin>
<props>
<playback>0</playback>
<capture>1</capture>
<session_mode>1</session_mode>
</props>
</pcm-device>
<pcm-device>
<id>110</id>
<name>PCM110</name>
<pcm_plugin>
<so-name>libagm_pcm_plugin.so</so-name>
</pcm_plugin>
<props>
<playback>1</playback>
<capture>0</capture>
<session_mode>0</session_mode>
</props>
</pcm-device>
<pcm-device>
<id>111</id>
<name>PCM111</name>
<pcm_plugin>
<so-name>libagm_pcm_plugin.so</so-name>
</pcm_plugin>
<props>
<playback>0</playback>
<capture>1</capture>
<session_mode>0</session_mode>
</props>
</pcm-device>
<pcm-device>
<id>112</id>
<name>PCM112</name>
<pcm_plugin>
<so-name>libagm_pcm_plugin.so</so-name>
</pcm_plugin>
<props>
<playback>0</playback>
<capture>1</capture>
<session_mode>0</session_mode>
</props>
</pcm-device>
<pcm-device>
<id>113</id>
<name>PCM113</name>
<pcm_plugin>
<so-name>libagm_pcm_plugin.so</so-name>
</pcm_plugin>
<props>
<playback>0</playback>
<capture>1</capture>
<session_mode>2</session_mode>
</props>
</pcm-device>
<pcm-device>
<id>114</id>
<name>PCM114</name>
<pcm_plugin>
<so-name>libagm_pcm_plugin.so</so-name>
</pcm_plugin>
<props>
<playback>1</playback>
<capture>0</capture>
<session_mode>2</session_mode>
</props>
</pcm-device>
<pcm-device>
<id>115</id>
<name>PCM115</name>
<pcm_plugin>
<so-name>libagm_pcm_plugin.so</so-name>
</pcm_plugin>
<props>
<playback>0</playback>
<capture>1</capture>
<session_mode>0</session_mode>
</props>
</pcm-device>
<pcm-device>
<id>116</id>
<name>PCM116</name>
<pcm_plugin>
<so-name>libagm_pcm_plugin.so</so-name>
</pcm_plugin>
<props>
<capture>1</capture>
<session_mode>3</session_mode>
</props>
</pcm-device>
<pcm-device>
<id>117</id>
<name>PCM117</name>
<pcm_plugin>
<so-name>libagm_pcm_plugin.so</so-name>
</pcm_plugin>
<props>
<playback>1</playback>
<capture>0</capture>
</props>
</pcm-device>
<pcm-device>
<id>118</id>
<name>PCM118</name>
<pcm_plugin>
<so-name>libagm_pcm_plugin.so</so-name>
</pcm_plugin>
<props>
<playback>0</playback>
<capture>1</capture>
<session_mode>1</session_mode>
</props>
</pcm-device>
<pcm-device>
<id>119</id>
<name>PCM119</name>
<pcm_plugin>
<so-name>libagm_pcm_plugin.so</so-name>
</pcm_plugin>
<props>
<playback>0</playback>
<capture>1</capture>
<session_mode>1</session_mode>
</props>
</pcm-device>
<pcm-device>
<id>120</id>
<name>PCM120</name>
<pcm_plugin>
<so-name>libagm_pcm_plugin.so</so-name>
</pcm_plugin>
<props>
<playback>0</playback>
<capture>1</capture>
<session_mode>1</session_mode>
</props>
</pcm-device>
<pcm-device>
<id>121</id>
<name>PCM121</name>
<pcm_plugin>
<so-name>libagm_pcm_plugin.so</so-name>
</pcm_plugin>
<props>
<playback>0</playback>
<capture>1</capture>
<session_mode>1</session_mode>
</props>
</pcm-device>
<pcm-device>
<id>122</id>
<name>ExtEC122</name>
<pcm_plugin>
<so-name>libagm_pcm_plugin.so</so-name>
</pcm_plugin>
<props>
<playback>0</playback>
<capture>1</capture>
<session_mode>1</session_mode>
</props>
</pcm-device>
<pcm-device>
<id>123</id>
<name>PCM123</name>
<pcm_plugin>
<so-name>libagm_pcm_plugin.so</so-name>
</pcm_plugin>
<props>
<playback>1</playback>
<capture>0</capture>
<session_mode>1</session_mode>
</props>
</pcm-device>
<compress-device>
<id>124</id>
<name>COMPRESS124</name>
<compress_plugin>
<so-name>libagm_compress_plugin.so</so-name>
</compress_plugin>
<props>
<playback>0</playback>
<capture>1</capture>
<!-- AGM_SESSION_COMPRESS -->
<session_mode>4</session_mode>
</props>
</compress-device>
<!-- #ifdef OPLUS_FEATURE_OCAR_AUDIO -->
<!-- YeWenliang@MULTIMEDIA.AUDIODRIVER.HAL, 2022/09/06, add for support call record in ocar mode -->
<pcm-device>
<id>125</id>
<name>PCM125</name>
<pcm_plugin>
<so-name>libagm_pcm_plugin.so</so-name>
</pcm_plugin>
<props>
<playback>0</playback>
<capture>1</capture>
<session_mode>2</session_mode>
</props>
</pcm-device>
<!-- #endif OPLUS_FEATURE_OCAR_AUDIO -->
<pcm-device>
<id>126</id>
<name>PCM126</name>
<pcm_plugin>
<so-name>libagm_pcm_plugin.so</so-name>
</pcm_plugin>
<props>
<playback>1</playback>
<capture>0</capture>
<session_mode>0</session_mode>
</props>
</pcm-device>
<mixer>
<id>1</id>
<name>agm_mixer</name>
<mixer_plugin>
<so-name>libagm_mixer_plugin.so</so-name>
</mixer_plugin>
</mixer>
</card>
</defs>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -8,14 +8,6 @@
PRODUCT_AAPT_CONFIG := normal
PRODUCT_AAPT_PREF_CONFIG := xxxhdpi
# Audio
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/audio/card-defs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/card-defs.xml \
$(LOCAL_PATH)/audio/mixer_paths.xml:$(TARGET_COPY_OUT_ODM)/etc/mixer_paths.xml \
$(LOCAL_PATH)/audio/resourcemanager.xml:$(TARGET_COPY_OUT_ODM)/etc/resourcemanager.xml \
$(LOCAL_PATH)/audio/usecaseKvManager.xml:$(TARGET_COPY_OUT_ODM)/etc/usecaseKvManager.xml \
$(LOCAL_PATH)/audio/usecaseKvManager.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usecaseKvManager.xml
# Boot animation
TARGET_SCREEN_HEIGHT := 2376
TARGET_SCREEN_WIDTH := 1080

View File

@@ -7,6 +7,13 @@ odm/etc/acdbdata/FTM/acdb_cal.acdb
odm/etc/acdbdata/FTM/workspaceFileXml.qwsp
odm/etc/acdbdata/acdb_cal.acdb
# Audio configs
odm/etc/mixer_paths.xml
odm/etc/resourcemanager.xml
odm/etc/usecaseKvManager.xml
vendor/etc/card-defs.xml
vendor/etc/usecaseKvManager.xml
# Audio firmware
odm/firmware/tfa98xx.cnt