diff --git a/Android.bp b/Android.bp index 4ef01df..58c0d85 100644 --- a/Android.bp +++ b/Android.bp @@ -3977,6 +3977,115 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libcodec2_soft_ac4dec", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libcodec2_soft_ac4dec.so", + ], + shared_libs: [ + "libdeccfg", + "libstagefright_foundation", + "libcutils", + "libdmshal", + "server_configurable_flags", + "libaconfig_storage_read_api_cc", + "libbase", + "liblog", + "libcodec2", + "libcodec2_hal_common", + "libcodec2_vndk", + "libutils", + "libcodec2_soft_common", + "libcodec2_store_dolby", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libcodec2_soft_ddpdec", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libcodec2_soft_ddpdec.so", + ], + shared_libs: [ + "libdeccfg", + "libstagefright_foundation", + "libcutils", + "libdmshal", + "server_configurable_flags", + "libaconfig_storage_read_api_cc", + "libbase", + "liblog", + "libcodec2", + "libcodec2_hal_common", + "libcodec2_vndk", + "libutils", + "libcodec2_soft_common", + "libcodec2_store_dolby", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libcodec2_store_dolby", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libcodec2_store_dolby.so", + ], + shared_libs: [ + "libdmabufheap", + "server_configurable_flags", + "libaconfig_storage_read_api_cc", + "libbase", + "liblog", + "libcodec2", + "libcodec2_hal_common", + "libcodec2_vndk", + "libutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libcodec2_vpp_AIMEMC_plugin", owner: "xiaomi", @@ -4864,11 +4973,11 @@ cc_prebuilt_library_shared { "proprietary/vendor/lib64/libdeccfg.so", ], shared_libs: [ - "libhidlbase", - "vendor.dolby.hardware.dms@2.0", + "libdapparamstorage", "libcutils", "libutils", "liblog", + "libdmshal", "libc++", "libc", "libm", @@ -4990,8 +5099,70 @@ cc_prebuilt_library_shared { "libstagefright_foundation-v33", "liblog", "libxml2", + "libcrypto", "libdapparamstorage", "libsqlite", + "libcutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libdlbpreg", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libdlbpreg.so", + ], + shared_libs: [ + "liblog", + "libutils", + "libcutils", + "libaudioutils", + "libstagefright_foundation", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libdmshal", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libdmshal.so", + ], + shared_libs: [ + "libbinder", + "libbinder_ndk", + "libcutils", + "libutils", + "liblog", + "libdapparamstorage", + "vendor.dolby.dms-V1-ndk", "libhidlbase", "vendor.dolby.hardware.dms@2.0", "libc++", @@ -6377,7 +6548,7 @@ cc_prebuilt_library_shared { "vendor.xiaomi.hardware.camera.injection-client", "libbase", "libbinder_ndk", - "libtinyxml2", + "libtinyxml2-v34", "libmicamera_aidl_device", "libmicamera_aidl_utils", "libcom.xiaomi.metadatautils", @@ -9767,6 +9938,35 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libspatializerparamstorage", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libspatializerparamstorage.so", + ], + shared_libs: [ + "libcutils", + "libutils", + "liblog", + "libxml2", + "libdapparamstorage", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libspeech_enh_lib", owner: "xiaomi", @@ -24980,7 +25180,7 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "libswdap", + name: "libdlbvolaidl", owner: "xiaomi", strip: { none: true, @@ -24988,16 +25188,23 @@ cc_prebuilt_library_shared { target: { android_arm64: { srcs: [ - "proprietary/vendor/lib64/soundfx/libswdap.so", + "proprietary/vendor/lib64/soundfx/libdlbvolaidl.so", ], shared_libs: [ + "libstagefright_foundation", + "libdlbpreg", + "android.hardware.audio.effect-V2-ndk", + "android.media.audio.common.types-V3-ndk", + "libaudioaidlcommon", + "libaudioutils", + "libbase", + "libbinder_ndk", + "libcutils", + "libfmq", "liblog", "libutils", - "libcutils", - "libaudioutils", - "libdapparamstorage", - "libhidlbase", - "vendor.dolby.hardware.dms@2.0", + "android.hardware.common-V2-ndk", + "android.hardware.common.fmq-V1-ndk", "libc++", "libc", "libm", @@ -25012,7 +25219,7 @@ cc_prebuilt_library_shared { } cc_prebuilt_library_shared { - name: "vendor.dolby.hardware.dms@2.0-impl", + name: "libswdapaidl", owner: "xiaomi", strip: { none: true, @@ -25020,15 +25227,137 @@ cc_prebuilt_library_shared { target: { android_arm64: { srcs: [ - "proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0-impl.so", + "proprietary/vendor/lib64/soundfx/libswdapaidl.so", ], shared_libs: [ - "libhidlbase", - "libutils", + "android.hardware.audio.effect-V2-ndk", + "android.media.audio.common.types-V3-ndk", + "libaudioaidlcommon", + "libaudioutils", + "libbase", + "libbinder_ndk", + "libcutils", + "libfmq", "liblog", + "libutils", + "android.hardware.common-V2-ndk", + "android.hardware.common.fmq-V1-ndk", + "libaudio_aidl_conversion_common_ndk_prebuilt", + "libstagefright_foundation", "libdapparamstorage", - "libdlbdsservice", - "vendor.dolby.hardware.dms@2.0", + "libdlbpreg", + "libdmshal", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + relative_install_path: "soundfx", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libswgamedapaidl", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/soundfx/libswgamedapaidl.so", + ], + shared_libs: [ + "libdapparamstorage", + "libstagefright_foundation", + "libdlbpreg", + "libdmshal", + "android.hardware.audio.effect-V2-ndk", + "android.media.audio.common.types-V3-ndk", + "libaudioaidlcommon", + "libaudioutils", + "libbase", + "libbinder_ndk", + "libcutils", + "libfmq", + "liblog", + "libutils", + "android.hardware.common-V2-ndk", + "android.hardware.common.fmq-V1-ndk", + "libaudio_aidl_conversion_common_ndk_prebuilt", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + relative_install_path: "soundfx", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libswspatializeraidl", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/soundfx/libswspatializeraidl.so", + ], + shared_libs: [ + "android.hardware.audio.effect-V2-ndk", + "android.media.audio.common.types-V3-ndk", + "libaudioaidlcommon", + "libaudioutils", + "libbase", + "libbinder_ndk", + "libcutils", + "libfmq", + "liblog", + "libutils", + "android.hardware.common-V2-ndk", + "android.hardware.common.fmq-V1-ndk", + "libaudio_aidl_conversion_common_ndk_prebuilt", + "libdapparamstorage", + "libspatializerparamstorage", + "libstagefright_foundation", + "libdlbpreg", + "libdmshal", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + relative_install_path: "soundfx", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "vendor.dolby.dms-V1-ndk", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/vendor.dolby.dms-V1-ndk.so", + ], + shared_libs: [ + "libbinder_ndk", "libc++", "libc", "libm", @@ -32382,7 +32711,7 @@ cc_prebuilt_library_shared { "libhidltransport", "libhidlbase", "libxml2", - "libtinyxml2", + "libtinyxml2-v34", "android.hidl.allocator@1.0", "android.hidl.memory@1.0", "libhidlmemory", @@ -33762,6 +34091,15 @@ prebuilt_etc_xml { soc_specific: true, } +prebuilt_etc_xml { + name: "dms-service.xml", + owner: "xiaomi", + src: "proprietary/vendor/etc/vintf/manifest/dms-service.xml", + filename_from_src: true, + sub_dir: "vintf/manifest", + soc_specific: true, +} + prebuilt_etc_xml { name: "gnss-mtk-default.xml", owner: "xiaomi", @@ -33871,18 +34209,18 @@ prebuilt_etc_xml { } prebuilt_etc_xml { - name: "manifest_vendor.dolby.hardware.dms.xml", + name: "mapper.mediatek.xml", owner: "xiaomi", - src: "proprietary/vendor/etc/vintf/manifest/manifest_vendor.dolby.hardware.dms.xml", + src: "proprietary/vendor/etc/vintf/manifest/mapper.mediatek.xml", filename_from_src: true, sub_dir: "vintf/manifest", soc_specific: true, } prebuilt_etc_xml { - name: "mapper.mediatek.xml", + name: "vendor.dolby.media.c2-default-service-dax.xml", owner: "xiaomi", - src: "proprietary/vendor/etc/vintf/manifest/mapper.mediatek.xml", + src: "proprietary/vendor/etc/vintf/manifest/vendor.dolby.media.c2-default-service-dax.xml", filename_from_src: true, sub_dir: "vintf/manifest", soc_specific: true, @@ -34731,21 +35069,69 @@ cc_prebuilt_binary { } cc_prebuilt_binary { - name: "vendor.dolby.hardware.dms@2.0-service", + name: "vendor.dolby.dms.service", owner: "xiaomi", target: { android_arm64: { srcs: [ - "proprietary/vendor/bin/hw/vendor.dolby.hardware.dms@2.0-service", + "proprietary/vendor/bin/hw/vendor.dolby.dms.service", ], shared_libs: [ "liblog", "libutils", - "libhidlbase", + "libbase", + "libbinder", + "libbinder_ndk", + "vendor.dolby.dms-V1-ndk", "libdapparamstorage", + "libdmshal", "libdlbdsservice", - "vendor.dolby.hardware.dms@2.0", - "vendor.dolby.hardware.dms@2.0-impl", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + strip: { + none: true, + }, + prefer: true, + relative_install_path: "hw", + soc_specific: true, +} + +cc_prebuilt_binary { + name: "vendor.dolby.media.c2-default-service-dax", + owner: "xiaomi", + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/bin/hw/vendor.dolby.media.c2-default-service-dax", + ], + shared_libs: [ + "android.hardware.media.c2-V1-ndk", + "libbinder_ndk", + "libcodec2_aidl", + "server_configurable_flags", + "libaconfig_storage_read_api_cc", + "libbase", + "liblog", + "libcodec2", + "libcodec2_hal_common", + "libutils", + "android.hardware.media.c2@1.0", + "android.hardware.media.c2@1.1", + "android.hardware.media.c2@1.2", + "libcodec2_hidl@1.0", + "libcodec2_hidl@1.1", + "libcodec2_hidl@1.2", + "libcodec2_vndk", + "libhidlbase", + "libavservices_minijail", + "libbinder", + "libcodec2_store_dolby", "libc++", "libc", "libm", diff --git a/proprietary/odm/lib64/libmiXmlParser.so b/proprietary/odm/lib64/libmiXmlParser.so index 298c575..eebd023 100644 Binary files a/proprietary/odm/lib64/libmiXmlParser.so and b/proprietary/odm/lib64/libmiXmlParser.so differ diff --git a/proprietary/vendor/bin/hw/vendor.dolby.dms.service b/proprietary/vendor/bin/hw/vendor.dolby.dms.service new file mode 100755 index 0000000..99240d4 Binary files /dev/null and b/proprietary/vendor/bin/hw/vendor.dolby.dms.service differ diff --git a/proprietary/vendor/bin/hw/vendor.dolby.hardware.dms@2.0-service b/proprietary/vendor/bin/hw/vendor.dolby.hardware.dms@2.0-service deleted file mode 100755 index bd2b853..0000000 Binary files a/proprietary/vendor/bin/hw/vendor.dolby.hardware.dms@2.0-service and /dev/null differ diff --git a/proprietary/vendor/bin/hw/vendor.dolby.media.c2-default-service-dax b/proprietary/vendor/bin/hw/vendor.dolby.media.c2-default-service-dax new file mode 100755 index 0000000..7120847 Binary files /dev/null and b/proprietary/vendor/bin/hw/vendor.dolby.media.c2-default-service-dax differ diff --git a/proprietary/vendor/etc/dolby/dax-fs19xx-spatializer.xml b/proprietary/vendor/etc/dolby/dax-fs19xx-spatializer.xml new file mode 100644 index 0000000..a0e0e2c --- /dev/null +++ b/proprietary/vendor/etc/dolby/dax-fs19xx-spatializer.xml @@ -0,0 +1,1235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/proprietary/vendor/etc/dolby/dax-default.xml b/proprietary/vendor/etc/dolby/dax-fs19xx.xml similarity index 58% rename from proprietary/vendor/etc/dolby/dax-default.xml rename to proprietary/vendor/etc/dolby/dax-fs19xx.xml index 21e36af..7d7b68e 100644 --- a/proprietary/vendor/etc/dolby/dax-default.xml +++ b/proprietary/vendor/etc/dolby/dax-fs19xx.xml @@ -1,34 +1,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -54,7 +28,33 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -317,76 +317,23 @@ - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -395,21 +342,81 @@ + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -423,69 +430,76 @@ + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + - - - - - - - - - - + + - - + + + + + + + + + + - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -494,21 +508,21 @@ + + + + + - - - - - - - + + @@ -522,69 +536,76 @@ + + + + + - - + + - + - + + + + + + + + - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + - + @@ -593,21 +614,21 @@ + + + + + - - - - - - - + + @@ -621,40 +642,46 @@ + + + + + - + - + - + - + + + + + + + + - - - - - - - + - + @@ -663,27 +690,28 @@ + + + + + - - - - - - - + + + - + @@ -692,21 +720,21 @@ + + + + + - - - - - - - + + @@ -720,11 +748,16 @@ + + + + + - + @@ -733,27 +766,28 @@ + + + + + - - - - - - - + + + - + @@ -762,27 +796,28 @@ + + + + + - - - - - - - + + + - + @@ -791,21 +826,21 @@ + + + + + - - - - - - - + + @@ -819,11 +854,16 @@ + + + + + - + @@ -832,27 +872,28 @@ + + + + + - - - - - - - + + + - + @@ -861,27 +902,28 @@ + + + + + - - - - - - - + + + - + @@ -890,21 +932,21 @@ + + + + + - - - - - - - + + @@ -918,11 +960,16 @@ + + + + + - + @@ -931,27 +978,28 @@ + + + + + - - - - - - - + + + - + @@ -960,27 +1008,28 @@ + + + + + - - - - - - - + + + - + @@ -989,21 +1038,21 @@ + + + + + - - - - - - - + + @@ -1017,11 +1066,16 @@ + + + + + - + @@ -1030,27 +1084,28 @@ + + + + + - - - - - - - + + + - + @@ -1059,27 +1114,28 @@ + + + + + - - - - - - - + + + - + @@ -1088,21 +1144,21 @@ + + + + + - - - - - - - + + @@ -1116,69 +1172,76 @@ + + + + + - - + + - + - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + - + @@ -1187,85 +1250,90 @@ + + + + + - - - - - - - + + - + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - + - - + + - + + + + + + @@ -1273,18 +1341,26 @@ - + - + + + + + + + + + @@ -1294,63 +1370,57 @@ - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - + + - - - - + + + + - - - - + + + + - + - - + + @@ -1358,10 +1428,15 @@ + + + + + @@ -1369,18 +1444,26 @@ - + - + + + + + + + + + @@ -1388,14 +1471,420 @@ - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1457,6 +1946,9 @@ + + + @@ -1464,16 +1956,24 @@ - + + + + + + + + + @@ -1483,12 +1983,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1548,6 +2139,9 @@ + + + @@ -1555,16 +2149,24 @@ - + + + + + + + + + @@ -1574,15 +2176,10 @@ - - - - - - - + + diff --git a/proprietary/vendor/etc/init/vendor.dolby.hardware.dms@2.0-service.rc b/proprietary/vendor/etc/init/dms-service.rc similarity index 60% rename from proprietary/vendor/etc/init/vendor.dolby.hardware.dms@2.0-service.rc rename to proprietary/vendor/etc/init/dms-service.rc index 03b7d0d..cc6eaa7 100644 --- a/proprietary/vendor/etc/init/vendor.dolby.hardware.dms@2.0-service.rc +++ b/proprietary/vendor/etc/init/dms-service.rc @@ -1,4 +1,4 @@ -service dms-hal-2-0 /vendor/bin/hw/vendor.dolby.hardware.dms@2.0-service +service dms-hal /vendor/bin/hw/vendor.dolby.dms.service class hal user media group audio media diff --git a/proprietary/vendor/etc/init/vendor.dolby.media.c2-default-service-dax.rc b/proprietary/vendor/etc/init/vendor.dolby.media.c2-default-service-dax.rc new file mode 100644 index 0000000..2f87567 --- /dev/null +++ b/proprietary/vendor/etc/init/vendor.dolby.media.c2-default-service-dax.rc @@ -0,0 +1,7 @@ +service vendor-dolby-media-c2-hal /vendor/bin/hw/vendor.dolby.media.c2-default-service-dax + class hal + user mediacodec + group camera mediadrm drmrpc + ioprio rt 4 + task_profiles ProcessCapacityHigh + diff --git a/proprietary/vendor/etc/media_codecs_dolby_audio.xml b/proprietary/vendor/etc/media_codecs_dolby_audio.xml new file mode 100644 index 0000000..ba4a6c2 --- /dev/null +++ b/proprietary/vendor/etc/media_codecs_dolby_audio.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/proprietary/vendor/etc/vintf/manifest/dms-service.xml b/proprietary/vendor/etc/vintf/manifest/dms-service.xml new file mode 100644 index 0000000..dafe332 --- /dev/null +++ b/proprietary/vendor/etc/vintf/manifest/dms-service.xml @@ -0,0 +1,10 @@ + + + + vendor.dolby.dms + IDms/default + + diff --git a/proprietary/vendor/etc/vintf/manifest/manifest_vendor.dolby.hardware.dms.xml b/proprietary/vendor/etc/vintf/manifest/manifest_vendor.dolby.hardware.dms.xml deleted file mode 100644 index f52fb36..0000000 --- a/proprietary/vendor/etc/vintf/manifest/manifest_vendor.dolby.hardware.dms.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - vendor.dolby.hardware.dms - hwbinder - 2.0 - - IDms - default - - - diff --git a/proprietary/vendor/etc/vintf/manifest/vendor.dolby.media.c2-default-service-dax.xml b/proprietary/vendor/etc/vintf/manifest/vendor.dolby.media.c2-default-service-dax.xml new file mode 100644 index 0000000..67ad6c6 --- /dev/null +++ b/proprietary/vendor/etc/vintf/manifest/vendor.dolby.media.c2-default-service-dax.xml @@ -0,0 +1,10 @@ + + + + android.hardware.media.c2 + IComponentStore/default9 + + diff --git a/proprietary/vendor/lib64/libcodec2_soft_ac4dec.so b/proprietary/vendor/lib64/libcodec2_soft_ac4dec.so new file mode 100644 index 0000000..8baae0a Binary files /dev/null and b/proprietary/vendor/lib64/libcodec2_soft_ac4dec.so differ diff --git a/proprietary/vendor/lib64/libcodec2_soft_ddpdec.so b/proprietary/vendor/lib64/libcodec2_soft_ddpdec.so new file mode 100644 index 0000000..c1cc37b Binary files /dev/null and b/proprietary/vendor/lib64/libcodec2_soft_ddpdec.so differ diff --git a/proprietary/vendor/lib64/libcodec2_store_dolby.so b/proprietary/vendor/lib64/libcodec2_store_dolby.so new file mode 100644 index 0000000..034c787 Binary files /dev/null and b/proprietary/vendor/lib64/libcodec2_store_dolby.so differ diff --git a/proprietary/vendor/lib64/libdapparamstorage.so b/proprietary/vendor/lib64/libdapparamstorage.so index 92a7088..70247ba 100644 Binary files a/proprietary/vendor/lib64/libdapparamstorage.so and b/proprietary/vendor/lib64/libdapparamstorage.so differ diff --git a/proprietary/vendor/lib64/libdeccfg.so b/proprietary/vendor/lib64/libdeccfg.so index 9715bfb..e3c9756 100644 Binary files a/proprietary/vendor/lib64/libdeccfg.so and b/proprietary/vendor/lib64/libdeccfg.so differ diff --git a/proprietary/vendor/lib64/libdlbdsservice.so b/proprietary/vendor/lib64/libdlbdsservice.so index f124bdd..0ff5f20 100644 Binary files a/proprietary/vendor/lib64/libdlbdsservice.so and b/proprietary/vendor/lib64/libdlbdsservice.so differ diff --git a/proprietary/vendor/lib64/libdlbpreg.so b/proprietary/vendor/lib64/libdlbpreg.so new file mode 100644 index 0000000..acc4cda Binary files /dev/null and b/proprietary/vendor/lib64/libdlbpreg.so differ diff --git a/proprietary/vendor/lib64/libdmshal.so b/proprietary/vendor/lib64/libdmshal.so new file mode 100644 index 0000000..9f03f7a Binary files /dev/null and b/proprietary/vendor/lib64/libdmshal.so differ diff --git a/proprietary/vendor/lib64/libmicamera_aidl_provider.so b/proprietary/vendor/lib64/libmicamera_aidl_provider.so index 7875c3d..44ed3cd 100644 Binary files a/proprietary/vendor/lib64/libmicamera_aidl_provider.so and b/proprietary/vendor/lib64/libmicamera_aidl_provider.so differ diff --git a/proprietary/vendor/lib64/libspatializerparamstorage.so b/proprietary/vendor/lib64/libspatializerparamstorage.so new file mode 100644 index 0000000..0ae406b Binary files /dev/null and b/proprietary/vendor/lib64/libspatializerparamstorage.so differ diff --git a/proprietary/vendor/lib64/soundfx/libdlbvolaidl.so b/proprietary/vendor/lib64/soundfx/libdlbvolaidl.so new file mode 100644 index 0000000..21591d0 Binary files /dev/null and b/proprietary/vendor/lib64/soundfx/libdlbvolaidl.so differ diff --git a/proprietary/vendor/lib64/soundfx/libswdap.so b/proprietary/vendor/lib64/soundfx/libswdap.so deleted file mode 100644 index 4872f83..0000000 Binary files a/proprietary/vendor/lib64/soundfx/libswdap.so and /dev/null differ diff --git a/proprietary/vendor/lib64/soundfx/libswdapaidl.so b/proprietary/vendor/lib64/soundfx/libswdapaidl.so new file mode 100644 index 0000000..ad9aa56 Binary files /dev/null and b/proprietary/vendor/lib64/soundfx/libswdapaidl.so differ diff --git a/proprietary/vendor/lib64/soundfx/libswgamedapaidl.so b/proprietary/vendor/lib64/soundfx/libswgamedapaidl.so new file mode 100644 index 0000000..34ad956 Binary files /dev/null and b/proprietary/vendor/lib64/soundfx/libswgamedapaidl.so differ diff --git a/proprietary/vendor/lib64/soundfx/libswspatializeraidl.so b/proprietary/vendor/lib64/soundfx/libswspatializeraidl.so new file mode 100644 index 0000000..2c8d689 Binary files /dev/null and b/proprietary/vendor/lib64/soundfx/libswspatializeraidl.so differ diff --git a/proprietary/vendor/lib64/vendor.dolby.dms-V1-ndk.so b/proprietary/vendor/lib64/vendor.dolby.dms-V1-ndk.so new file mode 100644 index 0000000..98e35e3 Binary files /dev/null and b/proprietary/vendor/lib64/vendor.dolby.dms-V1-ndk.so differ diff --git a/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0-impl.so b/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0-impl.so deleted file mode 100644 index a4584bd..0000000 Binary files a/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0-impl.so and /dev/null differ diff --git a/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0.so b/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0.so index 669c2a7..18e53a8 100644 Binary files a/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0.so and b/proprietary/vendor/lib64/vendor.dolby.hardware.dms@2.0.so differ diff --git a/rodin-vendor.mk b/rodin-vendor.mk index 2fe8aed..7074218 100644 --- a/rodin-vendor.mk +++ b/rodin-vendor.mk @@ -484,7 +484,8 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/rodin/proprietary/vendor/etc/camera/mimotion_f5b.bin:$(TARGET_COPY_OUT_VENDOR)/etc/camera/mimotion_f5b.bin \ vendor/xiaomi/rodin/proprietary/vendor/etc/camera/mimotion_f5w.bin:$(TARGET_COPY_OUT_VENDOR)/etc/camera/mimotion_f5w.bin \ vendor/xiaomi/rodin/proprietary/vendor/etc/camera/mt6899/gma_custom.txt:$(TARGET_COPY_OUT_VENDOR)/etc/camera/mt6899/gma_custom.txt \ - vendor/xiaomi/rodin/proprietary/vendor/etc/dolby/dax-default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/dolby/dax-default.xml \ + vendor/xiaomi/rodin/proprietary/vendor/etc/dolby/dax-fs19xx-spatializer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/dolby/dax-fs19xx-spatializer.xml \ + vendor/xiaomi/rodin/proprietary/vendor/etc/dolby/dax-fs19xx.xml:$(TARGET_COPY_OUT_VENDOR)/etc/dolby/dax-fs19xx.xml \ vendor/xiaomi/rodin/proprietary/vendor/etc/ecc_list.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list.xml \ vendor/xiaomi/rodin/proprietary/vendor/etc/ecc_list_preference.xml:$(TARGET_COPY_OUT_VENDOR)/etc/ecc_list_preference.xml \ vendor/xiaomi/rodin/proprietary/vendor/etc/elliptic_sensor.xml:$(TARGET_COPY_OUT_VENDOR)/etc/elliptic_sensor.xml \ @@ -525,6 +526,7 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/arm.mali.platform-mediatek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/arm.mali.platform-mediatek.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/camerahalserver.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/camerahalserver.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/chipinfo_init.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/chipinfo_init.rc \ + vendor/xiaomi/rodin/proprietary/vendor/etc/init/dms-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/dms-service.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/fuelgauged_init.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/fuelgauged_init.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/fuelgauged_nvram_init.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/fuelgauged_nvram_init.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/gpuserv-default.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/gpuserv-default.rc \ @@ -545,7 +547,7 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/secure_element-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/secure_element-service.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/tee-supplicant.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/tee-supplicant.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/touch_boost.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/touch_boost.rc \ - vendor/xiaomi/rodin/proprietary/vendor/etc/init/vendor.dolby.hardware.dms@2.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.dolby.hardware.dms@2.0-service.rc \ + vendor/xiaomi/rodin/proprietary/vendor/etc/init/vendor.dolby.media.c2-default-service-dax.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.dolby.media.c2-default-service-dax.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/vendor.mediatek.hardware.mmagent-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.mediatek.hardware.mmagent-service.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/vendor.mediatek.hardware.mmlpq@V1-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.mediatek.hardware.mmlpq@V1-service.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/vendor.mediatek.hardware.mms-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.mediatek.hardware.mms-service.rc \ @@ -555,6 +557,7 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/volte_clientapi_ua.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/volte_clientapi_ua.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/wlan_assistant.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/wlan_assistant.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/mali_platform.config:$(TARGET_COPY_OUT_VENDOR)/etc/mali_platform.config \ + vendor/xiaomi/rodin/proprietary/vendor/etc/media_codecs_dolby_audio.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_dolby_audio.xml \ vendor/xiaomi/rodin/proprietary/vendor/etc/mpe.conf:$(TARGET_COPY_OUT_VENDOR)/etc/mpe.conf \ vendor/xiaomi/rodin/proprietary/vendor/etc/nnapi_powerhal.json:$(TARGET_COPY_OUT_VENDOR)/etc/nnapi_powerhal.json \ vendor/xiaomi/rodin/proprietary/vendor/etc/permissions/android.hardware.hardware_keystore.mitee.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.hardware_keystore.mitee.xml \ @@ -830,6 +833,9 @@ PRODUCT_PACKAGES += \ libcodec2_mtk_c2store \ libcodec2_mtk_vdec \ libcodec2_mtk_venc \ + libcodec2_soft_ac4dec \ + libcodec2_soft_ddpdec \ + libcodec2_store_dolby \ libcodec2_vpp_AIMEMC_plugin \ libcodec2_vpp_AISR_plugin \ libcodec2_vpp_fa_plugin \ @@ -861,6 +867,8 @@ PRODUCT_PACKAGES += \ libdisplayfeature \ libdisplayfeatureservice \ libdlbdsservice \ + libdlbpreg \ + libdmshal \ libecoengine \ libfeature.hdr10 \ libfeaturepolicy \ @@ -1021,6 +1029,7 @@ PRODUCT_PACKAGES += \ libsimlock \ libsimmelock \ libsn220u_fw \ + libspatializerparamstorage \ libspeech_enh_lib \ libspeechparser_vendor \ libstorage_otp \ @@ -1455,8 +1464,11 @@ PRODUCT_PACKAGES += \ rodinsc820csultra_mipi_raw_4_tuning \ rodinsc820csultra_mipi_raw_IdxMgr \ rodinsc820csultra_mipi_raw_tuning \ - libswdap \ - vendor.dolby.hardware.dms@2.0-impl \ + libdlbvolaidl \ + libswdapaidl \ + libswgamedapaidl \ + libswspatializeraidl \ + vendor.dolby.dms-V1-ndk \ vendor.dolby.hardware.dms@2.0 \ vendor.mediatek.hardware.apuware.apusys-V5-ndk-vendor \ vendor.mediatek.hardware.apuware.utils-V1-ndk-vendor \ @@ -1757,6 +1769,7 @@ PRODUCT_PACKAGES += \ android.hardware.tetheroffload-V1-service.xml \ arm.mali.platform-mediatek.xml \ bluetooth_audio_mtk.xml \ + dms-service.xml \ gnss-mtk-default.xml \ gnss-mtk.xml \ manifest_allocator.xml \ @@ -1769,8 +1782,8 @@ PRODUCT_PACKAGES += \ manifest_mmlpq.xml \ manifest_mtkgpuserv.xml \ manifest_uievent.xml \ - manifest_vendor.dolby.hardware.dms.xml \ mapper.mediatek.xml \ + vendor.dolby.media.c2-default-service-dax.xml \ vendor.xiaomi.hardware.aidlbgservice-service.xml \ vendor.xiaomi.hardware.displayfeature_aidl-service.xml \ vendor.xiaomi.hardware.dynamiccameraserver.xml \ @@ -1803,7 +1816,8 @@ PRODUCT_PACKAGES += \ camerahalserver \ mtkfusionrild \ tetheroffloadservice \ - vendor.dolby.hardware.dms@2.0-service \ + vendor.dolby.dms.service \ + vendor.dolby.media.c2-default-service-dax \ vendor.mediatek.hardware.gpuserv-service \ vendor.mediatek.hardware.mmagent-service \ vendor.mediatek.hardware.mmlpq@V1-service \