diff --git a/Android.bp b/Android.bp index 513815b..99f9709 100644 --- a/Android.bp +++ b/Android.bp @@ -216,6 +216,188 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "c2.dolby.client", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/c2.dolby.client.so", + ], + shared_libs: [ + "android.hardware.media.c2-V1-ndk", + "libbinder_ndk", + "libcodec2_aidl_prebuilt", + "libstagefright_aidl_bufferpool2", + "server_configurable_flags", + "libaconfig_storage_read_api_cc", + "libbase", + "liblog", + "libcodec2", + "libcodec2_hal_common", + "libcodec2_vndk", + "libutils", + "android.hardware.media.c2@1.0", + "libcodec2_hidl@1.0", + "libhidlbase", + "libcutils", + "libstagefright_bufferpool@2.0.1", + "libnativewindow", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "c2.dolby.hevc.dec", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/c2.dolby.hevc.dec.so", + ], + shared_libs: [ + "libdolbyottcameracontrol", + "libsensorndkbridge", + "android.hardware.media.c2-V1-ndk", + "libbinder_ndk", + "libcodec2_aidl_prebuilt", + "libstagefright_aidl_bufferpool2", + "server_configurable_flags", + "libaconfig_storage_read_api_cc", + "libcodec2_hal_common", + "android.hardware.media.c2@1.0", + "libcodec2_hidl@1.0", + "libcodec2_soft_common", + "libcutils", + "libsfplugin_ccodec_utils", + "libstagefright_foundation", + "libbase", + "liblog", + "libcodec2", + "libcodec2_vndk", + "libutils", + "libEGL", + "libGLESv3", + "c2.dolby.store", + "c2.dolby.client", + "libstagefright_bufferpool@2.0.1", + "libdolbydecoderprocessor", + "libui", + "libhidlbase", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "c2.dolby.hevc.sec.dec", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/c2.dolby.hevc.sec.dec.so", + ], + shared_libs: [ + "libdolbyottcameracontrol", + "libsensorndkbridge", + "android.hardware.media.c2-V1-ndk", + "libbinder_ndk", + "libcodec2_aidl_prebuilt", + "libstagefright_aidl_bufferpool2", + "server_configurable_flags", + "libaconfig_storage_read_api_cc", + "libcodec2_hal_common", + "android.hardware.media.c2@1.0", + "libcodec2_hidl@1.0", + "libcodec2_soft_common", + "libcutils", + "libsfplugin_ccodec_utils", + "libstagefright_foundation", + "libbase", + "liblog", + "libcodec2", + "libcodec2_vndk", + "libutils", + "libEGL", + "libGLESv3", + "c2.dolby.store", + "c2.dolby.client", + "libstagefright_bufferpool@2.0.1", + "libdolbydecoderprocessor", + "libui", + "libhidlbase", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "c2.dolby.store", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/c2.dolby.store.so", + ], + shared_libs: [ + "server_configurable_flags", + "libaconfig_storage_read_api_cc", + "libbase", + "libcodec2", + "libcodec2_hal_common", + "libcodec2_vndk", + "libutils", + "android.hardware.media.c2@1.0", + "libcodec2_hidl@1.0", + "liblog", + "libcutils", + "libdmabufheap", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "com.xiaomi.camdfx", owner: "xiaomi", @@ -4087,6 +4269,49 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libcodec2_aidl_prebuilt", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libcodec2_aidl_prebuilt.so", + ], + shared_libs: [ + "server_configurable_flags", + "libaconfig_storage_read_api_cc", + "android.hardware.common-V2-ndk", + "android.hardware.media.bufferpool2-V2-ndk", + "android.hardware.media.c2-V1-ndk", + "libbase", + "libbinder_ndk", + "libcodec2", + "libcodec2_hal_common", + "libcodec2_vndk", + "libcutils", + "libhidlbase", + "liblog", + "libnativewindow", + "libstagefright_aidl_bufferpool2", + "libstagefright_bufferpool@2.0.1", + "libui", + "libutils", + "libcodec2_hidl_plugin", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libcodec2_fsr", owner: "xiaomi", @@ -4182,7 +4407,7 @@ cc_prebuilt_library_shared { shared_libs: [ "android.hardware.media.c2-V1-ndk", "libbinder_ndk", - "libcodec2_aidl", + "libcodec2_aidl_prebuilt", "server_configurable_flags", "libaconfig_storage_read_api_cc", "android.hardware.media.c2@1.0", @@ -4253,7 +4478,7 @@ cc_prebuilt_library_shared { shared_libs: [ "android.hardware.media.c2-V1-ndk", "libbinder_ndk", - "libcodec2_aidl", + "libcodec2_aidl_prebuilt", "server_configurable_flags", "libaconfig_storage_read_api_cc", "android.hardware.media.c2@1.0", @@ -5541,6 +5766,100 @@ cc_prebuilt_library_shared { soc_specific: true, } +cc_prebuilt_library_shared { + name: "libdolbydecoderprocessor", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libdolbydecoderprocessor.so", + ], + shared_libs: [ + "liblog", + "libEGL", + "libGLESv2", + "libui", + "libutils", + "libstagefright_foundation", + "libcutils", + "libdolbyottcameracontrol", + "libhidlbase", + "libnativewindow", + "libdolbyeglcore", + "libcodec2_vndk", + "libcodec2", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libdolbyeglcore", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libdolbyeglcore.so", + ], + shared_libs: [ + "libEGL", + "libGLESv3", + "libnativewindow", + "libcutils", + "liblog", + "libutils", + "libui", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + +cc_prebuilt_library_shared { + name: "libdolbyottcameracontrol", + owner: "xiaomi", + strip: { + none: true, + }, + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/lib64/libdolbyottcameracontrol.so", + ], + shared_libs: [ + "liblog", + "libGLESv3", + "libEGL", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + prefer: true, + soc_specific: true, +} + cc_prebuilt_library_shared { name: "libecoengine", owner: "xiaomi", @@ -36533,7 +36852,7 @@ cc_prebuilt_binary { shared_libs: [ "android.hardware.media.c2-V1-ndk", "libbinder_ndk", - "libcodec2_aidl", + "libcodec2_aidl_prebuilt", "server_configurable_flags", "libaconfig_storage_read_api_cc", "libbase", @@ -36568,6 +36887,49 @@ cc_prebuilt_binary { soc_specific: true, } +cc_prebuilt_binary { + name: "vendor.dolby.media.c2-service-vision", + owner: "xiaomi", + target: { + android_arm64: { + srcs: [ + "proprietary/vendor/bin/hw/vendor.dolby.media.c2-service-vision", + ], + shared_libs: [ + "android.hardware.media.c2-V1-ndk", + "libbinder_ndk", + "libcodec2_aidl_prebuilt", + "libstagefright_aidl_bufferpool2", + "server_configurable_flags", + "libaconfig_storage_read_api_cc", + "libbase", + "liblog", + "libcodec2", + "libcodec2_hal_common", + "libcodec2_vndk", + "libutils", + "android.hardware.media.c2@1.0", + "libcodec2_hidl@1.0", + "libbinder", + "libhidlbase", + "c2.dolby.store", + "libcutils", + "libc++", + "libc", + "libm", + "libdl", + ], + }, + }, + compile_multilib: "64", + strip: { + none: true, + }, + prefer: true, + relative_install_path: "hw", + soc_specific: true, +} + cc_prebuilt_binary { name: "vendor.mediatek.hardware.gnss-service", owner: "xiaomi", diff --git a/proprietary/product/priv-app/HotwordEnrollmentXGoogleRISCV_WIDEBAND/HotwordEnrollmentXGoogleRISCV_WIDEBAND.apk b/proprietary/product/priv-app/HotwordEnrollmentXGoogleRISCV_WIDEBAND/HotwordEnrollmentXGoogleRISCV_WIDEBAND.apk index 2bc258f..314d62a 100644 Binary files a/proprietary/product/priv-app/HotwordEnrollmentXGoogleRISCV_WIDEBAND/HotwordEnrollmentXGoogleRISCV_WIDEBAND.apk and b/proprietary/product/priv-app/HotwordEnrollmentXGoogleRISCV_WIDEBAND/HotwordEnrollmentXGoogleRISCV_WIDEBAND.apk differ diff --git a/proprietary/product/priv-app/HotwordEnrollmentYGoogleRISCV_WIDEBAND/HotwordEnrollmentYGoogleRISCV_WIDEBAND.apk b/proprietary/product/priv-app/HotwordEnrollmentYGoogleRISCV_WIDEBAND/HotwordEnrollmentYGoogleRISCV_WIDEBAND.apk index 28976a0..e98303c 100644 Binary files a/proprietary/product/priv-app/HotwordEnrollmentYGoogleRISCV_WIDEBAND/HotwordEnrollmentYGoogleRISCV_WIDEBAND.apk and b/proprietary/product/priv-app/HotwordEnrollmentYGoogleRISCV_WIDEBAND/HotwordEnrollmentYGoogleRISCV_WIDEBAND.apk differ diff --git a/proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar b/proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar index e4ebe4e..b09df01 100644 Binary files a/proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar and b/proprietary/system_ext/framework/com.android.hotwordenrollment.common.util.jar 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 index 7120847..caeb7d9 100755 Binary files a/proprietary/vendor/bin/hw/vendor.dolby.media.c2-default-service-dax and b/proprietary/vendor/bin/hw/vendor.dolby.media.c2-default-service-dax differ diff --git a/proprietary/vendor/bin/hw/vendor.dolby.media.c2-service-vision b/proprietary/vendor/bin/hw/vendor.dolby.media.c2-service-vision new file mode 100755 index 0000000..d4b0b73 Binary files /dev/null and b/proprietary/vendor/bin/hw/vendor.dolby.media.c2-service-vision differ diff --git a/proprietary/vendor/etc/dolby_vision.cfg b/proprietary/vendor/etc/dolby_vision.cfg new file mode 100644 index 0000000..157a9cc --- /dev/null +++ b/proprietary/vendor/etc/dolby_vision.cfg @@ -0,0 +1,52 @@ +# Dolby Vision Display Management Configuration File +# Path : ./vendor/etc/dolby_vision.cfg +# Date : 09/03/2024 +# Display : OLED 6.7 inch 1220x2712 +# Brand Model Number: Xiaomi O10 rodin 2412DRT0AC + +#Configuration Start +[Display] +ID = 0 +Width = 1220 +Height = 2712 + +[Global] +ReferenceDarkPicModeIndex = 2 +IDK_Version = SW_4.5.2 +DMSwVersion = 4.0 +DeviceModelName = NULL +DefaultOutputFormat = YUV + +Tmax = 1250 +Tmin = 0.0001 +TPrimaries = 0.68 0.32 0.265 0.69 0.15 0.06 0.3127 0.329 +TEOTF = POWER +Tgamma = 2.3 + +BLUPwm = 83 131 175 216 255 +BLULight = 295.2 477.8 686.2 944.5 1250 +BLULightMin = 0.0001 0.0001 0.0001 0.0001 0.0001 + +Ambient = 3 +TSurroundReflection = 0.5 +TScreenReflection = 0.0005 +ALDelayMilliSec = 50 +ALResponseFall = 0.04 +ALResponseRise = 0.2 +ALOperationalRate = 50 +TFrontLux = 1000 +TFrontLuxScale = 1 + +[PictureMode = 0] +PictureModeName = Dolby Vision Bright +DBrightness = 0.3 + +[PictureMode = 1] +PictureModeName = Dolby Vision Vivid +DBrightness = 0.3 + +[PictureMode = 2] +PictureModeName = Dolby Vision Dark +SupportsDM3 = 1 +Ambient = 0 +#Configuration End diff --git a/proprietary/vendor/etc/init/vendor.dolby.media.c2-service-vision.rc b/proprietary/vendor/etc/init/vendor.dolby.media.c2-service-vision.rc new file mode 100644 index 0000000..546c2a5 --- /dev/null +++ b/proprietary/vendor/etc/init/vendor.dolby.media.c2-service-vision.rc @@ -0,0 +1,6 @@ +service vendor.dolby.media.c2-service-vision /vendor/bin/hw/vendor.dolby.media.c2-service-vision + class hal + user mediacodec + group camera mediadrm drmrpc + ioprio rt 4 + writepid /dev/cpuset/foreground/tasks diff --git a/proprietary/vendor/lib64/c2.dolby.client.so b/proprietary/vendor/lib64/c2.dolby.client.so new file mode 100644 index 0000000..6b6572e Binary files /dev/null and b/proprietary/vendor/lib64/c2.dolby.client.so differ diff --git a/proprietary/vendor/lib64/c2.dolby.hevc.dec.so b/proprietary/vendor/lib64/c2.dolby.hevc.dec.so new file mode 100644 index 0000000..2feff3f Binary files /dev/null and b/proprietary/vendor/lib64/c2.dolby.hevc.dec.so differ diff --git a/proprietary/vendor/lib64/c2.dolby.hevc.sec.dec.so b/proprietary/vendor/lib64/c2.dolby.hevc.sec.dec.so new file mode 100644 index 0000000..ad45941 Binary files /dev/null and b/proprietary/vendor/lib64/c2.dolby.hevc.sec.dec.so differ diff --git a/proprietary/vendor/lib64/c2.dolby.store.so b/proprietary/vendor/lib64/c2.dolby.store.so new file mode 100644 index 0000000..847f33b Binary files /dev/null and b/proprietary/vendor/lib64/c2.dolby.store.so differ diff --git a/proprietary/vendor/lib64/libcodec2_aidl_prebuilt.so b/proprietary/vendor/lib64/libcodec2_aidl_prebuilt.so new file mode 100644 index 0000000..08e98e9 Binary files /dev/null and b/proprietary/vendor/lib64/libcodec2_aidl_prebuilt.so differ diff --git a/proprietary/vendor/lib64/libcodec2_mtk_vdec.so b/proprietary/vendor/lib64/libcodec2_mtk_vdec.so index 9d4cb19..275f584 100644 Binary files a/proprietary/vendor/lib64/libcodec2_mtk_vdec.so and b/proprietary/vendor/lib64/libcodec2_mtk_vdec.so differ diff --git a/proprietary/vendor/lib64/libcodec2_mtk_venc.so b/proprietary/vendor/lib64/libcodec2_mtk_venc.so index 28ff13a..e7c4528 100644 Binary files a/proprietary/vendor/lib64/libcodec2_mtk_venc.so and b/proprietary/vendor/lib64/libcodec2_mtk_venc.so differ diff --git a/proprietary/vendor/lib64/libdolbydecoderprocessor.so b/proprietary/vendor/lib64/libdolbydecoderprocessor.so new file mode 100644 index 0000000..f9c7b48 Binary files /dev/null and b/proprietary/vendor/lib64/libdolbydecoderprocessor.so differ diff --git a/proprietary/vendor/lib64/libdolbyeglcore.so b/proprietary/vendor/lib64/libdolbyeglcore.so new file mode 100644 index 0000000..cced54e Binary files /dev/null and b/proprietary/vendor/lib64/libdolbyeglcore.so differ diff --git a/proprietary/vendor/lib64/libdolbyottcameracontrol.so b/proprietary/vendor/lib64/libdolbyottcameracontrol.so new file mode 100644 index 0000000..0565cf0 Binary files /dev/null and b/proprietary/vendor/lib64/libdolbyottcameracontrol.so differ diff --git a/rodin-vendor.mk b/rodin-vendor.mk index 2194492..0dacf0f 100644 --- a/rodin-vendor.mk +++ b/rodin-vendor.mk @@ -495,6 +495,7 @@ PRODUCT_COPY_FILES += \ 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/dolby_vision.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/dolby_vision.cfg \ 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 \ @@ -559,6 +560,7 @@ PRODUCT_COPY_FILES += \ 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.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.dolby.media.c2-service-vision.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.dolby.media.c2-service-vision.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 \ @@ -812,6 +814,10 @@ PRODUCT_PACKAGES += \ android.hardware.audio.core-impl-mediatek \ android.hardware.bluetooth.audio-impl-mediatek \ android.hardware.security.keymint-V3-ndk-v34 \ + c2.dolby.client \ + c2.dolby.hevc.dec \ + c2.dolby.hevc.sec.dec \ + c2.dolby.store \ com.xiaomi.camdfx \ com.xiaomi.immunesystem.bigdata \ com.xiaomi.immunesystem.bigdata2 \ @@ -937,6 +943,7 @@ PRODUCT_PACKAGES += \ libccci_util \ libcmdl \ libcmdl_ndk.mtk.vndk \ + libcodec2_aidl_prebuilt \ libcodec2_fsr \ libcodec2_mtk_c2store \ libcodec2_mtk_vdec \ @@ -978,6 +985,9 @@ PRODUCT_PACKAGES += \ libdlbdsservice \ libdlbpreg \ libdmshal \ + libdolbydecoderprocessor \ + libdolbyeglcore \ + libdolbyottcameracontrol \ libecoengine \ libfeature.hdr10 \ libfeaturepolicy \ @@ -1970,6 +1980,7 @@ PRODUCT_PACKAGES += \ tetheroffloadservice \ vendor.dolby.dms.service \ vendor.dolby.media.c2-default-service-dax \ + vendor.dolby.media.c2-service-vision \ vendor.mediatek.hardware.gnss-service \ vendor.mediatek.hardware.gpuserv-service \ vendor.mediatek.hardware.mmagent-service \