From b53318faae9aa37c6f543d0a64950ba84e340524 Mon Sep 17 00:00:00 2001 From: liushang Date: Mon, 7 Apr 2025 22:36:28 +0800 Subject: [PATCH 1/4] ut fix Signed-off-by: liushang --- framework/BUILD.gn | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/framework/BUILD.gn b/framework/BUILD.gn index 4296a34..c20a24b 100644 --- a/framework/BUILD.gn +++ b/framework/BUILD.gn @@ -200,8 +200,7 @@ ohos_shared_library("videoprocessingengine") { "${target_gen_dir}/../services/video_processing_service_manager_proxy.cpp", "${target_gen_dir}/../services/video_processing_service_manager_stub.cpp", "$ALGORITHM_COMMON_DIR/image_opencl_wrapper.cpp", - "$ALGORITHM_COMMON_DIR/image_openclsetup.cpp", - "$ALGORITHM_EXTENSION_SKIA_DIR/skia_impl.cpp" + "$ALGORITHM_COMMON_DIR/image_openclsetup.cpp" ] deps = [ @@ -212,7 +211,10 @@ ohos_shared_library("videoprocessingengine") { ] if (has_skia) { - deps += ["//third_party/skia:skia_ohos"] + defines += [ "SKIA_ENABLE" ] + external_deps += [ "skia:skia_canvaskit" ] + include_dirs += [ "$ALGORITHM_EXTENSION_SKIA_DIR/include" ] + sources += [ "$ALGORITHM_EXTENSION_SKIA_DIR/skia_impl.cpp" ] } external_deps = [ @@ -350,13 +352,6 @@ ohos_shared_library("image_processing") { "samgr:samgr_proxy", ] - if (has_skia) { - defines += [ "SKIA_ENABLE" ] - external_deps += [ "skia:skia_canvaskit" ] - include_dirs += [ "$ALGORITHM_EXTENSION_SKIA_DIR/include" ] - sources += [ "$ALGORITHM_EXTENSION_SKIA_DIR/skia_impl.cpp" ] - } - innerapi_tags = [ "ndk" ] output_extension = "so" subsystem_name = "multimedia" @@ -438,13 +433,6 @@ ohos_shared_library("video_processing") { "samgr:samgr_proxy", ] - if (has_skia) { - defines += [ "SKIA_ENABLE" ] - external_deps += [ "skia:skia_canvaskit" ] - include_dirs += [ "$ALGORITHM_EXTENSION_SKIA_DIR/include" ] - sources += [ "$ALGORITHM_EXTENSION_SKIA_DIR/skia_impl.cpp" ] - } - innerapi_tags = [ "ndk" ] output_extension = "so" subsystem_name = "multimedia" -- Gitee From c3ec7693ca5877faedc82f0d1921a0fc4361c262 Mon Sep 17 00:00:00 2001 From: liushang Date: Mon, 7 Apr 2025 22:40:35 +0800 Subject: [PATCH 2/4] fix Signed-off-by: liushang --- .../algorithm/extension_manager/include/static_extension_list.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/framework/algorithm/extension_manager/include/static_extension_list.h b/framework/algorithm/extension_manager/include/static_extension_list.h index 2fad722..2728219 100644 --- a/framework/algorithm/extension_manager/include/static_extension_list.h +++ b/framework/algorithm/extension_manager/include/static_extension_list.h @@ -19,7 +19,9 @@ namespace OHOS::Media::VideoProcessingEngine::Extension { using RegisterExtensionFunc = void (*)(uintptr_t extensionListAddr); const std::unordered_map staticExtensionsRegisterMap = { +#ifdef SKIA_ENABLE {"Skia", RegisterSkiaExtensions}, +#endif }; } // namespace OHOS::Media::VideoProcessingEngine::Extension -- Gitee From e5a96fe4b5bb11c426b59b34c9080f692b4560e5 Mon Sep 17 00:00:00 2001 From: liushang Date: Mon, 7 Apr 2025 22:43:14 +0800 Subject: [PATCH 3/4] fix Signed-off-by: liushang --- framework/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/BUILD.gn b/framework/BUILD.gn index c20a24b..bf3fa43 100644 --- a/framework/BUILD.gn +++ b/framework/BUILD.gn @@ -212,7 +212,7 @@ ohos_shared_library("videoprocessingengine") { if (has_skia) { defines += [ "SKIA_ENABLE" ] - external_deps += [ "skia:skia_canvaskit" ] + external_deps += [ "//third_party/skia:skia_ohos" ] include_dirs += [ "$ALGORITHM_EXTENSION_SKIA_DIR/include" ] sources += [ "$ALGORITHM_EXTENSION_SKIA_DIR/skia_impl.cpp" ] } -- Gitee From 80d9ef183ae10a925378aaf3846d46be74463597 Mon Sep 17 00:00:00 2001 From: liushang Date: Mon, 7 Apr 2025 22:50:03 +0800 Subject: [PATCH 4/4] fix Signed-off-by: liushang --- framework/BUILD.gn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/BUILD.gn b/framework/BUILD.gn index bf3fa43..be44261 100644 --- a/framework/BUILD.gn +++ b/framework/BUILD.gn @@ -212,7 +212,7 @@ ohos_shared_library("videoprocessingengine") { if (has_skia) { defines += [ "SKIA_ENABLE" ] - external_deps += [ "//third_party/skia:skia_ohos" ] + deps += [ "//third_party/skia:skia_ohos" ] include_dirs += [ "$ALGORITHM_EXTENSION_SKIA_DIR/include" ] sources += [ "$ALGORITHM_EXTENSION_SKIA_DIR/skia_impl.cpp" ] } -- Gitee