diff --git a/Android.bp b/Android.bp
index f9a2c39..2cbaf96 100644
--- a/Android.bp
+++ b/Android.bp
@@ -370,6 +370,54 @@ cc_prebuilt_library_shared {
soc_specific: true,
}
+cc_prebuilt_library_shared {
+ name: "lib_SoundAlive_3DPosition_ver202",
+ owner: "samsung",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/vendor/lib64/lib_SoundAlive_3DPosition_ver202.so",
+ ],
+ shared_libs: [
+ "libc",
+ "libm",
+ "libdl",
+ "liblog",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ prefer: true,
+ soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "lib_SoundAlive_AlbumArt_ver105",
+ owner: "samsung",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/vendor/lib64/lib_SoundAlive_AlbumArt_ver105.so",
+ ],
+ shared_libs: [
+ "libc",
+ "libm",
+ "libdl",
+ "liblog",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ prefer: true,
+ soc_specific: true,
+}
+
cc_prebuilt_library_shared {
name: "lib_SoundAlive_SRC384_ver320",
owner: "samsung",
@@ -1914,6 +1962,66 @@ cc_prebuilt_library_shared {
soc_specific: true,
}
+cc_prebuilt_library_shared {
+ name: "libaudioeffectoffload",
+ owner: "samsung",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/vendor/lib64/soundfx/libaudioeffectoffload.so",
+ ],
+ shared_libs: [
+ "libcutils",
+ "libutils",
+ "liblog",
+ "libtinyalsa",
+ "libsecaudioinfo",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ relative_install_path: "soundfx",
+ prefer: true,
+ soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libmyspace",
+ owner: "samsung",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: [
+ "proprietary/vendor/lib64/soundfx/libmyspace.so",
+ ],
+ shared_libs: [
+ "libutils",
+ "libcutils",
+ "lib_SoundAlive_3DPosition_ver202",
+ "liblog",
+ "libaudioutils",
+ "libc++",
+ "libc",
+ "libm",
+ "libdl",
+ ],
+ },
+ },
+ compile_multilib: "64",
+ relative_install_path: "soundfx",
+ prefer: true,
+ soc_specific: true,
+}
+
cc_prebuilt_library_shared {
name: "libswdap",
owner: "samsung",
diff --git a/proprietary/vendor/etc/audio_board_info.xml b/proprietary/vendor/etc/audio_board_info.xml
new file mode 100644
index 0000000..f964b90
--- /dev/null
+++ b/proprietary/vendor/etc/audio_board_info.xml
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+
+
diff --git a/proprietary/vendor/etc/mixer_usb_default.xml b/proprietary/vendor/etc/mixer_usb_default.xml
index a57f954..3ab766d 100644
--- a/proprietary/vendor/etc/mixer_usb_default.xml
+++ b/proprietary/vendor/etc/mixer_usb_default.xml
@@ -1,333 +1,342 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/proprietary/vendor/etc/mixer_usb_gray.xml b/proprietary/vendor/etc/mixer_usb_gray.xml
index a35d205..7c7bdb0 100644
--- a/proprietary/vendor/etc/mixer_usb_gray.xml
+++ b/proprietary/vendor/etc/mixer_usb_gray.xml
@@ -1,333 +1,342 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/proprietary/vendor/etc/mixer_usb_white.xml b/proprietary/vendor/etc/mixer_usb_white.xml
index 8d210fc..5c53a7c 100644
--- a/proprietary/vendor/etc/mixer_usb_white.xml
+++ b/proprietary/vendor/etc/mixer_usb_white.xml
@@ -1,333 +1,342 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/proprietary/vendor/lib64/lib_SoundAlive_3DPosition_ver202.so b/proprietary/vendor/lib64/lib_SoundAlive_3DPosition_ver202.so
new file mode 100644
index 0000000..6416e50
Binary files /dev/null and b/proprietary/vendor/lib64/lib_SoundAlive_3DPosition_ver202.so differ
diff --git a/proprietary/vendor/lib64/lib_SoundAlive_AlbumArt_ver105.so b/proprietary/vendor/lib64/lib_SoundAlive_AlbumArt_ver105.so
new file mode 100644
index 0000000..4c40014
Binary files /dev/null and b/proprietary/vendor/lib64/lib_SoundAlive_AlbumArt_ver105.so differ
diff --git a/proprietary/vendor/lib64/soundfx/libaudioeffectoffload.so b/proprietary/vendor/lib64/soundfx/libaudioeffectoffload.so
new file mode 100644
index 0000000..1e181d7
Binary files /dev/null and b/proprietary/vendor/lib64/soundfx/libaudioeffectoffload.so differ
diff --git a/proprietary/vendor/lib64/soundfx/libmyspace.so b/proprietary/vendor/lib64/soundfx/libmyspace.so
new file mode 100644
index 0000000..4dc2009
Binary files /dev/null and b/proprietary/vendor/lib64/soundfx/libmyspace.so differ
diff --git a/s5e8825-common-vendor.mk b/s5e8825-common-vendor.mk
index df99827..01b84aa 100644
--- a/s5e8825-common-vendor.mk
+++ b/s5e8825-common-vendor.mk
@@ -7,6 +7,7 @@ PRODUCT_SOONG_NAMESPACES += \
PRODUCT_COPY_FILES += \
vendor/samsung/s5e8825-common/proprietary/vendor/etc/SoundBoosterParam.txt:$(TARGET_COPY_OUT_VENDOR)/etc/SoundBoosterParam.txt \
+ vendor/samsung/s5e8825-common/proprietary/vendor/etc/audio_board_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_board_info.xml \
vendor/samsung/s5e8825-common/proprietary/vendor/etc/dolby/dax-default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/dolby/dax-default.xml \
vendor/samsung/s5e8825-common/proprietary/vendor/etc/dqe/DQE_coef_data.xml:$(TARGET_COPY_OUT_VENDOR)/etc/dqe/DQE_coef_data.xml \
vendor/samsung/s5e8825-common/proprietary/vendor/etc/dqe/calib_data_atc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/dqe/calib_data_atc.xml \
@@ -68,6 +69,8 @@ PRODUCT_PACKAGES += \
libVendorSemDataProps \
libVendorSemTelephonyProps \
lib_SamsungRec_07010 \
+ lib_SoundAlive_3DPosition_ver202 \
+ lib_SoundAlive_AlbumArt_ver105 \
lib_SoundAlive_SRC384_ver320 \
lib_soundaliveresampler \
libaboxpcmdump \
@@ -121,6 +124,8 @@ PRODUCT_PACKAGES += \
sensors.grip \
sensors.inputvirtual \
sensors.sensorhub \
+ libaudioeffectoffload \
+ libmyspace \
libswdap \
vendor.samsung.hardware.audio-V1-ndk \
vendor.samsung.hardware.bluetooth.audio-V1-ndk \