diff --git a/Android.bp b/Android.bp index 48a5ed3..71aac90 100644 --- a/Android.bp +++ b/Android.bp @@ -243,6 +243,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", + "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", + "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", + "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", @@ -4114,49 +4296,6 @@ 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_prebuilt", - "libcodec2_vndk_prebuilt", - "libcutils", - "libhidlbase", - "liblog", - "libnativewindow", - "libstagefright_aidl_bufferpool2", - "libstagefright_bufferpool@2.0.1", - "libui", - "libutils", - "libcodec2_hidl_plugin_prebuilt", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libcodec2_fsr", owner: "xiaomi", @@ -4202,66 +4341,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libcodec2_hal_common_prebuilt", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libcodec2_hal_common_prebuilt.so", - ], - shared_libs: [ - "libbase", - "libcodec2", - "libcodec2_vndk", - "liblog", - "libstagefright_foundation", - "server_configurable_flags", - "libaconfig_storage_read_api_cc", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - -cc_prebuilt_library_shared { - name: "libcodec2_hidl_plugin_prebuilt", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libcodec2_hidl_plugin_prebuilt.so", - ], - shared_libs: [ - "libbase", - "libcodec2", - "libcodec2_vndk_prebuilt", - "liblog", - "libutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libcodec2_mtk_c2store", owner: "xiaomi", @@ -4445,54 +4524,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libcodec2_vndk_prebuilt", - owner: "xiaomi", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libcodec2_vndk_prebuilt.so", - ], - shared_libs: [ - "server_configurable_flags", - "libaconfig_storage_read_api_cc", - "android.hardware.graphics.bufferqueue@2.0", - "android.hardware.graphics.common@1.2", - "android.hardware.common-V2-ndk", - "android.hardware.common.fmq-V1-ndk", - "android.hardware.media.bufferpool@2.0", - "android.hardware.media.bufferpool2-V2-ndk", - "android.hardware.media.c2-V1-ndk", - "libbase", - "libbinder_ndk", - "libcutils", - "libdmabufheap", - "libfmq", - "libgralloctypes", - "libhidlbase", - "libion", - "liblog", - "libnativewindow", - "libstagefright_foundation", - "libstagefright_bufferpool@2.0.1", - "libstagefright_aidl_bufferpool2", - "libui", - "libutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libcodec2_vpp_AIMEMC_plugin", owner: "xiaomi", @@ -5647,6 +5678,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", @@ -35332,25 +35457,25 @@ android_app_import { android_app_import { name: "HotwordEnrollmentXGoogleRISCV_WIDEBAND", owner: "xiaomi", - apk: "proprietary/product/priv-app/HotwordEnrollmentXGoogleRISCV_WIDEBAND/HotwordEnrollmentXGoogleRISCV_WIDEBAND.apk", + apk: "proprietary/system_ext/priv-app/HotwordEnrollmentXGoogleRISCV_WIDEBAND/HotwordEnrollmentXGoogleRISCV_WIDEBAND.apk", certificate: "platform", dex_preopt: { enabled: false, }, privileged: true, - product_specific: true, + system_ext_specific: true, } android_app_import { name: "HotwordEnrollmentYGoogleRISCV_WIDEBAND", owner: "xiaomi", - apk: "proprietary/product/priv-app/HotwordEnrollmentYGoogleRISCV_WIDEBAND/HotwordEnrollmentYGoogleRISCV_WIDEBAND.apk", + apk: "proprietary/system_ext/priv-app/HotwordEnrollmentYGoogleRISCV_WIDEBAND/HotwordEnrollmentYGoogleRISCV_WIDEBAND.apk", certificate: "platform", dex_preopt: { enabled: false, }, privileged: true, - product_specific: true, + system_ext_specific: true, } android_app_import { @@ -35419,46 +35544,6 @@ dex_import { ], } -dex_import { - name: "mediatek-ims-base", - owner: "xiaomi", - jars: [ - "proprietary/system/framework/mediatek-ims-base.jar", - ], -} - -dex_import { - name: "mediatek-ims-common", - owner: "xiaomi", - jars: [ - "proprietary/system/framework/mediatek-ims-common.jar", - ], -} - -dex_import { - name: "mediatek-telecom-common", - owner: "xiaomi", - jars: [ - "proprietary/system/framework/mediatek-telecom-common.jar", - ], -} - -dex_import { - name: "mediatek-telephony-base", - owner: "xiaomi", - jars: [ - "proprietary/system/framework/mediatek-telephony-base.jar", - ], -} - -dex_import { - name: "mediatek-telephony-common", - owner: "xiaomi", - jars: [ - "proprietary/system/framework/mediatek-telephony-common.jar", - ], -} - dex_import { name: "androidx.camera.extensions.impl", owner: "xiaomi", @@ -35477,6 +35562,26 @@ dex_import { system_ext_specific: true, } +dex_import { + name: "mediatek-ims-base", + owner: "xiaomi", + jars: [ + "proprietary/system_ext/framework/mediatek-ims-base.jar", + ], + system_ext_specific: true, + use_generic_config: true, +} + +dex_import { + name: "mediatek-ims-common", + owner: "xiaomi", + jars: [ + "proprietary/system_ext/framework/mediatek-ims-common.jar", + ], + system_ext_specific: true, + use_generic_config: true, +} + dex_import { name: "mediatek-ims-extension-plugin", owner: "xiaomi", @@ -35486,6 +35591,36 @@ dex_import { system_ext_specific: true, } +dex_import { + name: "mediatek-telecom-common", + owner: "xiaomi", + jars: [ + "proprietary/system_ext/framework/mediatek-telecom-common.jar", + ], + system_ext_specific: true, + use_generic_config: true, +} + +dex_import { + name: "mediatek-telephony-base", + owner: "xiaomi", + jars: [ + "proprietary/system_ext/framework/mediatek-telephony-base.jar", + ], + system_ext_specific: true, + use_generic_config: true, +} + +dex_import { + name: "mediatek-telephony-common", + owner: "xiaomi", + jars: [ + "proprietary/system_ext/framework/mediatek-telephony-common.jar", + ], + system_ext_specific: true, + use_generic_config: true, +} + prebuilt_etc_xml { name: "CommandService.xml", owner: "xiaomi", @@ -36261,55 +36396,6 @@ cc_prebuilt_binary { soc_specific: true, } -cc_prebuilt_binary { - name: "android.hardware.media.c2-mediatek-64b", - owner: "xiaomi", - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/bin/hw/android.hardware.media.c2-mediatek-64b", - ], - shared_libs: [ - "server_configurable_flags", - "libaconfig_storage_read_api_cc", - "libcodec2_hal_common", - "libcodec2_aidl_prebuilt", - "libbase", - "liblog", - "libcodec2", - "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", - "libcutils", - "libavservices_minijail", - "libbinder", - "libbinder_ndk", - "libcodec2_mtk_c2store", - "libcodec2_mtk_vdec", - "libcodec2_mtk_venc", - "android.hardware.media.c2-V1-ndk", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - strip: { - none: true, - }, - prefer: true, - relative_install_path: "hw", - soc_specific: true, -} - cc_prebuilt_binary { name: "android.hardware.neuralnetworks-shim-service-mtk", owner: "xiaomi", @@ -36702,6 +36788,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", + "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 deleted file mode 100644 index 314d62a..0000000 Binary files a/proprietary/product/priv-app/HotwordEnrollmentXGoogleRISCV_WIDEBAND/HotwordEnrollmentXGoogleRISCV_WIDEBAND.apk and /dev/null differ diff --git a/proprietary/product/priv-app/HotwordEnrollmentYGoogleRISCV_WIDEBAND/HotwordEnrollmentYGoogleRISCV_WIDEBAND.apk b/proprietary/product/priv-app/HotwordEnrollmentYGoogleRISCV_WIDEBAND/HotwordEnrollmentYGoogleRISCV_WIDEBAND.apk deleted file mode 100644 index e98303c..0000000 Binary files a/proprietary/product/priv-app/HotwordEnrollmentYGoogleRISCV_WIDEBAND/HotwordEnrollmentYGoogleRISCV_WIDEBAND.apk and /dev/null 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 b09df01..e4ebe4e 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/system/framework/mediatek-ims-base.jar b/proprietary/system_ext/framework/mediatek-ims-base.jar similarity index 100% rename from proprietary/system/framework/mediatek-ims-base.jar rename to proprietary/system_ext/framework/mediatek-ims-base.jar diff --git a/proprietary/system/framework/mediatek-ims-common.jar b/proprietary/system_ext/framework/mediatek-ims-common.jar similarity index 100% rename from proprietary/system/framework/mediatek-ims-common.jar rename to proprietary/system_ext/framework/mediatek-ims-common.jar diff --git a/proprietary/system/framework/mediatek-telecom-common.jar b/proprietary/system_ext/framework/mediatek-telecom-common.jar similarity index 100% rename from proprietary/system/framework/mediatek-telecom-common.jar rename to proprietary/system_ext/framework/mediatek-telecom-common.jar diff --git a/proprietary/system/framework/mediatek-telephony-base.jar b/proprietary/system_ext/framework/mediatek-telephony-base.jar similarity index 100% rename from proprietary/system/framework/mediatek-telephony-base.jar rename to proprietary/system_ext/framework/mediatek-telephony-base.jar diff --git a/proprietary/system/framework/mediatek-telephony-common.jar b/proprietary/system_ext/framework/mediatek-telephony-common.jar similarity index 100% rename from proprietary/system/framework/mediatek-telephony-common.jar rename to proprietary/system_ext/framework/mediatek-telephony-common.jar diff --git a/proprietary/system_ext/priv-app/HotwordEnrollmentXGoogleRISCV_WIDEBAND/HotwordEnrollmentXGoogleRISCV_WIDEBAND.apk b/proprietary/system_ext/priv-app/HotwordEnrollmentXGoogleRISCV_WIDEBAND/HotwordEnrollmentXGoogleRISCV_WIDEBAND.apk new file mode 100644 index 0000000..2bc258f Binary files /dev/null and b/proprietary/system_ext/priv-app/HotwordEnrollmentXGoogleRISCV_WIDEBAND/HotwordEnrollmentXGoogleRISCV_WIDEBAND.apk differ diff --git a/proprietary/system_ext/priv-app/HotwordEnrollmentYGoogleRISCV_WIDEBAND/HotwordEnrollmentYGoogleRISCV_WIDEBAND.apk b/proprietary/system_ext/priv-app/HotwordEnrollmentYGoogleRISCV_WIDEBAND/HotwordEnrollmentYGoogleRISCV_WIDEBAND.apk new file mode 100644 index 0000000..28976a0 Binary files /dev/null and b/proprietary/system_ext/priv-app/HotwordEnrollmentYGoogleRISCV_WIDEBAND/HotwordEnrollmentYGoogleRISCV_WIDEBAND.apk differ diff --git a/proprietary/vendor/bin/hw/android.hardware.media.c2-mediatek-64b b/proprietary/vendor/bin/hw/android.hardware.media.c2-mediatek-64b deleted file mode 100755 index 659ab8f..0000000 Binary files a/proprietary/vendor/bin/hw/android.hardware.media.c2-mediatek-64b and /dev/null 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..bc20780 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/android.hardware.media.c2-mediatek-64b.rc b/proprietary/vendor/etc/init/android.hardware.media.c2-mediatek-64b.rc deleted file mode 100644 index 0cc2b20..0000000 --- a/proprietary/vendor/etc/init/android.hardware.media.c2-mediatek-64b.rc +++ /dev/null @@ -1,7 +0,0 @@ -service android-hardware-media-c2-hal /vendor/bin/hw/android.hardware.media.c2-mediatek-64b - class hal - user mediacodec - group camera drmrpc mediadrm media_rw sdcard_rw media system audio inet net_bt net_bt_admin net_bw_acct sdcard_r - ioprio rt 4 - task_profiles ProcessCapacityHigh HighPerformance - 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/etc/mtk_platform_codecs_config.xml b/proprietary/vendor/etc/mtk_platform_codecs_config.xml deleted file mode 100644 index a6322d5..0000000 --- a/proprietary/vendor/etc/mtk_platform_codecs_config.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - diff --git a/proprietary/vendor/etc/permissions/com.mediatek.hardware.vow.gva.tflite.xml b/proprietary/vendor/etc/permissions/com.mediatek.hardware.vow.gva.tflite.xml new file mode 100644 index 0000000..0a0f067 --- /dev/null +++ b/proprietary/vendor/etc/permissions/com.mediatek.hardware.vow.gva.tflite.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/proprietary/vendor/etc/permissions/com.mediatek.hardware.vow.xml b/proprietary/vendor/etc/permissions/com.mediatek.hardware.vow.xml new file mode 100644 index 0000000..a46edaa --- /dev/null +++ b/proprietary/vendor/etc/permissions/com.mediatek.hardware.vow.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/proprietary/vendor/etc/permissions/com.mediatek.hardware.vow_dsp.xml b/proprietary/vendor/etc/permissions/com.mediatek.hardware.vow_dsp.xml new file mode 100644 index 0000000..0b88159 --- /dev/null +++ b/proprietary/vendor/etc/permissions/com.mediatek.hardware.vow_dsp.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/proprietary/vendor/etc/seccomp_policy/android.hardware.media.c2@1.2-extended-seccomp-policy b/proprietary/vendor/etc/seccomp_policy/android.hardware.media.c2@1.2-extended-seccomp-policy deleted file mode 100644 index e0b3dd9..0000000 --- a/proprietary/vendor/etc/seccomp_policy/android.hardware.media.c2@1.2-extended-seccomp-policy +++ /dev/null @@ -1,44 +0,0 @@ -connect: 1 -fcntl64: 1 -socket: 1 -writev: 1 -clock_nanosleep: 1 -eventfd2: 1 -sched_getparam: 1 -sched_getscheduler :1 -setsockopt: 1 -bind: 1 -listen: 1 - -# Add more for 32bits process, from android.hardware.media.c2@1.1-default-arm.policy -mmap2: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE -ftruncate64: 1 -getuid32: 1 -open: 1 -fstat64: 1 -readlink: 1 -fstatfs64: 1 -_llseek: 1 -fstatat64: 1 -ugetrlimit: 1 -# crash dump policy additions -sigreturn: 1 -futex: 1 -#mmap2: arg2 in 0x1|0x2 -geteuid32: 1 -getgid32: 1 -getegid32: 1 -getgroups32: 1 -getpriority: 1 -mlock: 1 -munlock: 1 -fchmod: 1 -getuid: 1 -mmap: 1 -getrlimit: 1 -newfstatat: 1 -fstat: 1 -fstatfs: 1 -unlinkat: 1 -sched_setscheduler: 1 -mkdirat: 1 diff --git a/proprietary/vendor/etc/seccomp_policy/android.hardware.media.c2@1.2-mediatek-seccomp-policy b/proprietary/vendor/etc/seccomp_policy/android.hardware.media.c2@1.2-mediatek-seccomp-policy deleted file mode 100644 index 3c3b4fb..0000000 --- a/proprietary/vendor/etc/seccomp_policy/android.hardware.media.c2@1.2-mediatek-seccomp-policy +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright (C) 2019 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -futex: 1 -# ioctl calls are filtered via the selinux policy. -ioctl: 1 -sched_yield: 1 -close: 1 -dup: 1 -ppoll: 1 -mprotect: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE -mmap: arg2 in ~PROT_EXEC || arg2 in ~PROT_WRITE -getuid: 1 -getrlimit: 1 -fstat: 1 -newfstatat: 1 -fstatfs: 1 -memfd_create: 1 -ftruncate: 1 - -# mremap: Ensure |flags| are (MREMAP_MAYMOVE | MREMAP_FIXED) TODO: Once minijail -# parser support for '<' is in this needs to be modified to also prevent -# |old_address| and |new_address| from touching the exception vector page, which -# on ARM is statically loaded at 0xffff 0000. See -# http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0211h/Babfeega.html -# for more details. -mremap: arg3 == 3 || arg3 == MREMAP_MAYMOVE -munmap: 1 -prctl: 1 -writev: 1 -sigaltstack: 1 -clone: 1 -exit: 1 -lseek: 1 -rt_sigprocmask: 1 -openat: 1 -write: 1 -nanosleep: 1 -setpriority: 1 -set_tid_address: 1 -getdents64: 1 -readlinkat: 1 -read: 1 -pread64: 1 -gettimeofday: 1 -faccessat: 1 -exit_group: 1 -restart_syscall: 1 -rt_sigreturn: 1 -getrandom: 1 -madvise: 1 -sched_setaffinity: 1 -sched_getaffinity: 1 -sched_getparam: 1 -sched_getscheduler: 1 -recvfrom: 1 - -# crash dump policy additions -clock_gettime: 1 -getpid: 1 -gettid: 1 -pipe2: 1 -recvmsg: 1 -process_vm_readv: 1 -tgkill: 1 -rt_sigaction: 1 -rt_tgsigqueueinfo: 1 -#mprotect: arg2 in 0x1|0x2 -munmap: 1 -#mmap: arg2 in 0x1|0x2 -geteuid: 1 -getgid: 1 -getegid: 1 -getgroups: 1 -unlinkat: 1 -sched_setscheduler: 1 -mkdirat: 1 diff --git a/proprietary/vendor/lib64/c2.dolby.client.so b/proprietary/vendor/lib64/c2.dolby.client.so new file mode 100644 index 0000000..d7358ac 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..ca60b68 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..bee9dd0 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 deleted file mode 100644 index cc7c94d..0000000 Binary files a/proprietary/vendor/lib64/libcodec2_aidl_prebuilt.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libcodec2_hal_common_prebuilt.so b/proprietary/vendor/lib64/libcodec2_hal_common_prebuilt.so deleted file mode 100644 index b2aa74c..0000000 Binary files a/proprietary/vendor/lib64/libcodec2_hal_common_prebuilt.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libcodec2_hidl_plugin_prebuilt.so b/proprietary/vendor/lib64/libcodec2_hidl_plugin_prebuilt.so deleted file mode 100644 index 8abe805..0000000 Binary files a/proprietary/vendor/lib64/libcodec2_hidl_plugin_prebuilt.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libcodec2_vndk_prebuilt.so b/proprietary/vendor/lib64/libcodec2_vndk_prebuilt.so deleted file mode 100644 index 3ef8693..0000000 Binary files a/proprietary/vendor/lib64/libcodec2_vndk_prebuilt.so and /dev/null 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 7c95e71..d7d55c8 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 \ @@ -528,7 +529,6 @@ PRODUCT_COPY_FILES += \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/android.hardware.gnss-service.mediatek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.gnss-service.mediatek.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/android.hardware.graphics.composer@3.3-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.graphics.composer@3.3-service.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/android.hardware.identity@5.0-service.mitee.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.identity@5.0-service.mitee.rc \ - vendor/xiaomi/rodin/proprietary/vendor/etc/init/android.hardware.media.c2-mediatek-64b.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.media.c2-mediatek-64b.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/android.hardware.neuralnetworks-shim-service-mtk.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.neuralnetworks-shim-service-mtk.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/android.hardware.secure_element@1.2-service-mediatek.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.secure_element@1.2-service-mediatek.rc \ vendor/xiaomi/rodin/proprietary/vendor/etc/init/android.hardware.security.keymint.mitee@3.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.security.keymint.mitee@3.0-service.rc \ @@ -559,6 +559,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 \ @@ -570,7 +571,6 @@ PRODUCT_COPY_FILES += \ 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/mtk_platform_codecs_config.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mtk_platform_codecs_config.xml \ vendor/xiaomi/rodin/proprietary/vendor/etc/nhw:$(TARGET_COPY_OUT_VENDOR)/etc/nhw \ vendor/xiaomi/rodin/proprietary/vendor/etc/nn/cam_aimemc/camera_memc_30to60.dla:$(TARGET_COPY_OUT_VENDOR)/etc/nn/cam_aimemc/camera_memc_30to60.dla \ vendor/xiaomi/rodin/proprietary/vendor/etc/nn/cam_aimemc/camera_memc_resizer_1080p_afbc_nv12.dla:$(TARGET_COPY_OUT_VENDOR)/etc/nn/cam_aimemc/camera_memc_resizer_1080p_afbc_nv12.dla \ @@ -661,9 +661,10 @@ PRODUCT_COPY_FILES += \ 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.identity_credential.mitee.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.identity_credential.mitee.xml \ vendor/xiaomi/rodin/proprietary/vendor/etc/permissions/camera_extensions.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/camera_extensions.xml \ + vendor/xiaomi/rodin/proprietary/vendor/etc/permissions/com.mediatek.hardware.vow.gva.tflite.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.mediatek.hardware.vow.gva.tflite.xml \ + vendor/xiaomi/rodin/proprietary/vendor/etc/permissions/com.mediatek.hardware.vow.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.mediatek.hardware.vow.xml \ + vendor/xiaomi/rodin/proprietary/vendor/etc/permissions/com.mediatek.hardware.vow_dsp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.mediatek.hardware.vow_dsp.xml \ vendor/xiaomi/rodin/proprietary/vendor/etc/pq_flag.xml:$(TARGET_COPY_OUT_VENDOR)/etc/pq_flag.xml \ - vendor/xiaomi/rodin/proprietary/vendor/etc/seccomp_policy/android.hardware.media.c2@1.2-extended-seccomp-policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/android.hardware.media.c2@1.2-extended-seccomp-policy \ - vendor/xiaomi/rodin/proprietary/vendor/etc/seccomp_policy/android.hardware.media.c2@1.2-mediatek-seccomp-policy:$(TARGET_COPY_OUT_VENDOR)/etc/seccomp_policy/android.hardware.media.c2@1.2-mediatek-seccomp-policy \ vendor/xiaomi/rodin/proprietary/vendor/etc/sensor_diag.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/sensor_diag.cfg \ vendor/xiaomi/rodin/proprietary/vendor/etc/slp_conf:$(TARGET_COPY_OUT_VENDOR)/etc/slp_conf \ vendor/xiaomi/rodin/proprietary/vendor/etc/smartpa_param/AW_DSP.bin:$(TARGET_COPY_OUT_VENDOR)/etc/smartpa_param/AW_DSP.bin \ @@ -815,6 +816,10 @@ PRODUCT_PACKAGES += \ android.hardware.audio.core-impl-mediatek \ android.hardware.bluetooth.audio-impl-mediatek \ android.hardware.security.keymint-V3-ndk-v35 \ + 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 \ @@ -940,17 +945,13 @@ PRODUCT_PACKAGES += \ libccci_util \ libcmdl \ libcmdl_ndk.mtk.vndk \ - libcodec2_aidl_prebuilt \ libcodec2_fsr \ - libcodec2_hal_common_prebuilt \ - libcodec2_hidl_plugin_prebuilt \ libcodec2_mtk_c2store \ libcodec2_mtk_vdec \ libcodec2_mtk_venc \ libcodec2_soft_ac4dec \ libcodec2_soft_ddpdec \ libcodec2_store_dolby \ - libcodec2_vndk_prebuilt \ libcodec2_vpp_AIMEMC_plugin \ libcodec2_vpp_AISR_plugin \ libcodec2_vpp_fa_plugin \ @@ -986,6 +987,9 @@ PRODUCT_PACKAGES += \ libdlbdsservice \ libdlbpreg \ libdmshal \ + libdolbydecoderprocessor \ + libdolbyeglcore \ + libdolbyottcameracontrol \ libecoengine \ libfeature.hdr10 \ libfeaturepolicy \ @@ -1907,14 +1911,14 @@ PRODUCT_PACKAGES += \ JVFactoryTest \ goodix_sz_rodin \ camerax-vendor-extensions \ + androidx.camera.extensions.impl \ + com.android.hotwordenrollment.common.util \ mediatek-ims-base \ mediatek-ims-common \ + mediatek-ims-extension-plugin \ mediatek-telecom-common \ mediatek-telephony-base \ mediatek-telephony-common \ - androidx.camera.extensions.impl \ - com.android.hotwordenrollment.common.util \ - mediatek-ims-extension-plugin \ CommandService.xml \ android.hardware.audio.effect.service-aidl.xml \ android.hardware.audio.service-aidl.mediatek.xml \ @@ -1966,7 +1970,6 @@ PRODUCT_PACKAGES += \ android.hardware.gnss-service.mediatek \ android.hardware.graphics.composer@3.3-service \ android.hardware.identity-service.mitee@5.0 \ - android.hardware.media.c2-mediatek-64b \ android.hardware.neuralnetworks-shim-service-mtk \ android.hardware.secure_element@1.2-service-mediatek \ android.hardware.security.keymint@3.0-service.mitee \ @@ -1977,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 \ @@ -2476,8 +2480,8 @@ PRODUCT_PACKAGES += \ PRODUCT_BOOT_JARS += \ camerax-vendor-extensions \ - mediatek-ims-base \ - mediatek-ims-common \ - mediatek-telecom-common \ - mediatek-telephony-base \ - mediatek-telephony-common + system_ext:mediatek-ims-base \ + system_ext:mediatek-ims-common \ + system_ext:mediatek-telecom-common \ + system_ext:mediatek-telephony-base \ + system_ext:mediatek-telephony-common