Partially reapply "s5e8825-common: Switch to OSS Audio"

Restored SoundAlive bits.

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",

proprietary/vendor/etc/audio_board_info.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Built-In Microphone Characteristic.
+     It should be modified based on real target board's conf -->
+<audio_board_info>
+    <microphone_characteristics>
+        <microphone device_id="builtin_mic1"
+                    id="0"
+                    device="AUDIO_DEVICE_IN_BUILTIN_MIC"
+                    address="bottom"
+                    location="AUDIO_MICROPHONE_LOCATION_MAINBODY"
+                    group="0"
+                    index_in_the_group="0"
+                    sensitivity="-37.0"
+                    max_spl="132.5"
+                    min_spl="28.5"
+                    directionality="AUDIO_MICROPHONE_DIRECTIONALITY_OMNI"
+                    num_frequency_responses="93"
+                    frequencies="97.16 102.92 109.02 115.48 122.32 129.57 137.25 145.38 153.99 163.12 172.78 183.02 193.87 205.35 217.52 230.41 244.06 258.52 273.84 290.07 307.26 325.46 344.75 365.17 386.81 409.73 434.01 459.73 486.97 515.82 546.39 578.76 613.06 649.38 687.86 728.62 771.79 817.52 865.96 917.28 971.63 1029.20 1090.18 1154.78 1223.21 1295.69 1372.46 1453.78 1539.93 1631.17 1727.83 1830.21 1938.65 2053.53 2175.20 2304.09 2440.62 2585.23 2738.42 2900.68 3072.56 3254.62 3447.47 3651.74 3868.12 4097.32 4340.10 4597.27 4869.68 5158.22 5463.87 5787.62 6130.56 6493.82 6878.60 7286.18 7717.92 8175.23 8659.64 9172.76 9716.28 10292.01 10901.84 11547.82 12232.07 12956.87 13724.61 14537.84 15399.27 16311.73 17278.26 18302.06 19386.53"
+                    responses="-0.40 -0.40 -0.60 -0.70 -0.40 -0.40 -0.30 -0.30 -0.30 -0.30 -0.20 -0.60 -0.90 -0.90 -1.00 -0.70 -0.80 -0.70 -0.70 -0.90 -0.70 -0.20 0.60 1.40 1.70 0.80 -0.80 -2.10 -2.30 -1.70 -0.90 0.50 1.30 1.20 0.80 0.10 0.20 0.40 2.30 2.40 0.00 -0.40 -0.10 0.70 -0.40 1.00 0.50 1.40 2.40 2.00 2.50 2.70 1.70 1.40 1.70 -1.90 -3.60 1.70 2.30 0.00 0.80 -0.30 0.60 1.90 1.40 -1.90 0.30 1.70 -0.60 0.40 2.20 3.60 -4.20 2.50 3.60 8.10 -4.30 5.70 7.30 9.60 7.80 10.20 16.40 18.60 20.10 22.50 23.50 17.60 17.90 18.80 17.70 15.10 14.70"
+                    geometric_location="0.0513 0.0 0.0038"
+                    orientation="0.0 -1.0 0.0"
+        />
+        <microphone device_id="builtin_mic2"
+                    id="0"
+                    device="AUDIO_DEVICE_IN_BACK_MIC"
+                    address="back"
+                    location="AUDIO_MICROPHONE_LOCATION_MAINBODY"
+                    group="0"
+                    index_in_the_group="0"
+                    sensitivity="-37.0"
+                    max_spl="132.5"
+                    min_spl="28.5"
+                    directionality="AUDIO_MICROPHONE_DIRECTIONALITY_OMNI"
+                    num_frequency_responses="93"
+                    frequencies="97.16 102.92 109.02 115.48 122.32 129.57 137.25 145.38 153.99 163.12 172.78 183.02 193.87 205.35 217.52 230.41 244.06 258.52 273.84 290.07 307.26 325.46 344.75 365.17 386.81 409.73 434.01 459.73 486.97 515.82 546.39 578.76 613.06 649.38 687.86 728.62 771.79 817.52 865.96 917.28 971.63 1029.20 1090.18 1154.78 1223.21 1295.69 1372.46 1453.78 1539.93 1631.17 1727.83 1830.21 1938.65 2053.53 2175.20 2304.09 2440.62 2585.23 2738.42 2900.68 3072.56 3254.62 3447.47 3651.74 3868.12 4097.32 4340.10 4597.27 4869.68 5158.22 5463.87 5787.62 6130.56 6493.82 6878.60 7286.18 7717.92 8175.23 8659.64 9172.76 9716.28 10292.01 10901.84 11547.82 12232.07 12956.87 13724.61 14537.84 15399.27 16311.73 17278.26 18302.06 19386.53"
+                    responses="-0.40 -0.40 -0.60 -0.70 -0.40 -0.40 -0.30 -0.30 -0.30 -0.30 -0.20 -0.60 -0.90 -0.90 -1.00 -0.70 -0.80 -0.70 -0.70 -0.90 -0.70 -0.20 0.60 1.40 1.70 0.80 -0.80 -2.10 -2.30 -1.70 -0.90 0.50 1.30 1.20 0.80 0.10 0.20 0.40 2.30 2.40 0.00 -0.40 -0.10 0.70 -0.40 1.00 0.50 1.40 2.40 2.00 2.50 2.70 1.70 1.40 1.70 -1.90 -3.60 1.70 2.30 0.00 0.80 -0.30 0.60 1.90 1.40 -1.90 0.30 1.70 -0.60 0.40 2.20 3.60 -4.20 2.50 3.60 8.10 -4.30 5.70 7.30 9.60 7.80 10.20 16.40 18.60 20.10 22.50 23.50 17.60 17.90 18.80 17.70 15.10 14.70"
+                    geometric_location="0.0513 0.0 0.0038"
+                    orientation="0.0 -1.0 0.0"
+        />
+    </microphone_characteristics>
+</audio_board_info>

proprietary/vendor/etc/mixer_usb_default.xml

@@ -9,19 +9,28 @@
     </path>
 
     <path name="media-speaker-usb-headset-gain">
-		<ctl name="Headset Playback Volume" value="63 63" />
+        <ctl name="Headset Playback Volume" value="69 69" />
     </path>
 
     <path name="media-speaker-bottom-usb-headset-gain">
         <ctl name="Headset Playback Volume" value="69 69" />
     </path>
 
+    <!-- FM Radio paths -->
+    <path name="fm_radio-usb-headset-gain">
+        <ctl name="Headset Playback Volume" value="112 112" />
+    </path>
+
     <!-- USBFM Radio paths -->
     <path name="usbfm_radio-usb-headset-gain">
         <ctl name="Headset Playback Volume" value="112 112" />
     </path>
 
     <!-- Remote MIC playback paths -->
+    <path name="remote_mic-comp-usb-headset-gain">
+        <ctl name="Headset Playback Volume" value="112 112" />
+    </path>
+
     <path name="remote_mic-usb-headset-gain">
         <ctl name="Headset Playback Volume" value="112 112" />
     </path>

proprietary/vendor/etc/mixer_usb_gray.xml

@@ -9,19 +9,28 @@
     </path>
 
     <path name="media-speaker-usb-headset-gain">
-		<ctl name="Headset Playback Volume" value="46 46" />
+        <ctl name="Headset Playback Volume" value="56 56" />
     </path>
 
     <path name="media-speaker-bottom-usb-headset-gain">
         <ctl name="Headset Playback Volume" value="56 56" />
     </path>
 
+    <!-- FM Radio paths -->
+    <path name="fm_radio-usb-headset-gain">
+        <ctl name="Headset Playback Volume" value="101 101" />
+    </path>
+
     <!-- USBFM Radio paths -->
     <path name="usbfm_radio-usb-headset-gain">
         <ctl name="Headset Playback Volume" value="101 101" />
     </path>
 
     <!-- Remote MIC playback paths -->
+    <path name="remote_mic-comp-usb-headset-gain">
+        <ctl name="Headset Playback Volume" value="101 101" />
+    </path>
+
     <path name="remote_mic-usb-headset-gain">
         <ctl name="Headset Playback Volume" value="101 101" />
     </path>

proprietary/vendor/etc/mixer_usb_white.xml

@@ -16,12 +16,21 @@
         <ctl name="Headset Playback Volume" value="62 62" />
     </path>
 
+    <!-- FM Radio paths -->
+    <path name="fm_radio-usb-headset-gain">
+        <ctl name="Headset Playback Volume" value="102 102" />
+    </path>
+
     <!-- USBFM Radio paths -->
     <path name="usbfm_radio-usb-headset-gain">
         <ctl name="Headset Playback Volume" value="102 102" />
     </path>
 
     <!-- Remote MIC playback paths -->
+    <path name="remote_mic-comp-usb-headset-gain">
+        <ctl name="Headset Playback Volume" value="102 102" />
+    </path>
+
     <path name="remote_mic-usb-headset-gain">
         <ctl name="Headset Playback Volume" value="102 102" />
     </path>

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 \