diff --git a/BUILD.gn b/BUILD.gn index 733549aa0d041423b2d2602d6d82ebb12f102306..58107d32149036f6163784f29d8601c2faa3c101 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -16,6 +16,7 @@ import("//build/ohos.gni") group("image_framework") { deps = [ "frameworks/innerkitsimpl/utils:image_utils", + "interfaces/innerkits:image_native", "interfaces/innerkits:image", ] } diff --git a/frameworks/innerkitsimpl/test/BUILD.gn b/frameworks/innerkitsimpl/test/BUILD.gn index 4c1ceac593f2bc7f7bc93d7e3356d05795d30647..826809b7e1a94d7805166d18deba87adcc4595a6 100644 --- a/frameworks/innerkitsimpl/test/BUILD.gn +++ b/frameworks/innerkitsimpl/test/BUILD.gn @@ -29,9 +29,8 @@ ohos_unittest("imagepixelmaptest") { sources = [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/test/unittest/image_pixel_map_test.cpp" ] deps = [ - # "//foundation/multimedia/image_standard/adapter/frameworks/bitmapconverter/native:bitmapconverter", - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/multimedia/image_standard/interfaces/innerkits:image", +# "//foundation/multimedia/image_standard/adapter/frameworks/bitmapconverter/native:bitmapconverter", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -102,7 +101,7 @@ ohos_unittest("imagesourcetest") { deps = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils", - "//foundation/multimedia/image_standard/interfaces/innerkits:image", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -127,8 +126,7 @@ ohos_unittest("colorconvertertest") { sources = [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/test/unittest/color_converter_test.cpp" ] deps = [ - "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/multimedia/image_standard/interfaces/innerkits:image", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -153,8 +151,7 @@ ohos_unittest("transformtest") { sources = [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/test/unittest/image_transform_test.cpp" ] deps = [ - "//base/hiviewdfx/hilog/frameworks/native:libhilogutil", - "//foundation/multimedia/image_standard/interfaces/innerkits:image", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", diff --git a/frameworks/innerkitsimpl/utils/BUILD.gn b/frameworks/innerkitsimpl/utils/BUILD.gn index 0e14b2bdfb3c074ca0f0ad21c553d72aaa263a38..e0fc358d76eb2a86ee096d025f87605411b34b35 100644 --- a/frameworks/innerkitsimpl/utils/BUILD.gn +++ b/frameworks/innerkitsimpl/utils/BUILD.gn @@ -64,7 +64,7 @@ ohos_shared_library("image_utils") { "hiviewdfx_hilog_native:libhilog", ] } - relative_install_dir = "module/multimedia" + #relative_install_dir = "module/multimedia" subsystem_name = "multimedia" part_name = "multimedia_image_standard" } diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index 5771cdf70d8f6f3e2043c9013a75c763f8be66e9..b1bf81329d0eb56ac4b1c4e96cbeceeef1fbd16c 100644 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -33,8 +33,7 @@ config("image_external_config") { ] if (use_mingw_win) { - include_dirs += - [ "//foundation/multimedia/image_standard/mock/native/include" ] + include_dirs += [ "//foundation/multimedia/image_standard/mock/native/include" ] } else if (use_clang_mac) { include_dirs += [ "//foundation/multimedia/image_standard/mock/native/include", @@ -53,19 +52,22 @@ config("image_external_config") { js_declaration("image_js") { part_name = "multimedia_image_standard" - sources = [ "//foundation/multimedia/image_standard/interfaces/kits/js/@ohos.multimedia.image.d.ts" ] + sources = [ + "//foundation/multimedia/image_standard/interfaces/kits/js/@ohos.multimedia.image.d.ts", + ] } ohos_copy("image_declaration") { - sources = [ "//foundation/multimedia/image_standard/interfaces/kits/js/@ohos.multimedia.image.d.ts" ] + sources = [ + "//foundation/multimedia/image_standard/interfaces/kits/js/@ohos.multimedia.image.d.ts", + ] outputs = [ target_out_dir + "/$target_name/" ] module_source_dir = target_out_dir + "/$target_name" module_install_name = "" } -ohos_shared_library("image") { +ohos_shared_library("image"){ public_configs = [ ":image_external_config" ] - sources = [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_packer.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_packer_ex.cpp", @@ -85,11 +87,59 @@ ohos_shared_library("image") { "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/incremental_source_stream.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/istream_source_stream.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", - + "//foundation/multimedia/image_standard/frameworks/kits/js/common/native_module_ohos_image.cpp", + "//foundation/multimedia/image_standard/frameworks/kits/js/common/pixel_map_napi.cpp", #"//foundation/multimedia/image_standard/frameworks/kits/js/common/image_source_napi.cpp", "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_napi_utils.cpp", + + ] + deps = [ + "//foundation/ace/napi:ace_napi", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils", + "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", + "//utils/native/base:utils", + ] + + external_deps = [ + "bytrace_standard:bytrace_core", + "ipc:ipc_core", + "hiviewdfx_hilog_native:libhilog", + + ] + relative_install_dir = "module/multimedia" + subsystem_name = "multimedia" + part_name = "multimedia_image_standard" +} + + + +ohos_shared_library("image_native") { + public_configs = [ ":image_external_config" ] + + sources = [ + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_packer.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_packer_ex.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_source.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/incremental_pixel_map.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/pixel_map.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/pixel_map_parcel.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/basic_transformer.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/matrix.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/pixel_convert.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/post_proc.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/scan_line_filter.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/buffer_packer_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/buffer_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/file_packer_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/incremental_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/istream_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", "//foundation/multimedia/image_standard/frameworks/kits/js/common/native_module_ohos_image.cpp", "//foundation/multimedia/image_standard/frameworks/kits/js/common/pixel_map_napi.cpp", + #"//foundation/multimedia/image_standard/frameworks/kits/js/common/image_source_napi.cpp", + "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_napi_utils.cpp", ] if (use_mingw_win) { @@ -143,17 +193,17 @@ ohos_shared_library("image") { ] } external_deps = [ - "bytrace_standard:bytrace_core", - "hiviewdfx_hilog_native:libhilog", - "ipc:ipc_core", + "bytrace_standard:bytrace_core", + "ipc:ipc_core", + "hiviewdfx_hilog_native:libhilog", + ] } - relative_install_dir = "module/multimedia" +# relative_install_dir = "module/multimedia" subsystem_name = "multimedia" part_name = "multimedia_image_standard" } - -ohos_static_library("image_static") { +ohos_static_library("image_static_napi"){ public_configs = [ ":image_external_config" ] sources = [ @@ -162,6 +212,7 @@ ohos_static_library("image_static") { "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_source.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/incremental_pixel_map.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/pixel_map.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/pixel_map_parcel.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/basic_transformer.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/matrix.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/pixel_convert.cpp", @@ -174,11 +225,47 @@ ohos_static_library("image_static") { "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/incremental_source_stream.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/istream_source_stream.cpp", "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", - + "//foundation/multimedia/image_standard/frameworks/kits/js/common/native_module_ohos_image.cpp", + "//foundation/multimedia/image_standard/frameworks/kits/js/common/pixel_map_napi.cpp", #"//foundation/multimedia/image_standard/frameworks/kits/js/common/image_source_napi.cpp", "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_napi_utils.cpp", + ] + deps = [ + "//foundation/ace/napi:ace_napi", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils", + "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", + "//utils/native/base:utils", + ] + subsystem_name = "multimedia" + part_name = "multimedia_image_standard" +} + +ohos_static_library("image_static") { + public_configs = [ ":image_external_config" ] + + sources = [ + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_packer.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_packer_ex.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/src/image_source.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/incremental_pixel_map.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/src/pixel_map.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/basic_transformer.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/matrix.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/pixel_convert.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/post_proc.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/scan_line_filter.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/buffer_packer_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/buffer_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/file_packer_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/incremental_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/istream_source_stream.cpp", + "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", "//foundation/multimedia/image_standard/frameworks/kits/js/common/native_module_ohos_image.cpp", "//foundation/multimedia/image_standard/frameworks/kits/js/common/pixel_map_napi.cpp", + #"//foundation/multimedia/image_standard/frameworks/kits/js/common/image_source_napi.cpp", + "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_napi_utils.cpp", ] if (use_mingw_win) { diff --git a/interfaces/kits/native/test/BUILD.gn b/interfaces/kits/native/test/BUILD.gn index 803592a7fcfd62e34661cc611b431578f747b48b..44d70663fb9ba9ba55b04f82009719715aa99b34 100644 --- a/interfaces/kits/native/test/BUILD.gn +++ b/interfaces/kits/native/test/BUILD.gn @@ -25,7 +25,7 @@ ohos_unittest("pixlmapndktest") { sources = [ "//foundation/multimedia/image_standard/interfaces/kits/native/test/unittest/pixel_map_ndk_test.cpp" ] deps = [ - "//foundation/multimedia/image_standard/interfaces/innerkits:image", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//foundation/multimedia/image_standard/interfaces/kits/native:multimedia_target", "//foundation/multimedia/image_standard/interfaces/kits/native/ndk_test_example:image_ndk_test_jni", "//third_party/googletest:gtest_main", diff --git a/plugins/common/libs/image/libjpegplugin/BUILD.gn b/plugins/common/libs/image/libjpegplugin/BUILD.gn index a28899daa4e176e37f0cf7857c78554f388228bd..593d55dbec497da7bbcf3601f7b3ce4533c712a3 100644 --- a/plugins/common/libs/image/libjpegplugin/BUILD.gn +++ b/plugins/common/libs/image/libjpegplugin/BUILD.gn @@ -67,7 +67,7 @@ ohos_shared_library("jpegplugin") { include_dirs += [ "//utils/native/base/include" ] sources += [ "//foundation/multimedia/image_standard/plugins/common/libs/image/libjpegplugin/src/jpeg_encoder.cpp" ] deps = [ - "//foundation/multimedia/image_standard/interfaces/innerkits:image", + "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", "//third_party/libjpeg:libjpeg_static", "//utils/native/base:utils",