diff --git a/Android.bp b/Android.bp
index bc75907..66ca123 100644
--- a/Android.bp
+++ b/Android.bp
@@ -87,75 +87,6 @@ cc_prebuilt_library_shared {
soc_specific: true,
}
-cc_prebuilt_library_shared {
- name: "audio.primary.s5e8825",
- owner: "samsung",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: [
- "proprietary/vendor/lib64/hw/audio.primary.s5e8825.so",
- ],
- shared_libs: [
- "liblog",
- "libcutils",
- "libprocessgroup",
- "libexpat",
- "libaudioproxy2",
- "libaudio-ril",
- "libsecaudioinfo",
- "libSamsungPostProcessConvertor",
- "librecordalive",
- "libsecaudiolevel",
- "libaboxpcmdump",
- "liblastaboxmsg",
- "libaudioroute.s5e8825",
- "libtinyalsa.s5e8825",
- "libaudioparamupdate",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- relative_install_path: "hw",
- prefer: true,
- soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "audio.sec_primary.default",
- owner: "samsung",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: [
- "proprietary/vendor/lib64/hw/audio.sec_primary.default.so",
- ],
- shared_libs: [
- "liblog",
- "libcutils",
- "libhardware",
- "libspeakercalibration",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- relative_install_path: "hw",
- prefer: true,
- soc_specific: true,
-}
-
cc_prebuilt_library_shared {
name: "gatekeeper.s5e8825",
owner: "samsung",
@@ -370,6 +301,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",
@@ -423,203 +402,6 @@ cc_prebuilt_library_shared {
soc_specific: true,
}
-cc_prebuilt_library_shared {
- name: "libaboxpcmdump",
- owner: "samsung",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: [
- "proprietary/vendor/lib64/libaboxpcmdump.so",
- ],
- shared_libs: [
- "libtinyalsa.s5e8825",
- "libaudioroute.s5e8825",
- "liblog",
- "libcutils",
- "libtinyalsa",
- "libutils",
- "libdatamod",
- "libhardware_legacy",
- "libexpat",
- "libaudioroute",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- prefer: true,
- soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libalsautils_sec",
- owner: "samsung",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: [
- "proprietary/vendor/lib64/libalsautils_sec.so",
- ],
- shared_libs: [
- "liblog",
- "libcutils",
- "libaudioutils",
- "libtinyalsa",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- prefer: true,
- soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libaudio-ril",
- owner: "samsung",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: [
- "proprietary/vendor/lib64/libaudio-ril.so",
- ],
- shared_libs: [
- "libcutils",
- "libutils",
- "liblog",
- "libsecril-client",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- prefer: true,
- soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libaudioparamupdate",
- owner: "samsung",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: [
- "proprietary/vendor/lib64/libaudioparamupdate.so",
- ],
- shared_libs: [
- "libtinyalsa.s5e8825",
- "libaudioroute.s5e8825",
- "liblog",
- "libcutils",
- "libutils",
- "libtinyalsa",
- "libaudioroute",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- prefer: true,
- soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libaudioproxy2",
- owner: "samsung",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: [
- "proprietary/vendor/lib64/libaudioproxy2.so",
- ],
- shared_libs: [
- "libtinyalsa.s5e8825",
- "libaudioroute.s5e8825",
- "liblog",
- "libcutils",
- "libprocessgroup",
- "libexpat",
- "libtinycompress",
- "libaudioutils",
- "libtinyalsa",
- "libaudioroute",
- "libalsautils_sec",
- "libsehbluetooth_audio_session_aidl",
- "vendor.samsung.hardware.bluetooth.audio-V1-ndk",
- "libbinder_ndk",
- "libfmq",
- "libsecaudioinfo",
- "libSamsungPostProcessConvertor",
- "librecordalive",
- "libsecaudiolevel",
- "libaboxpcmdump",
- "liblastaboxmsg",
- "libaudioparamupdate",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- prefer: true,
- soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libaudioroute.s5e8825",
- stem: "libaudioroute.s5e8825",
- owner: "samsung",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: [
- "proprietary/vendor/lib64/libaudioroute.s5e8825.so",
- ],
- shared_libs: [
- "liblog",
- "libcutils",
- "libutils",
- "libexpat",
- "libtinyalsa",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- prefer: true,
- soc_specific: true,
-}
-
cc_prebuilt_library_shared {
name: "libc++_shared",
owner: "samsung",
@@ -736,33 +518,6 @@ cc_prebuilt_library_shared {
soc_specific: true,
}
-cc_prebuilt_library_shared {
- name: "libdatamod",
- owner: "samsung",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: [
- "proprietary/vendor/lib64/libdatamod.so",
- ],
- shared_libs: [
- "liblog",
- "libcutils",
- "libutils",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- prefer: true,
- soc_specific: true,
-}
-
cc_prebuilt_library_shared {
name: "libdove_compiler",
owner: "samsung",
@@ -1661,33 +1416,6 @@ cc_prebuilt_library_shared {
soc_specific: true,
}
-cc_prebuilt_library_shared {
- name: "liblastaboxmsg",
- owner: "samsung",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: [
- "proprietary/vendor/lib64/liblastaboxmsg.so",
- ],
- shared_libs: [
- "liblog",
- "libcutils",
- "libutils",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- prefer: true,
- soc_specific: true,
-}
-
cc_prebuilt_library_shared {
name: "libnpu_compiler",
owner: "samsung",
@@ -2209,34 +1937,6 @@ cc_prebuilt_library_shared {
soc_specific: true,
}
-cc_prebuilt_library_shared {
- name: "libsecaudiolevel",
- owner: "samsung",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: [
- "proprietary/vendor/lib64/libsecaudiolevel.so",
- ],
- shared_libs: [
- "libcutils",
- "libutils",
- "liblog",
- "libsecaudioinfo",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- prefer: true,
- soc_specific: true,
-}
-
cc_prebuilt_library_shared {
name: "libsecnativefeature",
owner: "samsung",
@@ -2291,36 +1991,6 @@ cc_prebuilt_library_shared {
soc_specific: true,
}
-cc_prebuilt_library_shared {
- name: "libsehbluetooth_audio_session_aidl",
- owner: "samsung",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: [
- "proprietary/vendor/lib64/libsehbluetooth_audio_session_aidl.so",
- ],
- shared_libs: [
- "libbase",
- "libcutils",
- "libbinder_ndk",
- "libfmq",
- "liblog",
- "vendor.samsung.hardware.bluetooth.audio-V1-ndk",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- prefer: true,
- soc_specific: true,
-}
-
cc_prebuilt_library_shared {
name: "libsemnativecarrierfeature",
owner: "samsung",
@@ -2489,34 +2159,6 @@ cc_prebuilt_library_shared {
soc_specific: true,
}
-cc_prebuilt_library_shared {
- name: "libspeakercalibration",
- owner: "samsung",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: [
- "proprietary/vendor/lib64/libspeakercalibration.so",
- ],
- shared_libs: [
- "liblog",
- "libcutils",
- "libutils",
- "libc",
- "libmedia_helper",
- "libc++",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- prefer: true,
- soc_specific: true,
-}
-
cc_prebuilt_library_shared {
name: "libswcnr",
owner: "samsung",
@@ -2591,31 +2233,6 @@ cc_prebuilt_library_shared {
soc_specific: true,
}
-cc_prebuilt_library_shared {
- name: "libtinyalsa.s5e8825",
- stem: "libtinyalsa.s5e8825",
- owner: "samsung",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: [
- "proprietary/vendor/lib64/libtinyalsa.s5e8825.so",
- ],
- shared_libs: [
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- prefer: true,
- soc_specific: true,
-}
-
cc_prebuilt_library_shared {
name: "libtoco_graphgen_export",
owner: "samsung",
@@ -2936,6 +2553,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",
@@ -2968,59 +2645,6 @@ cc_prebuilt_library_shared {
soc_specific: true,
}
-cc_prebuilt_library_shared {
- name: "vendor.samsung.hardware.audio-V1-ndk",
- owner: "samsung",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: [
- "proprietary/vendor/lib64/vendor.samsung.hardware.audio-V1-ndk.so",
- ],
- shared_libs: [
- "libbinder_ndk",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- prefer: true,
- soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "vendor.samsung.hardware.bluetooth.audio-V1-ndk",
- owner: "samsung",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: [
- "proprietary/vendor/lib64/vendor.samsung.hardware.bluetooth.audio-V1-ndk.so",
- ],
- shared_libs: [
- "libbinder_ndk",
- "android.hardware.common-V2-ndk",
- "android.hardware.common.fmq-V1-ndk",
- "android.hardware.audio.common-V1-ndk",
- "libc++",
- "libc",
- "libm",
- "libdl",
- ],
- },
- },
- compile_multilib: "64",
- prefer: true,
- soc_specific: true,
-}
-
cc_prebuilt_library_shared {
name: "vendor.samsung.hardware.gnss@2.0",
owner: "samsung",
diff --git a/proprietary/vendor/etc/SoundBoosterParam.txt b/proprietary/vendor/etc/SoundBoosterParam.txt
deleted file mode 100644
index edeea63..0000000
--- a/proprietary/vendor/etc/SoundBoosterParam.txt
+++ /dev/null
@@ -1,193 +0,0 @@
-S,1,2,0,1,1,1,1,1,2,1,3,0,1,-1,-1,1,-29,0,200,400,500,1000,0,0,1,3,4,5,0,200,400,500,1000,0,0,0,1,3,5,0,200,400,500,1000,0,0,1,3,4,5,0,200,400,500,1000,0,0,1,3,4,5,0,200,400,500,1000,3,3,4,4,4,5,0,200,400,500,1000,1,2,2,3,3,5,-1,0,5000,0,-1,5000,5000,0,-1
-AF,1,20,15,1,0,8,11,19,13,-16,-14,-13,-21,-10,-14,-14,-18,20,20,20,20,20,20,20,20,120,120,120,120,120,120,120,120,0,0,0,1,4,-6,10,150,0
-AFH,1,150,0
-AFA,1,1,220,250,5,1,704,200,-9,1,3700,500,-11,1,6000,3000,4,1,1500,400,4,1,11200,3000,-4,1,3200,400,-6,1,1300,400,-3,1,4400,1200,-3,1,350,200,-1
-AL,1,2,8,6,0,0,2,3,2,3,4,3,3,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-ALH,1,150,0
-ALA,1,1,220,250,5,1,704,200,-7,1,3700,500,-11,1,6000,3000,4,1,1500,400,4,1,11200,3000,-4,1,3200,400,-6,1,1300,400,-3,1,4400,1200,-3,1,350,200,-3
-AHA,1,100,0
-AHB,1,100,0
-AHC,1,120,0
-AHD,1,140,0
-AHE,1,150,0
-
-AMA,0,1,5,10,9,1,0,2,3,2,6,8,7,7,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-AMB,1,1,5,10,9,1,0,2,3,2,6,8,7,7,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-AMC,2,1,4,9,8,0,0,2,3,2,5,6,5,5,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-AMD,3,1,3,8,7,0,0,2,3,2,4,5,4,4,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-AME,4,1,2,8,6,0,0,2,3,2,3,4,3,3,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-
-APA,0,1,5,10,9,1,0,2,3,2,6,8,7,7,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-2,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-APB,1,1,5,10,9,1,0,2,3,2,6,8,7,7,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-2,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-APC,2,1,4,9,8,0,0,2,3,2,5,6,5,5,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-4,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-APD,3,1,3,8,7,0,0,2,3,2,4,5,4,4,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-5,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-APE,4,1,2,8,6,0,0,2,3,2,3,4,3,3,-10,-11,-14,-21,-21,-12,-9,-9,-8,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-
-AVA,0,1,3,9,10,3,4,6,7,4,7,7,5,5,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,9,0,1,3,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-AVB,1,1,3,8,8,3,4,6,7,4,7,7,5,5,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,9,0,1,3,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-AVC,2,1,2,7,7,2,4,6,7,4,6,5,3,3,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,9,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-AVD,3,1,1,6,6,2,4,6,7,4,5,4,2,2,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,9,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-AVE,4,1,0,6,5,2,4,6,7,4,4,3,1,1,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,9,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-
-AAA,1,1,220,250,5,1,704,200,-7,1,3700,500,-8,1,6000,3000,8,1,1500,400,4,1,11200,3000,-1,1,3200,400,-3,1,1300,400,-3,1,4400,1200,0,1,350,200,-3
-AAB,1,1,220,250,5,1,704,200,-7,1,3700,500,-8,1,6000,3000,8,1,1500,400,4,1,11200,3000,-1,1,3200,400,-3,1,1300,400,-3,1,4400,1200,0,1,350,200,-3
-AAC,1,1,220,250,5,1,704,200,-7,1,3700,500,-9,1,6000,3000,7,1,1500,400,4,1,11200,3000,-2,1,3200,400,-4,1,1300,400,-3,1,4400,1200,-1,1,350,200,-3
-AAD,1,1,220,250,5,1,704,200,-7,1,3700,500,-10,1,6000,3000,5,1,1500,400,4,1,11200,3000,-3,1,3200,400,-5,1,1300,400,-3,1,4400,1200,-2,1,350,200,-3
-AAE,1,1,220,250,5,1,704,200,-7,1,3700,500,-11,1,6000,3000,4,1,1500,400,4,1,11200,3000,-4,1,3200,400,-6,1,1300,400,-3,1,4400,1200,-3,1,350,200,-3
-
-ABA,1,1,220,250,5,1,704,200,-7,1,3700,500,-8,1,6000,3000,8,1,1500,400,4,1,11200,3000,-1,1,3200,400,-3,1,1300,400,-3,1,4400,1200,0,1,350,200,-3
-ABB,1,1,220,250,5,1,704,200,-7,1,3700,500,-8,1,6000,3000,8,1,1500,400,4,1,11200,3000,-1,1,3200,400,-3,1,1300,400,-3,1,4400,1200,0,1,350,200,-3
-ABC,1,1,220,250,5,1,704,200,-7,1,3700,500,-9,1,6000,3000,7,1,1500,400,4,1,11200,3000,-2,1,3200,400,-4,1,1300,400,-3,1,4400,1200,-1,1,350,200,-3
-ABD,1,1,220,250,5,1,704,200,-7,1,3700,500,-10,1,6000,3000,5,1,1500,400,4,1,11200,3000,-3,1,3200,400,-5,1,1300,400,-3,1,4400,1200,-2,1,350,200,-3
-ABE,1,1,220,250,5,1,704,200,-7,1,3700,500,-11,1,6000,3000,4,1,1500,400,4,1,11200,3000,-4,1,3200,400,-6,1,1300,400,-3,1,4400,1200,-3,1,350,200,-3
-
-ACA,1,1,220,250,5,1,704,200,-7,1,3700,500,-8,1,6000,3000,8,1,1500,400,4,1,11200,3000,-1,1,3200,400,-3,1,1300,400,-3,1,4400,1200,0,1,350,200,-3
-ACB,1,1,220,250,5,1,704,200,-7,1,3700,500,-8,1,6000,3000,8,1,1500,400,4,1,11200,3000,-1,1,3200,400,-3,1,1300,400,-3,1,4400,1200,0,1,350,200,-3
-ACC,1,1,220,250,5,1,704,200,-7,1,3700,500,-9,1,6000,3000,7,1,1500,400,4,1,11200,3000,-2,1,3200,400,-4,1,1300,400,-3,1,4400,1200,-1,1,350,200,-3
-ACD,1,1,220,250,5,1,704,200,-7,1,3700,500,-10,1,6000,3000,5,1,1500,400,4,1,11200,3000,-3,1,3200,400,-5,1,1300,400,-3,1,4400,1200,-2,1,350,200,-3
-ACE,1,1,220,250,5,1,704,200,-7,1,3700,500,-11,1,6000,3000,4,1,1500,400,4,1,11200,3000,-4,1,3200,400,-6,1,1300,400,-3,1,4400,1200,-3,1,350,200,-3
-
-BF,1,20,15,1,0,8,11,19,13,-16,-14,-13,-21,-10,-14,-14,-18,20,20,20,20,20,20,20,20,120,120,120,120,120,120,120,120,0,0,0,1,4,-6,10,150,0
-BFH,1,150,0
-BFA,1,1,220,250,5,1,704,200,-9,1,3700,500,-11,1,6000,3000,4,1,1500,400,4,1,11200,3000,-4,1,3200,400,-6,1,1300,400,-3,1,4400,1200,-3,1,350,200,-1
-BL,1,2,8,6,0,0,2,3,2,3,4,3,3,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-BLH,1,150,0
-BLA,1,1,220,250,5,1,704,200,-7,1,3700,500,-11,1,6000,3000,4,1,1500,400,4,1,11200,3000,-4,1,3200,400,-6,1,1300,400,-3,1,4400,1200,-3,1,350,200,-3
-BHA,1,100,0
-BHB,1,100,0
-BHC,1,120,0
-BHD,1,140,0
-BHE,1,150,0
-
-BMA,0,1,5,10,9,1,0,2,3,2,6,8,7,7,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-BMB,1,1,5,10,9,1,0,2,3,2,6,8,7,7,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-BMC,2,1,4,9,8,0,0,2,3,2,5,6,5,5,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-BMD,3,1,3,8,7,0,0,2,3,2,4,5,4,4,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-BME,4,1,2,8,6,0,0,2,3,2,3,4,3,3,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-
-BPA,0,1,5,10,9,1,0,2,3,2,6,8,7,7,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-2,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-BPB,1,1,5,10,9,1,0,2,3,2,6,8,7,7,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-2,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-BPC,2,1,4,9,8,0,0,2,3,2,5,6,5,5,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-4,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-BPD,3,1,3,8,7,0,0,2,3,2,4,5,4,4,-10,-8,-9,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-5,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-BPE,4,1,2,8,6,0,0,2,3,2,3,4,3,3,-10,-11,-14,-21,-21,-12,-9,-9,-8,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,8,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-
-BVA,0,1,3,9,10,3,4,6,7,4,7,7,5,5,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,9,0,1,3,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-BVB,1,1,3,8,8,3,4,6,7,4,7,7,5,5,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,9,0,1,3,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-BVC,2,1,2,7,7,2,4,6,7,4,6,5,3,3,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,9,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-BVD,3,1,1,6,6,2,4,6,7,4,5,4,2,2,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,9,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-BVE,4,1,0,6,5,2,4,6,7,4,4,3,1,1,-9,-7,-8,-16,-17,-8,-8,-13,-10,-7,-11,-13,10,10,10,10,10,25,25,25,25,25,25,25,150,150,150,150,150,150,150,150,150,150,150,150,9,0,1,2,-6,10,150,0,230,230,120,120,2,0,4,0,2,0,4,0,-10,-20,25,150,-1,300
-
-BAA,1,1,220,250,5,1,704,200,-7,1,3700,500,-8,1,6000,3000,8,1,1500,400,4,1,11200,3000,-1,1,3200,400,-3,1,1300,400,-3,1,4400,1200,0,1,350,200,-3
-BAB,1,1,220,250,5,1,704,200,-7,1,3700,500,-8,1,6000,3000,8,1,1500,400,4,1,11200,3000,-1,1,3200,400,-3,1,1300,400,-3,1,4400,1200,0,1,350,200,-3
-BAC,1,1,220,250,5,1,704,200,-7,1,3700,500,-9,1,6000,3000,7,1,1500,400,4,1,11200,3000,-2,1,3200,400,-4,1,1300,400,-3,1,4400,1200,-1,1,350,200,-3
-BAD,1,1,220,250,5,1,704,200,-7,1,3700,500,-10,1,6000,3000,5,1,1500,400,4,1,11200,3000,-3,1,3200,400,-5,1,1300,400,-3,1,4400,1200,-2,1,350,200,-3
-BAE,1,1,220,250,5,1,704,200,-7,1,3700,500,-11,1,6000,3000,4,1,1500,400,4,1,11200,3000,-4,1,3200,400,-6,1,1300,400,-3,1,4400,1200,-3,1,350,200,-3
-
-BBA,1,1,220,250,5,1,704,200,-7,1,3700,500,-8,1,6000,3000,8,1,1500,400,4,1,11200,3000,-1,1,3200,400,-3,1,1300,400,-3,1,4400,1200,0,1,350,200,-3
-BBB,1,1,220,250,5,1,704,200,-7,1,3700,500,-8,1,6000,3000,8,1,1500,400,4,1,11200,3000,-1,1,3200,400,-3,1,1300,400,-3,1,4400,1200,0,1,350,200,-3
-BBC,1,1,220,250,5,1,704,200,-7,1,3700,500,-9,1,6000,3000,7,1,1500,400,4,1,11200,3000,-2,1,3200,400,-4,1,1300,400,-3,1,4400,1200,-1,1,350,200,-3
-BBD,1,1,220,250,5,1,704,200,-7,1,3700,500,-10,1,6000,3000,5,1,1500,400,4,1,11200,3000,-3,1,3200,400,-5,1,1300,400,-3,1,4400,1200,-2,1,350,200,-3
-BBE,1,1,220,250,5,1,704,200,-7,1,3700,500,-11,1,6000,3000,4,1,1500,400,4,1,11200,3000,-4,1,3200,400,-6,1,1300,400,-3,1,4400,1200,-3,1,350,200,-3
-
-BCA,1,1,220,250,5,1,704,200,-7,1,3700,500,-8,1,6000,3000,8,1,1500,400,4,1,11200,3000,-1,1,3200,400,-3,1,1300,400,-3,1,4400,1200,0,1,350,200,-3
-BCB,1,1,220,250,5,1,704,200,-7,1,3700,500,-8,1,6000,3000,8,1,1500,400,4,1,11200,3000,-1,1,3200,400,-3,1,1300,400,-3,1,4400,1200,0,1,350,200,-3
-BCC,1,1,220,250,5,1,704,200,-7,1,3700,500,-9,1,6000,3000,7,1,1500,400,4,1,11200,3000,-2,1,3200,400,-4,1,1300,400,-3,1,4400,1200,-1,1,350,200,-3
-BCD,1,1,220,250,5,1,704,200,-7,1,3700,500,-10,1,6000,3000,5,1,1500,400,4,1,11200,3000,-3,1,3200,400,-5,1,1300,400,-3,1,4400,1200,-2,1,350,200,-3
-BCE,1,1,220,250,5,1,704,200,-7,1,3700,500,-11,1,6000,3000,4,1,1500,400,4,1,11200,3000,-4,1,3200,400,-6,1,1300,400,-3,1,4400,1200,-3,1,350,200,-3
-
-CF,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
-CFH,1,50,0
-CFA,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0
-CL,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-CLH,1,50,0
-CLA,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0
-CHA,1,50,0
-CHB,1,50,0
-CHC,1,50,0
-CHD,1,50,0
-CHE,1,50,0
-
-CMA,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-CMB,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-CMC,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-CMD,3,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-CME,4,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-
-CPA,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-CPB,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-CPC,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-CPD,3,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-CPE,4,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-
-CVA,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-CVB,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-CVC,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-CVD,3,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-CVE,4,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-
-CAA,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-CAB,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-CAC,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-CAD,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-CAE,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-
-CBA,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-CBB,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-CBC,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-CBD,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-CBE,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-
-CCA,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-CCB,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-CCC,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-CCD,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-CCE,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-
-DF,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0
-DFH,1,50,0
-DFA,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0
-DL,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-DLH,1,50,0
-DLA,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0,0,800,1,0
-DHA,1,50,0
-DHB,1,50,0
-DHC,1,50,0
-DHD,1,50,0
-DHE,1,50,0
-
-DMA,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-DMB,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-DMC,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-DMD,3,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-DME,4,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-
-DPA,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-DPB,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-DPC,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-DPD,3,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-DPE,4,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-
-DVA,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-DVB,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-DVC,2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-DVD,3,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-DVE,4,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100
-
-DAA,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-DAB,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-DAC,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-DAD,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-DAE,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-
-DBA,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-DBB,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-DBC,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-DBD,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-DBE,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-
-DCA,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-DCB,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-DCC,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-DCD,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-DCE,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0,0,800,200,0
-
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/etc/sec_audio_volume_curve.xml b/proprietary/vendor/etc/sec_audio_volume_curve.xml
deleted file mode 100644
index de27b76..0000000
--- a/proprietary/vendor/etc/sec_audio_volume_curve.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/proprietary/vendor/lib64/hw/audio.primary.s5e8825.so b/proprietary/vendor/lib64/hw/audio.primary.s5e8825.so
deleted file mode 100644
index bb34d0e..0000000
Binary files a/proprietary/vendor/lib64/hw/audio.primary.s5e8825.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/hw/audio.sec_primary.default.so b/proprietary/vendor/lib64/hw/audio.sec_primary.default.so
deleted file mode 100644
index 9a18b02..0000000
Binary files a/proprietary/vendor/lib64/hw/audio.sec_primary.default.so and /dev/null differ
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/libaboxpcmdump.so b/proprietary/vendor/lib64/libaboxpcmdump.so
deleted file mode 100644
index 44dac2d..0000000
Binary files a/proprietary/vendor/lib64/libaboxpcmdump.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libalsautils_sec.so b/proprietary/vendor/lib64/libalsautils_sec.so
deleted file mode 100644
index 6bccaec..0000000
Binary files a/proprietary/vendor/lib64/libalsautils_sec.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libaudio-ril.so b/proprietary/vendor/lib64/libaudio-ril.so
deleted file mode 100644
index b4a9ccb..0000000
Binary files a/proprietary/vendor/lib64/libaudio-ril.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libaudioparamupdate.so b/proprietary/vendor/lib64/libaudioparamupdate.so
deleted file mode 100644
index d9251ba..0000000
Binary files a/proprietary/vendor/lib64/libaudioparamupdate.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libaudioproxy2.so b/proprietary/vendor/lib64/libaudioproxy2.so
deleted file mode 100644
index 484d428..0000000
Binary files a/proprietary/vendor/lib64/libaudioproxy2.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libaudioroute.s5e8825.so b/proprietary/vendor/lib64/libaudioroute.s5e8825.so
deleted file mode 100644
index 66937bd..0000000
Binary files a/proprietary/vendor/lib64/libaudioroute.s5e8825.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libdatamod.so b/proprietary/vendor/lib64/libdatamod.so
deleted file mode 100644
index 19ea4c6..0000000
Binary files a/proprietary/vendor/lib64/libdatamod.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libfloatingfeature.so b/proprietary/vendor/lib64/libfloatingfeature.so
index 9cd6d5f..c7c4761 100644
Binary files a/proprietary/vendor/lib64/libfloatingfeature.so and b/proprietary/vendor/lib64/libfloatingfeature.so differ
diff --git a/proprietary/vendor/lib64/liblastaboxmsg.so b/proprietary/vendor/lib64/liblastaboxmsg.so
deleted file mode 100644
index 5f3fc2e..0000000
Binary files a/proprietary/vendor/lib64/liblastaboxmsg.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libsecaudiocoreutils.so b/proprietary/vendor/lib64/libsecaudiocoreutils.so
index 55219cd..9ec51e3 100644
Binary files a/proprietary/vendor/lib64/libsecaudiocoreutils.so and b/proprietary/vendor/lib64/libsecaudiocoreutils.so differ
diff --git a/proprietary/vendor/lib64/libsecaudioinfo.so b/proprietary/vendor/lib64/libsecaudioinfo.so
index 8b206c7..c447451 100644
Binary files a/proprietary/vendor/lib64/libsecaudioinfo.so and b/proprietary/vendor/lib64/libsecaudioinfo.so differ
diff --git a/proprietary/vendor/lib64/libsecaudiolevel.so b/proprietary/vendor/lib64/libsecaudiolevel.so
deleted file mode 100644
index 19ae6c1..0000000
Binary files a/proprietary/vendor/lib64/libsecaudiolevel.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libsecnativefeature.so b/proprietary/vendor/lib64/libsecnativefeature.so
index 31d1e48..6d15443 100644
Binary files a/proprietary/vendor/lib64/libsecnativefeature.so and b/proprietary/vendor/lib64/libsecnativefeature.so differ
diff --git a/proprietary/vendor/lib64/libsehbluetooth_audio_session_aidl.so b/proprietary/vendor/lib64/libsehbluetooth_audio_session_aidl.so
deleted file mode 100644
index 0104845..0000000
Binary files a/proprietary/vendor/lib64/libsehbluetooth_audio_session_aidl.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libspeakercalibration.so b/proprietary/vendor/lib64/libspeakercalibration.so
deleted file mode 100644
index dd5b801..0000000
Binary files a/proprietary/vendor/lib64/libspeakercalibration.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/libtinyalsa.s5e8825.so b/proprietary/vendor/lib64/libtinyalsa.s5e8825.so
deleted file mode 100644
index 6adb36b..0000000
Binary files a/proprietary/vendor/lib64/libtinyalsa.s5e8825.so and /dev/null 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/proprietary/vendor/lib64/vendor.samsung.hardware.audio-V1-ndk.so b/proprietary/vendor/lib64/vendor.samsung.hardware.audio-V1-ndk.so
deleted file mode 100644
index 69212f4..0000000
Binary files a/proprietary/vendor/lib64/vendor.samsung.hardware.audio-V1-ndk.so and /dev/null differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.bluetooth.audio-V1-ndk.so b/proprietary/vendor/lib64/vendor.samsung.hardware.bluetooth.audio-V1-ndk.so
deleted file mode 100644
index cdf8023..0000000
Binary files a/proprietary/vendor/lib64/vendor.samsung.hardware.bluetooth.audio-V1-ndk.so and /dev/null differ
diff --git a/s5e8825-common-vendor.mk b/s5e8825-common-vendor.mk
index 81fee2e..16475ac 100644
--- a/s5e8825-common-vendor.mk
+++ b/s5e8825-common-vendor.mk
@@ -6,7 +6,7 @@ PRODUCT_SOONG_NAMESPACES += \
vendor/samsung/s5e8825-common
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 \
@@ -39,7 +39,6 @@ PRODUCT_COPY_FILES += \
vendor/samsung/s5e8825-common/proprietary/vendor/etc/plmn_delta_chn.bin:$(TARGET_COPY_OUT_VENDOR)/etc/plmn_delta_chn.bin \
vendor/samsung/s5e8825-common/proprietary/vendor/etc/plmn_delta_hktw.bin:$(TARGET_COPY_OUT_VENDOR)/etc/plmn_delta_hktw.bin \
vendor/samsung/s5e8825-common/proprietary/vendor/etc/plmn_se13_prebuilt.bin:$(TARGET_COPY_OUT_VENDOR)/etc/plmn_se13_prebuilt.bin \
- vendor/samsung/s5e8825-common/proprietary/vendor/etc/sec_audio_volume_curve.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sec_audio_volume_curve.xml \
vendor/samsung/s5e8825-common/proprietary/vendor/etc/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf \
vendor/samsung/s5e8825-common/proprietary/vendor/firmware/APSV_AUDIO_SLSI.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/APSV_AUDIO_SLSI.bin \
vendor/samsung/s5e8825-common/proprietary/vendor/firmware/OD_V2.1.6_01_26_QVGA.nnc:$(TARGET_COPY_OUT_VENDOR)/firmware/OD_V2.1.6_01_26_QVGA.nnc \
@@ -59,8 +58,6 @@ PRODUCT_COPY_FILES += \
PRODUCT_PACKAGES += \
libGLES_mali \
android.hardware.gnss@2.1-impl \
- audio.primary.s5e8825 \
- audio.sec_primary.default \
gatekeeper.s5e8825 \
vendor.samsung.hardware.gnss@2.1-impl \
vulkan.mali \
@@ -69,20 +66,15 @@ PRODUCT_PACKAGES += \
libVendorSemDataProps \
libVendorSemTelephonyProps \
lib_SamsungRec_07010 \
+ lib_SoundAlive_3DPosition_ver202 \
+ lib_SoundAlive_AlbumArt_ver105 \
lib_SoundAlive_SRC384_ver320 \
lib_soundaliveresampler \
- libaboxpcmdump \
- libalsautils_sec \
- libaudio-ril \
- libaudioparamupdate \
- libaudioproxy2 \
- libaudioroute.s5e8825 \
libc++_shared \
libcommon \
libcommon_graphgen_export \
libcrane_compiler \
libcrypto-tm \
- libdatamod \
libdove_compiler \
libeden_model \
libeden_nn \
@@ -114,7 +106,6 @@ PRODUCT_PACKAGES += \
libgraphgen_network \
libhwjsqz \
libir \
- liblastaboxmsg \
libnpu_compiler \
libnpuc_api \
libnpuc_backend \
@@ -133,20 +124,16 @@ PRODUCT_PACKAGES += \
libsec-ril \
libsecaudiocoreutils \
libsecaudioinfo \
- libsecaudiolevel \
libsecnativefeature \
libsecril-client \
- libsehbluetooth_audio_session_aidl \
libsemnativecarrierfeature \
libsensorlistener \
libskeymint10device \
libskeymint_cli \
libspatializerparamstorage \
- libspeakercalibration \
libswcnr \
libsynaFpSensorTestNwd \
libteecl \
- libtinyalsa.s5e8825 \
libtoco_graphgen_export \
libuniapi \
libuniplugin \
@@ -158,9 +145,9 @@ PRODUCT_PACKAGES += \
sensors.grip \
sensors.inputvirtual \
sensors.sensorhub \
+ libaudioeffectoffload \
+ libmyspace \
libswdap \
- vendor.samsung.hardware.audio-V1-ndk \
- vendor.samsung.hardware.bluetooth.audio-V1-ndk \
vendor.samsung.hardware.gnss@2.0 \
vendor.samsung.hardware.gnss@2.1 \
vendor.samsung.hardware.keymint-V1-ndk_platform \