diff --git a/audio/caiman/audio-tables.mk b/audio/caiman/audio-tables.mk
index ca162008..8bbc7800 100644
--- a/audio/caiman/audio-tables.mk
+++ b/audio/caiman/audio-tables.mk
@@ -41,35 +41,33 @@ SPK_FIRMWARE_FULL_PATH := device/google/caimito/audio/$(SPK_FIRMWARE_PATH)
PRODUCT_COPY_FILES += $(call copy-files,$(wildcard $(SPK_FIRMWARE_FULL_PATH)/*),$(TARGET_COPY_OUT_VENDOR)/firmware)
# Audio tuning
-PRODUCT_COPY_FILES += \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/recording.gatf:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/recording.gatf \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/BLUETOOTH.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.dat \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.dat \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSET.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSET.dat \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HEADSET.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HEADSET.dat \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/mcps.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/mcps.dat \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_config.ini:$(TARGET_COPY_OUT_VENDOR)/etc/waves_config.ini \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/waves_preset.mps
+PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning
+PRODUCT_PACKAGES += \
+ recording.gatf \
+ BLUETOOTH.dat \
+ HANDSFREE.dat \
+ HANDSET.dat \
+ HEADSET.dat \
+ mcps.dat \
+ waves_config.ini \
+ waves_preset.mps \
+ compens_spk_l.conf \
+ compens_spk_r.conf
+
+# userdebug and eng specific
+PRODUCT_PACKAGES_DEBUG += \
+ BLUETOOTH.mods \
+ HANDSFREE.mods \
+ HANDSET.mods \
+ HEADSET.mods \
+ template.xml \
+ tuning_constraints_combination.xml \
+ test_config.ini \
+ test_preset.mps
-# userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_COPY_FILES += \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/BLUETOOTH.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.mods \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.mods \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSET.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSET.mods \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HEADSET.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HEADSET.mods
-
-#Bluenote files
-PRODUCT_COPY_FILES += \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/template.xml:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/template.xml \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/tuning_constraints_combination.xml:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/tuning_constraints_combination.xml
-
# Mixer Path Configuration for Audio Speaker Calibration Tool crus_sp_cal
PRODUCT_COPY_FILES += \
device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml
-PRODUCT_COPY_FILES += \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_config.ini:$(TARGET_COPY_OUT_VENDOR)/etc/test_config.ini \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/test_preset.mps
-
endif
diff --git a/audio/caiman/config/audio_platform_configuration.xml b/audio/caiman/config/audio_platform_configuration.xml
index febcf7be..f4265afe 100644
--- a/audio/caiman/config/audio_platform_configuration.xml
+++ b/audio/caiman/config/audio_platform_configuration.xml
@@ -304,5 +304,6 @@
+
diff --git a/audio/caiman/tuning/Android.bp b/audio/caiman/tuning/Android.bp
new file mode 100644
index 00000000..94ceea8f
--- /dev/null
+++ b/audio/caiman/tuning/Android.bp
@@ -0,0 +1,125 @@
+//
+// 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.
+
+soong_namespace {}
+
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "device_google_caimito_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["device_google_caimito_license"],
+}
+
+prebuilt_defaults {
+ name: "aoc_defaults",
+ soc_specific: true,
+ sub_dir: "aoc",
+}
+
+prebuilt_etc {
+ name: "recording.gatf",
+ src: "bluenote/recording.gatf",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "template.xml",
+ src: "bluenote/template.xml",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "tuning_constraints_combination.xml",
+ src: "bluenote/tuning_constraints_combination.xml",
+ defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+ name: "compens_spk_l.conf",
+ src: "compensation/compens_spk_l.conf",
+ soc_specific: true,
+}
+prebuilt_etc {
+ name: "compens_spk_r.conf",
+ src: "compensation/compens_spk_r.conf",
+ soc_specific: true,
+}
+
+prebuilt_etc {
+ name: "BLUETOOTH.dat",
+ src: "fortemedia/BLUETOOTH.dat",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "BLUETOOTH.mods",
+ src: "fortemedia/BLUETOOTH.mods",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "HANDSFREE.dat",
+ src: "fortemedia/HANDSFREE.dat",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "HANDSFREE.mods",
+ src: "fortemedia/HANDSFREE.mods",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "HANDSET.dat",
+ src: "fortemedia/HANDSET.dat",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "HANDSET.mods",
+ src: "fortemedia/HANDSET.mods",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "HEADSET.dat",
+ src: "fortemedia/HEADSET.dat",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "HEADSET.mods",
+ src: "fortemedia/HEADSET.mods",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "mcps.dat",
+ src: "fortemedia/mcps.dat",
+ defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+ name: "waves_config.ini",
+ src: "waves/waves_config.ini",
+ soc_specific: true,
+}
+prebuilt_etc {
+ name: "waves_preset.mps",
+ src: "waves/waves_preset.mps",
+ soc_specific: true,
+}
+prebuilt_etc {
+ name: "test_config.ini",
+ src: "waves/tests/test_config.ini",
+ soc_specific: true,
+}
+prebuilt_etc {
+ name: "test_preset.mps",
+ src: "waves/tests/test_preset.mps",
+ soc_specific: true,
+}
diff --git a/audio/caiman/tuning/compensation/compens_spk_l.conf b/audio/caiman/tuning/compensation/compens_spk_l.conf
new file mode 100644
index 00000000..648e8364
--- /dev/null
+++ b/audio/caiman/tuning/compensation/compens_spk_l.conf
@@ -0,0 +1,257 @@
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000,
\ No newline at end of file
diff --git a/audio/caiman/tuning/compensation/compens_spk_r.conf b/audio/caiman/tuning/compensation/compens_spk_r.conf
new file mode 100644
index 00000000..648e8364
--- /dev/null
+++ b/audio/caiman/tuning/compensation/compens_spk_r.conf
@@ -0,0 +1,257 @@
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000,
\ No newline at end of file
diff --git a/audio/komodo/audio-tables.mk b/audio/komodo/audio-tables.mk
index 8f00fd93..3fac8d2a 100644
--- a/audio/komodo/audio-tables.mk
+++ b/audio/komodo/audio-tables.mk
@@ -41,35 +41,33 @@ SPK_FIRMWARE_FULL_PATH := device/google/caimito/audio/$(SPK_FIRMWARE_PATH)
PRODUCT_COPY_FILES += $(call copy-files,$(wildcard $(SPK_FIRMWARE_FULL_PATH)/*),$(TARGET_COPY_OUT_VENDOR)/firmware)
# Audio tuning
-PRODUCT_COPY_FILES += \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/recording.gatf:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/recording.gatf \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/BLUETOOTH.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.dat \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.dat \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSET.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSET.dat \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HEADSET.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HEADSET.dat \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/mcps.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/mcps.dat \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_config.ini:$(TARGET_COPY_OUT_VENDOR)/etc/waves_config.ini \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/waves_preset.mps
+PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning
+PRODUCT_PACKAGES += \
+ recording.gatf \
+ BLUETOOTH.dat \
+ HANDSFREE.dat \
+ HANDSET.dat \
+ HEADSET.dat \
+ mcps.dat \
+ waves_config.ini \
+ waves_preset.mps \
+ compens_spk_l.conf \
+ compens_spk_r.conf
+
+# userdebug and eng specific
+PRODUCT_PACKAGES_DEBUG += \
+ BLUETOOTH.mods \
+ HANDSFREE.mods \
+ HANDSET.mods \
+ HEADSET.mods \
+ template.xml \
+ tuning_constraints_combination.xml \
+ test_config.ini \
+ test_preset.mps
-# userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_COPY_FILES += \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/BLUETOOTH.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.mods \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.mods \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSET.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSET.mods \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HEADSET.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HEADSET.mods
-
-#Bluenote files
-PRODUCT_COPY_FILES += \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/template.xml:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/template.xml \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/tuning_constraints_combination.xml:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/tuning_constraints_combination.xml
-
# Mixer Path Configuration for Audio Speaker Calibration Tool crus_sp_cal
PRODUCT_COPY_FILES += \
device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml
-PRODUCT_COPY_FILES += \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_config.ini:$(TARGET_COPY_OUT_VENDOR)/etc/test_config.ini \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/test_preset.mps
-
endif
diff --git a/audio/komodo/config/audio_platform_configuration.xml b/audio/komodo/config/audio_platform_configuration.xml
index febcf7be..f4265afe 100644
--- a/audio/komodo/config/audio_platform_configuration.xml
+++ b/audio/komodo/config/audio_platform_configuration.xml
@@ -304,5 +304,6 @@
+
diff --git a/audio/komodo/tuning/Android.bp b/audio/komodo/tuning/Android.bp
new file mode 100644
index 00000000..94ceea8f
--- /dev/null
+++ b/audio/komodo/tuning/Android.bp
@@ -0,0 +1,125 @@
+//
+// 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.
+
+soong_namespace {}
+
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "device_google_caimito_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["device_google_caimito_license"],
+}
+
+prebuilt_defaults {
+ name: "aoc_defaults",
+ soc_specific: true,
+ sub_dir: "aoc",
+}
+
+prebuilt_etc {
+ name: "recording.gatf",
+ src: "bluenote/recording.gatf",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "template.xml",
+ src: "bluenote/template.xml",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "tuning_constraints_combination.xml",
+ src: "bluenote/tuning_constraints_combination.xml",
+ defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+ name: "compens_spk_l.conf",
+ src: "compensation/compens_spk_l.conf",
+ soc_specific: true,
+}
+prebuilt_etc {
+ name: "compens_spk_r.conf",
+ src: "compensation/compens_spk_r.conf",
+ soc_specific: true,
+}
+
+prebuilt_etc {
+ name: "BLUETOOTH.dat",
+ src: "fortemedia/BLUETOOTH.dat",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "BLUETOOTH.mods",
+ src: "fortemedia/BLUETOOTH.mods",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "HANDSFREE.dat",
+ src: "fortemedia/HANDSFREE.dat",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "HANDSFREE.mods",
+ src: "fortemedia/HANDSFREE.mods",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "HANDSET.dat",
+ src: "fortemedia/HANDSET.dat",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "HANDSET.mods",
+ src: "fortemedia/HANDSET.mods",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "HEADSET.dat",
+ src: "fortemedia/HEADSET.dat",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "HEADSET.mods",
+ src: "fortemedia/HEADSET.mods",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "mcps.dat",
+ src: "fortemedia/mcps.dat",
+ defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+ name: "waves_config.ini",
+ src: "waves/waves_config.ini",
+ soc_specific: true,
+}
+prebuilt_etc {
+ name: "waves_preset.mps",
+ src: "waves/waves_preset.mps",
+ soc_specific: true,
+}
+prebuilt_etc {
+ name: "test_config.ini",
+ src: "waves/tests/test_config.ini",
+ soc_specific: true,
+}
+prebuilt_etc {
+ name: "test_preset.mps",
+ src: "waves/tests/test_preset.mps",
+ soc_specific: true,
+}
diff --git a/audio/komodo/tuning/compensation/compens_spk_l.conf b/audio/komodo/tuning/compensation/compens_spk_l.conf
new file mode 100644
index 00000000..648e8364
--- /dev/null
+++ b/audio/komodo/tuning/compensation/compens_spk_l.conf
@@ -0,0 +1,257 @@
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000,
\ No newline at end of file
diff --git a/audio/komodo/tuning/compensation/compens_spk_r.conf b/audio/komodo/tuning/compensation/compens_spk_r.conf
new file mode 100644
index 00000000..648e8364
--- /dev/null
+++ b/audio/komodo/tuning/compensation/compens_spk_r.conf
@@ -0,0 +1,257 @@
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000,
\ No newline at end of file
diff --git a/audio/tokay/audio-tables.mk b/audio/tokay/audio-tables.mk
index 6e1773a8..59167f98 100644
--- a/audio/tokay/audio-tables.mk
+++ b/audio/tokay/audio-tables.mk
@@ -41,35 +41,33 @@ SPK_FIRMWARE_FULL_PATH := device/google/caimito/audio/$(SPK_FIRMWARE_PATH)
PRODUCT_COPY_FILES += $(call copy-files,$(wildcard $(SPK_FIRMWARE_FULL_PATH)/*),$(TARGET_COPY_OUT_VENDOR)/firmware)
# Audio tuning
-PRODUCT_COPY_FILES += \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/recording.gatf:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/recording.gatf \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/BLUETOOTH.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.dat \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.dat \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSET.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSET.dat \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HEADSET.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HEADSET.dat \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/mcps.dat:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/mcps.dat \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_config.ini:$(TARGET_COPY_OUT_VENDOR)/etc/waves_config.ini \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/waves_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/waves_preset.mps
+PRODUCT_SOONG_NAMESPACES += device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning
+PRODUCT_PACKAGES += \
+ recording.gatf \
+ BLUETOOTH.dat \
+ HANDSFREE.dat \
+ HANDSET.dat \
+ HEADSET.dat \
+ mcps.dat \
+ waves_config.ini \
+ waves_preset.mps \
+ compens_spk_l.conf \
+ compens_spk_r.conf
+
+# userdebug and eng specific
+PRODUCT_PACKAGES_DEBUG += \
+ BLUETOOTH.mods \
+ HANDSFREE.mods \
+ HANDSET.mods \
+ HEADSET.mods \
+ template.xml \
+ tuning_constraints_combination.xml \
+ test_config.ini \
+ test_preset.mps
-# userdebug specific
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
-PRODUCT_COPY_FILES += \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/BLUETOOTH.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/BLUETOOTH.mods \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSFREE.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSFREE.mods \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HANDSET.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HANDSET.mods \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/fortemedia/HEADSET.mods:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/HEADSET.mods
-
-#Bluenote files
-PRODUCT_COPY_FILES += \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/template.xml:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/template.xml \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/bluenote/tuning_constraints_combination.xml:$(TARGET_COPY_OUT_VENDOR)/etc/aoc/tuning_constraints_combination.xml
-
# Mixer Path Configuration for Audio Speaker Calibration Tool crus_sp_cal
PRODUCT_COPY_FILES += \
device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml
-PRODUCT_COPY_FILES += \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_config.ini:$(TARGET_COPY_OUT_VENDOR)/etc/test_config.ini \
- device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/test_preset.mps
-
endif
diff --git a/audio/tokay/config/audio_platform_configuration.xml b/audio/tokay/config/audio_platform_configuration.xml
index febcf7be..f4265afe 100644
--- a/audio/tokay/config/audio_platform_configuration.xml
+++ b/audio/tokay/config/audio_platform_configuration.xml
@@ -304,5 +304,6 @@
+
diff --git a/audio/tokay/tuning/Android.bp b/audio/tokay/tuning/Android.bp
new file mode 100644
index 00000000..94ceea8f
--- /dev/null
+++ b/audio/tokay/tuning/Android.bp
@@ -0,0 +1,125 @@
+//
+// 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.
+
+soong_namespace {}
+
+package {
+ // See: http://go/android-license-faq
+ // A large-scale-change added 'default_applicable_licenses' to import
+ // all of the 'license_kinds' from "device_google_caimito_license"
+ // to get the below license kinds:
+ // SPDX-license-identifier-Apache-2.0
+ default_applicable_licenses: ["device_google_caimito_license"],
+}
+
+prebuilt_defaults {
+ name: "aoc_defaults",
+ soc_specific: true,
+ sub_dir: "aoc",
+}
+
+prebuilt_etc {
+ name: "recording.gatf",
+ src: "bluenote/recording.gatf",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "template.xml",
+ src: "bluenote/template.xml",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "tuning_constraints_combination.xml",
+ src: "bluenote/tuning_constraints_combination.xml",
+ defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+ name: "compens_spk_l.conf",
+ src: "compensation/compens_spk_l.conf",
+ soc_specific: true,
+}
+prebuilt_etc {
+ name: "compens_spk_r.conf",
+ src: "compensation/compens_spk_r.conf",
+ soc_specific: true,
+}
+
+prebuilt_etc {
+ name: "BLUETOOTH.dat",
+ src: "fortemedia/BLUETOOTH.dat",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "BLUETOOTH.mods",
+ src: "fortemedia/BLUETOOTH.mods",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "HANDSFREE.dat",
+ src: "fortemedia/HANDSFREE.dat",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "HANDSFREE.mods",
+ src: "fortemedia/HANDSFREE.mods",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "HANDSET.dat",
+ src: "fortemedia/HANDSET.dat",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "HANDSET.mods",
+ src: "fortemedia/HANDSET.mods",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "HEADSET.dat",
+ src: "fortemedia/HEADSET.dat",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "HEADSET.mods",
+ src: "fortemedia/HEADSET.mods",
+ defaults: ["aoc_defaults"],
+}
+prebuilt_etc {
+ name: "mcps.dat",
+ src: "fortemedia/mcps.dat",
+ defaults: ["aoc_defaults"],
+}
+
+prebuilt_etc {
+ name: "waves_config.ini",
+ src: "waves/waves_config.ini",
+ soc_specific: true,
+}
+prebuilt_etc {
+ name: "waves_preset.mps",
+ src: "waves/waves_preset.mps",
+ soc_specific: true,
+}
+prebuilt_etc {
+ name: "test_config.ini",
+ src: "waves/tests/test_config.ini",
+ soc_specific: true,
+}
+prebuilt_etc {
+ name: "test_preset.mps",
+ src: "waves/tests/test_preset.mps",
+ soc_specific: true,
+}
diff --git a/audio/tokay/tuning/compensation/compens_spk_l.conf b/audio/tokay/tuning/compensation/compens_spk_l.conf
new file mode 100644
index 00000000..648e8364
--- /dev/null
+++ b/audio/tokay/tuning/compensation/compens_spk_l.conf
@@ -0,0 +1,257 @@
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000,
\ No newline at end of file
diff --git a/audio/tokay/tuning/compensation/compens_spk_r.conf b/audio/tokay/tuning/compensation/compens_spk_r.conf
new file mode 100644
index 00000000..648e8364
--- /dev/null
+++ b/audio/tokay/tuning/compensation/compens_spk_r.conf
@@ -0,0 +1,257 @@
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000
+1.000000000000000,0.000000000000000,
\ No newline at end of file