openharmony/multimedia_image_framework
1
0
Fork 0
mirror of https://gitee.com/openharmony/multimedia_image_framework synced 2024-12-17 20:52:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix deps warning

Browse Source 
Signed-off-by: Can Xia <xiacan2@huawei.com>
Change-Id: I16e727e3c0d049e47719d576f335e124fa62ca84
This commit is contained in:
Can Xia 2024-04-25 18:06:29 +08:00
parent 37c865c73d
commit 088941f46a
32 changed files with 154 additions and 287 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bundle.json
View File

@ -26,6 +26,7 @@
"hisysevent_config": [ "//foundation/multimedia/image_framework/hisysevent.yaml" ],
"deps": {
"components": [
"ability_runtime",
"c_utils",
"graphic_2d",
"graphic_surface",
@ -40,25 +41,26 @@
"memory_utils",
"drivers_interface_codec",
"drivers_interface_display",
"drivers_peripheral_display",
"hdf_core",
"memmgr_override",
"libyuv",
"libjpeg-turbo",
"libexif",
"zlib",
"resource_management"
"libpng",
"opencl-headers",
"ffmpeg",
"astc-encoder",
"skia",
"resource_management",
"json",
"openmax"
],
"third_party": [
"flutter",
"libpng",
"bounds_checking_function",
"expat",
"json",
"skia",
"astc-encoder",
"opencl-headers",
"ffmpeg",
"zlib"
"skia"
]
},
"build": {

32
frameworks/innerkitsimpl/pixelconverter/BUILD.gn
View File

@ -17,23 +17,9 @@ import("//foundation/multimedia/image_framework/ide/image_decode_config.gni")
config("pixelconvertadapter_public_config") {
visibility = [ ":*" ]
include_dirs = [
"//foundation/multimedia/utils/include",
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/pixelconverter/include",
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
"//foundation/communication/ipc/utils/include",
"//foundation/multimedia/media_utils_lite/interfaces/kits",
"${image_subsystem}/frameworks/innerkitsimpl/utils/include",
"$skia_root/skia/include/core",
"$skia_root/skia/include/encode",
"$skia_root/skia",
"$skia_root/skia/src/ports/skia_ohos",
"$skia_root/skia/src/ports",
"$skia_root/skia/src/images",
"$skia_root/skia/src/ports/skia_ohos",
"$skia_root/skia/third_party/externals/freetype/include/freetype",
"$skia_root/skia/include/private",
"//third_party/bounds_checking_function/include",
]
if (use_mingw_win) {
@ -87,7 +73,6 @@ config("pixelconvertadapter_public_config") {
"//commonlibrary/c_utils/base/include",
"//foundation/communication/ipc/utils/include",
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
"$skia_root/skia/include/core",
"$skia_root/skia/include/encode",
"$skia_root/skia",
"$skia_root/skia/src/ports/skia_ohos",
@ -99,22 +84,6 @@ config("pixelconvertadapter_public_config") {
"//third_party/bounds_checking_function/include",
"$image_subsystem/mock/native/include/log",
]
} else {
include_dirs += [
"//commonlibrary/c_utils/base/include",
"//foundation/communication/ipc/utils/include",
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
"$skia_root/skia/include/core",
"$skia_root/skia/include/encode",
"$skia_root/skia",
"$skia_root/skia/src/ports/skia_ohos",
"$skia_root/skia/src/ports",
"$skia_root/skia/src/images",
"//third_party/expat/lib",
"$skia_root/skia/include/private",
"$skia_root/skia/third_party/externals/freetype/include/freetype",
"//third_party/bounds_checking_function/include",
]
}
}
@ -224,6 +193,7 @@ ohos_static_library("pixelconvertadapter_static") {
external_deps = [
"c_utils:utils",
"graphic_2d:color_manager",
"hilog:libhilog",
]
}

47
frameworks/innerkitsimpl/test/BUILD.gn
View File

@ -51,6 +51,8 @@ ohos_unittest("pixelmaptest") {
external_deps = [
"c_utils:utils",
"drivers_peripheral_display:hdi_gralloc_client",
"graphic_surface:surface",
"hilog:libhilog",
"ipc:ipc_core",
]
@ -199,6 +201,8 @@ ohos_unittest("imagesourcetest") {
external_deps = [
"c_utils:utils",
"drivers_peripheral_display:hdi_gralloc_client",
"graphic_surface:surface",
"hilog:libhilog",
]
@ -236,7 +240,11 @@ ohos_unittest("jpegdecoderextest") {
"//third_party/googletest:gtest_main",
]
external_deps = [ "c_utils:utils" ]
external_deps = [
"c_utils:utils",
"libexif:libexif",
"skia:libjpeg",
]
resource_config_file = "$image_subsystem/test/resource/image/ohos_test.xml"
}
@ -265,6 +273,8 @@ ohos_unittest("jpegutilstest") {
external_deps = [
"c_utils:utils",
"hilog:libhilog",
"libexif:libexif",
"skia:libjpeg",
]
resource_config_file = "$image_subsystem/test/resource/image/ohos_test.xml"
@ -294,6 +304,8 @@ ohos_unittest("exifmakernotetest") {
external_deps = [
"c_utils:utils",
"hilog:libhilog",
"libexif:libexif",
"skia:libjpeg",
]
resource_config_file = "$image_subsystem/test/resource/image/ohos_test.xml"
@ -476,6 +488,8 @@ ohos_unittest("interfacetest") {
resource_config_file = "$image_subsystem/test/resource/image/ohos_test.xml"
external_deps = [
"c_utils:utils",
"drivers_peripheral_display:hdi_gralloc_client",
"graphic_surface:surface",
"hilog:libhilog",
]
}
@ -733,6 +747,8 @@ ohos_unittest("receivertest") {
resource_config_file = "$image_subsystem/test/resource/image/ohos_test.xml"
external_deps = [
"c_utils:utils",
"drivers_peripheral_display:hdi_gralloc_client",
"graphic_surface:surface",
"hilog:libhilog",
]
}
@ -804,6 +820,8 @@ ohos_unittest("creatortest") {
resource_config_file = "$image_subsystem/test/resource/image/ohos_test.xml"
external_deps = [
"c_utils:utils",
"drivers_peripheral_display:hdi_gralloc_client",
"graphic_surface:surface",
"hilog:libhilog",
]
}
@ -1069,6 +1087,11 @@ ohos_unittest("ndktest2") {
"//third_party/googletest:gmock_main",
"//third_party/googletest:gtest_main",
]
external_deps = [
"graphic_2d:color_manager",
"graphic_surface:surface",
]
}
ohos_unittest("napitest") {
@ -1090,6 +1113,8 @@ ohos_unittest("napitest") {
"//third_party/googletest:gmock_main",
"//third_party/googletest:gtest_main",
]
external_deps = [ "graphic_2d:color_manager" ]
}
ohos_unittest("jpeg_hw_decoder_test") {
@ -1137,10 +1162,13 @@ ohos_unittest("jpeg_hw_decoder_test") {
"drivers_interface_display:display_composer_idl_headers",
"drivers_interface_display:libdisplay_buffer_hdi_impl",
"drivers_interface_display:libdisplay_composer_hdi_impl",
"graphic_surface:surface",
"hdf_core:libhdf_utils",
"hdf_core:libhdi",
"hilog:libhilog",
"ipc:ipc_single",
"libexif:libexif",
"skia:libjpeg",
]
resource_config_file = "$image_subsystem/test/resource/image/ohos_test.xml"
@ -1347,7 +1375,10 @@ ohos_unittest("jpeg_yuv_decoder_test") {
"${image_subsystem}/plugins/manager:pluginmanager",
]
resource_config_file = "$image_subsystem/test/resource/image/ohos_test.xml"
external_deps = [ "c_utils:utils" ]
external_deps = [
"c_utils:utils",
"skia:libjpeg",
]
}
ohos_unittest("imagestreamtest") {
@ -1519,7 +1550,11 @@ ohos_unittest("image_native_test") {
"${image_subsystem}/interfaces/innerkits:image_native",
]
resource_config_file = "$image_subsystem/test/resource/image/ohos_test.xml"
external_deps = [ "c_utils:utils" ]
external_deps = [
"c_utils:utils",
"drivers_peripheral_display:hdi_gralloc_client",
"graphic_surface:surface",
]
}
ohos_unittest("image_receiver_native_test") {
@ -1543,7 +1578,11 @@ ohos_unittest("image_receiver_native_test") {
"${image_subsystem}/interfaces/innerkits:image_native",
]
resource_config_file = "$image_subsystem/test/resource/image/ohos_test.xml"
external_deps = [ "c_utils:utils" ]
external_deps = [
"c_utils:utils",
"drivers_peripheral_display:hdi_gralloc_client",
"graphic_surface:surface",
]
}
ohos_unittest("datastatisticstest") {

8
frameworks/innerkitsimpl/test/unittest/jpeg_hw_decode/demo/BUILD.gn
View File

@ -38,12 +38,6 @@ ohos_executable("jpeg_hw_decoder_demo") {
"${image_subsystem}/plugins/manager/include/",
"${image_subsystem}/frameworks/innerkitsimpl/stream/include/",
"${image_subsystem}/interfaces/innerkits/include/",
"${image_subsystem}/../../../drivers/peripheral/base/",
"${image_subsystem}/../../../drivers/peripheral/display/interfaces/include/",
"${image_subsystem}/../../../third_party/skia/",
"${image_subsystem}/../../../third_party/skia/include/codec/",
"${image_subsystem}/../../../third_party/skia/include/core/",
"${image_subsystem}/../../../third_party/libjpeg-turbo/",
]
deps = [
"${image_subsystem}/interfaces/innerkits:image_native",
@ -57,9 +51,11 @@ ohos_executable("jpeg_hw_decoder_demo") {
"drivers_interface_display:display_composer_idl_headers",
"drivers_interface_display:libdisplay_buffer_hdi_impl",
"drivers_interface_display:libdisplay_composer_hdi_impl",
"drivers_peripheral_display:hdi_gralloc_client",
"hdf_core:libhdf_utils",
"hdf_core:libhdi",
"hilog:libhilog",
"ipc:ipc_single",
"skia:libjpeg",
]
}

12
frameworks/innerkitsimpl/utils/BUILD.gn
View File

@ -57,14 +57,8 @@ if (use_clang_ios) {
}
include_dirs = [
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include",
"//foundation/multimedia/utils/include",
"//foundation/multimedia/image_framework/plugins/manager/include",
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
"//commonlibrary/c_utils/base/include",
"//foundation/multimedia/media_utils_lite/interfaces/kits",
"//foundation/communication/ipc/utils/include",
"$skia_root/skia",
"${graphic_subsystem}/interfaces/inner_api/surface",
]
sources = [
@ -143,11 +137,8 @@ if (use_clang_ios) {
ohos_static_library("image_utils_static") {
include_dirs = [
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include",
"//foundation/multimedia/utils/include",
"//foundation/multimedia/image_framework/plugins/manager/include",
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
"//commonlibrary/c_utils/base/include",
"$skia_root/skia",
]
sources = [
@ -208,6 +199,9 @@ ohos_static_library("image_utils_static") {
external_deps = [
"c_utils:utils",
"drivers_interface_display:display_commontype_idl_headers",
"graphic_2d:color_manager",
"graphic_surface:surface",
"hilog:libhilog",
"hisysevent:libhisysevent",
"hitrace:hitrace_meter",

27
frameworks/kits/js/common/ndk/BUILD.gn
View File

@ -16,18 +16,13 @@ import("//foundation/multimedia/image_framework/ide/image_decode_config.gni")
SEPARATOR = "/"
BASE_DIR = "$SEPARATOR/foundation"
THIRD_DIR = "$SEPARATOR/third_party"
config("native_public_config") {
include_dirs = [
"include",
"$BASE_DIR/arkui/napi/interfaces/inner_api",
"$BASE_DIR/arkui/napi/interfaces/kits",
"$BASE_DIR/multimedia/image_framework/interfaces/kits/native/include",
"$BASE_DIR/multimedia/image_framework/interfaces/kits/native/include/image",
"$BASE_DIR/multimedia/image_framework/interfaces/innerkits/include",
"$THIRD_DIR/node/src",
"$resource_management_subsystem/interfaces/native/resource/include",
"$BASE_DIR/multimedia/image_framework/frameworks/kits/js/common/pixelmap_ndk",
]
}
@ -42,6 +37,10 @@ ohos_shared_library("image_ndk") {
sources = [ "image_mdk.cpp" ]
public_configs = [ ":native_public_config" ]
deps = [ "$image_subsystem/interfaces/kits/js/common:image" ]
external_deps = [
"graphic_surface:surface",
"napi:ace_napi",
]
innerapi_tags = [ "ndk" ]
subsystem_name = "multimedia"
@ -58,6 +57,12 @@ ohos_shared_library("image_receiver_ndk") {
sources = [ "image_receiver_mdk.cpp" ]
public_configs = [ ":native_public_config" ]
deps = [ "$image_subsystem/interfaces/kits/js/common:image" ]
external_deps = [
"drivers_peripheral_display:hdi_gralloc_client",
"graphic_2d:color_manager",
"graphic_surface:surface",
"napi:ace_napi",
]
innerapi_tags = [ "ndk" ]
subsystem_name = "multimedia"
@ -75,6 +80,11 @@ ohos_shared_library("image_source_ndk") {
public_configs = [ ":native_public_config" ]
deps = [ "$image_subsystem/interfaces/kits/js/common:image" ]
external_deps = [
"napi:ace_napi",
"resource_management:librawfile",
]
innerapi_tags = [ "ndk" ]
subsystem_name = "multimedia"
part_name = "image_framework"
@ -91,6 +101,8 @@ ohos_shared_library("image_packer_ndk") {
public_configs = [ ":native_public_config" ]
deps = [ "$image_subsystem/interfaces/kits/js/common:image" ]
external_deps = [ "napi:ace_napi" ]
innerapi_tags = [ "ndk" ]
subsystem_name = "multimedia"
part_name = "image_framework"
@ -161,7 +173,10 @@ ohos_shared_library("image_packer") {
"$image_subsystem/interfaces/kits/js/common:image",
]
external_deps = [ "c_utils:utils" ]
external_deps = [
"c_utils:utils",
"resource_management:librawfile",
]
innerapi_tags = [ "ndk" ]
subsystem_name = "multimedia"

7
frameworks/kits/js/common/pixelmap_ndk/BUILD.gn
View File

@ -25,9 +25,6 @@ ohos_shared_library("pixelmap_ndk") {
include_dirs = [
"${image_subsystem}/interfaces/innerkits/include/mdkKits",
"include",
"//foundation/arkui/napi/interfaces/inner_api",
"//foundation/arkui/napi/interfaces/kits",
"//third_party/node/src",
]
sources = [
@ -39,6 +36,10 @@ ohos_shared_library("pixelmap_ndk") {
[ "$SUBSYSTEM_DIR/interfaces/innerkits:image_external_config" ]
deps = [ "$SUBSYSTEM_DIR/interfaces/kits/js/common:image" ]
external_deps = [
"graphic_2d:color_manager",
"napi:ace_napi",
]
innerapi_tags = [ "ndk" ]
subsystem_name = "multimedia"

3
frameworks/kits/native/common/ndk/BUILD.gn
View File

@ -40,6 +40,7 @@ ohos_shared_library("ohimage") {
external_deps = [
"c_utils:utils",
"graphic_surface:surface",
"hilog:libhilog",
]
@ -66,6 +67,8 @@ ohos_shared_library("image_receiver") {
external_deps = [
"c_utils:utils",
"drivers_peripheral_display:hdi_gralloc_client",
"graphic_surface:surface",
"hilog:libhilog",
]

47
interfaces/innerkits/BUILD.gn
View File

@ -21,8 +21,6 @@ import("$image_subsystem/plugins/cross/image_native_ios.gni")
config("image_external_config") {
include_dirs = [
"include",
"//utils/system/safwk/native/include",
"//foundation/ability/ability_runtime/interfaces/inner_api/runtime/include/",
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/receiver/include",
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/creator/include",
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/pixelconverter/include",
@ -34,23 +32,12 @@ config("image_external_config") {
"${image_subsystem}/frameworks/innerkitsimpl/accessor/include",
"//foundation/multimedia/image_framework/frameworks/kits/js/common/include",
"//foundation/multimedia/image_framework/interfaces/kits/js/common/include",
"//foundation/multimedia/utils/include",
"//foundation/multimedia/image_framework/plugins/common/libs/image/libjpegplugin",
"${image_subsystem}/plugins/common/libs/image/libextplugin/include",
"//foundation/multimedia/image_framework/plugins/manager/include",
"//foundation/multimedia/image_framework/plugins/manager/include/image",
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
"//foundation/multimedia/image_framework/interfaces/kits/native/include",
"//utils/jni/jnikit/include",
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
"$graphic_surface_root/interfaces/inner_api/surface",
"//foundation/graphic/graphic_2d/interfaces/inner_api/common",
"//foundation/graphic/graphic_2d/interfaces/kits/napi/graphic/color_manager/color_space_object_convertor",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//foundation/graphic/graphic_2d/utils/buffer_handle/export",
"//foundation/graphic/graphic_2d/utils/color_manager/export",
"//drivers/peripheral/display/interfaces/include",
"//drivers/peripheral/base",
"${image_subsystem}/frameworks/kits/js/common/ndk/include",
]
@ -60,12 +47,6 @@ config("image_external_config") {
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include",
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/converter/include",
"${image_subsystem}/plugins/common/libs/image/libextplugin/include/heif_impl/heif_parser",
"$skia_root/skia",
"$skia_root/skia/include/core",
"$skia_root/skia/include/codec",
"$skia_root/skia/third_party/externals/libjpeg-turbo",
"$skia_root/skia/third_party/skcms",
"//third_party/libexif",
]
if (use_mingw_win) {
@ -78,11 +59,6 @@ config("image_external_config") {
"//commonlibrary/c_utils/base/include",
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
]
} else {
include_dirs += [
"//commonlibrary/c_utils/base/include",
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
]
}
}
@ -139,7 +115,6 @@ if (use_clang_android) {
}
}
public_configs = [ ":image_external_config" ]
configs = [ ":image_postproc_config" ]
cflags = [
"-DIMAGE_DEBUG_FLAG",
@ -235,7 +210,6 @@ if (use_clang_android) {
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter",
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils:image_utils",
"//foundation/multimedia/image_framework/plugins/manager:pluginmanager",
"//third_party/ffmpeg:libohosffmpeg",
]
deps += skia_platform
@ -246,14 +220,19 @@ if (use_clang_android) {
external_deps = [
"c_utils:utils",
"drivers_interface_display:display_commontype_idl_headers",
"graphic_2d:color_manager",
"graphic_surface:surface",
"ffmpeg:libohosffmpeg",
"hilog:libhilog",
"hitrace:hitrace_meter",
"ipc:ipc_core",
"napi:ace_napi",
"skia:libjpeg",
"zlib:libz",
]
public_external_deps = [
"drivers_peripheral_display:hdi_gralloc_client",
"graphic_2d:color_manager",
"graphic_surface:surface",
]
if (enable_libexif) {
external_deps += [ "libexif:libexif" ]
}
@ -387,12 +366,14 @@ ohos_static_library("image_static") {
"//foundation/multimedia/image_framework/plugins/manager:pluginmanager",
]
} else {
defines = [ "DUAL_ADAPTER" ]
defines = [
"DUAL_ADAPTER",
"IMAGE_COLORSPACE_FLAG",
]
DUAL_ADAPTER = true
deps = [
"$image_subsystem/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter_static",
"//foundation/arkui/napi:ace_napi",
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils:image_utils",
"//foundation/multimedia/image_framework/plugins/manager:pluginmanager",
]
@ -404,10 +385,16 @@ ohos_static_library("image_static") {
external_deps = [
"c_utils:utils",
"drivers_interface_display:display_commontype_idl_headers",
"drivers_peripheral_display:hdi_gralloc_client",
"ffmpeg:libohosffmpeg",
"graphic_2d:color_manager",
"graphic_surface:surface",
"hilog:libhilog",
"napi:ace_napi",
]
if (enable_libexif) {
external_deps += [ "libexif:libexif" ]
}
}
external_deps += [ "zlib:libz" ]

44
interfaces/kits/js/common/BUILD.gn
View File

@ -13,15 +13,12 @@
import("//build/ohos.gni")
import("//build/ohos/ace/ace.gni")
import("//foundation/graphic/graphic_2d/graphic_config.gni")
import("//foundation/multimedia/image_framework/ide/image_decode_config.gni")
config("image_external_config") {
include_dirs = [
"include",
"//utils/system/safwk/native/include",
"${image_subsystem}/frameworks/kits/js/common/ndk/include",
"//foundation/ability/ability_runtime/interfaces/inner_api/runtime/include/",
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/receiver/include",
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/creator/include",
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/pixelconverter/include",
@ -33,25 +30,11 @@ config("image_external_config") {
"${image_subsystem}/frameworks/innerkitsimpl/accessor/include",
"//foundation/multimedia/image_framework/frameworks/kits/js/common/include",
"//foundation/multimedia/image_framework/interfaces/kits/js/common/include",
"//foundation/multimedia/utils/include",
"//foundation/multimedia/image_framework/plugins/common/libs/image/libjpegplugin",
"//foundation/multimedia/image_framework/plugins/manager/include",
"//foundation/multimedia/image_framework/plugins/manager/include/image",
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
"//foundation/multimedia/image_framework/interfaces/kits/native/include",
"//utils/jni/jnikit/include",
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
"$graphic_surface_root/interfaces/inner_api/surface",
"//foundation/graphic/graphic_2d/interfaces/inner_api/common",
"//foundation/graphic/graphic_2d/interfaces/kits/napi/graphic/color_manager/color_space_object_convertor",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//foundation/graphic/graphic_2d/utils/buffer_handle/export",
"//foundation/graphic/graphic_2d/utils/color_manager/export",
"$resource_management_subsystem/interfaces/native/resource/include",
"//drivers/peripheral/display/interfaces/include",
"//drivers/peripheral/base",
"$skia_root/skia/third_party/externals/libjpeg-turbo",
"$ipc_subsystem/communication/ipc/ipc/native/src/napi_common/include",
]
include_dirs += [
@ -59,13 +42,6 @@ config("image_external_config") {
"//foundation/multimedia/image_framework/plugins/common/libs/image/libjpegplugin/include",
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include",
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/converter/include",
"$skia_root/skia/include/codec",
"$skia_root/skia",
"$skia_root/skia/include/core",
"$skia_root/skia/third_party/libjpeg-turbo",
"$skia_root/skia/third_party/skcms",
"//third_party/libexif",
"//third_party/zlib",
]
if (use_mingw_win) {
@ -86,10 +62,6 @@ config("image_external_config") {
include_dirs -= [
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/receiver/include",
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/creator/include",
"$graphic_surface_root/interfaces/inner_api/surface",
"//foundation/graphic/graphic_2d/interfaces/inner_api/common",
"//foundation/graphic/graphic_2d/utils/buffer_handle/export",
"//foundation/graphic/graphic_2d/utils/color_manager/export",
]
} else if (use_clang_android) {
include_dirs += [
@ -100,15 +72,6 @@ config("image_external_config") {
include_dirs -= [
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/receiver/include",
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/creator/include",
"$graphic_surface_root/interfaces/inner_api/surface",
"//foundation/graphic/graphic_2d/interfaces/inner_api/common",
"//foundation/graphic/graphic_2d/utils/buffer_handle/export",
"//foundation/graphic/graphic_2d/utils/color_manager/export",
]
} else {
include_dirs += [
"//commonlibrary/c_utils/base/include",
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
]
}
}
@ -177,6 +140,9 @@ if (use_clang_ios) {
]
external_deps = [
"drivers_peripheral_display:hdi_gralloc_client",
"graphic_2d:color_manager",
"graphic_surface:surface",
"hilog:libhilog",
"napi:ace_napi",
]
@ -249,6 +215,7 @@ if (use_clang_ios) {
}
external_deps += [
"ability_runtime:runtime",
"c_utils:utils",
"graphic_2d:color_manager",
"graphic_2d:color_space_object_convertor",
@ -259,8 +226,11 @@ if (use_clang_ios) {
"hitrace:hitrace_meter",
"ipc:ipc_napi",
"napi:ace_napi",
"resource_management:librawfile",
]
public_external_deps = [ "graphic_2d:color_manager" ]
if (defined(global_parts_info) &&
defined(global_parts_info.hiviewdfx_hichecker)) {
external_deps += [ "hichecker:libhichecker" ]

1
mock/native/BUILD.gn
View File

@ -39,7 +39,6 @@ config("utils_mock_config") {
visibility = [ ":*" ]
include_dirs = [
"include",
"//foundation/multimedia/utils/include",
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
]
}

2
plugins/common/libs/image/formatagentplugin/BUILD.gn
View File

@ -36,7 +36,6 @@ ohos_shared_library("imageformatagent") {
]
include_dirs = [
"//foundation/multimedia/utils/include",
"//foundation/multimedia/image_framework/plugins/manager/include",
"//foundation/multimedia/image_framework/plugins/manager/include/image",
"//foundation/multimedia/image_framework/plugins/manager/include/pluginbase",
@ -63,7 +62,6 @@ ohos_shared_library("imageformatagent") {
"//foundation/multimedia/image_framework/plugins/manager:pluginmanager_static",
]
} else {
include_dirs += [ "//commonlibrary/c_utils/base/include" ]
deps = [
"//foundation/multimedia/image_framework/plugins/manager:pluginmanager",
]

10
plugins/common/libs/image/libbmpplugin/BUILD.gn
View File

@ -29,7 +29,6 @@ ohos_shared_library("bmpplugin") {
]
include_dirs = [
"//foundation/multimedia/utils/include",
"//foundation/multimedia/image_framework/plugins/manager/include",
"//foundation/multimedia/image_framework/plugins/manager/include/image",
"//foundation/multimedia/image_framework/plugins/manager/include/pluginbase",
@ -37,14 +36,6 @@ ohos_shared_library("bmpplugin") {
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include",
"${image_subsystem}/frameworks/innerkitsimpl/utils/include",
"$skia_root/skia/include/core",
"$skia_root/skia/include/codec",
"$skia_root/skia",
"//foundation/graphic/graphic_2d/utils/color_manager/export",
"$skia_root/skia/include/codec",
"$skia_root/skia",
"$skia_root/skia/include/core",
"//third_party/skia/third_party/skcms",
]
if (use_mingw_win) {
defines = image_decode_windows_defines
@ -83,7 +74,6 @@ ohos_shared_library("bmpplugin") {
"//third_party/bounds_checking_function:libsec_static",
]
} else {
include_dirs += [ "//commonlibrary/c_utils/base/include" ]
deps = [
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils:image_utils",
"//foundation/multimedia/image_framework/plugins/manager:pluginmanager",

2
plugins/common/libs/image/libbmpplugin/include/bmp_decoder.h
View File

@ -18,7 +18,7 @@
#include <cstdint>
#include <string>
#include "SkCodec.h"
#include "include/codec/SkCodec.h"
#include "abs_image_decoder.h"
#include "bmp_stream.h"
#include "plugin_class_base.h"

2
plugins/common/libs/image/libbmpplugin/include/bmp_stream.h
View File

@ -18,7 +18,7 @@
#include <cstdint>
#include <string>
#include "SkStream.h"
#include "include/core/SkStream.h"
#include "input_data_stream.h"
#include "nocopyable.h"

69
plugins/common/libs/image/libextplugin/BUILD.gn
View File

@ -13,11 +13,13 @@
import("//build/ohos.gni")
import("//foundation/multimedia/image_framework/ide/image_decode_config.gni")
third_party_dir = "/third_party"
third_party_root = "/${third_party_dir}"
if (use_mingw_win || use_clang_mac) {
graphic_root = "/${image_sep_f}${image_oundation}/${graphic_multimedia}"
}
if (use_clang_mac) {
third_party_dir = "/third_party"
third_party_root = "/${third_party_dir}"
}
ohos_static_library("exifhelper") {
if (!use_clang_android && !use_clang_ios) {
@ -35,7 +37,6 @@ ohos_static_library("exifhelper") {
"../libjpegplugin/include",
"${image_subsystem}/frameworks/innerkitsimpl/utils/include",
"${image_subsystem}/interfaces/innerkits/include",
"//third_party/libexif",
]
external_deps = [
@ -65,10 +66,7 @@ config("skia_includes") {
]
}
config("third_part_includes") {
include_dirs = [
"../libjpegplugin/include",
"${third_party_root}/libexif",
]
include_dirs = [ "../libjpegplugin/include" ]
}
config("win_config") {
if (use_mingw_win) {
@ -116,10 +114,10 @@ ohos_shared_library("textureEncoderCL") {
} else if (use_clang_mac) {
configs += [ ":mac_config" ]
} else {
deps = [ "//third_party/opencl-headers:libcl" ]
external_deps = [
"c_utils:utils",
"hilog:libhilog",
"opencl-headers:libcl",
]
}
cflags = [ "-O3" ]
@ -168,7 +166,6 @@ ohos_shared_library("extplugin") {
}
configs = [
":plugins_includes",
":skia_includes",
":third_part_includes",
]
include_dirs = [
@ -179,20 +176,6 @@ ohos_shared_library("extplugin") {
"${image_subsystem}/interfaces/innerkits/include",
"${image_subsystem}/frameworks/innerkitsimpl/utils/include",
"${image_subsystem}/frameworks/innerkitsimpl/accessor/include",
"${graphic_subsystem}/interfaces/inner_api/surface",
"${image_subsystem}/../../../drivers/peripheral/base/",
"${image_subsystem}/../../../drivers/peripheral/display/interfaces/include/",
"${image_subsystem}/../../../third_party/skia/",
"${image_subsystem}/../../../third_party/skia/include/codec/",
"${image_subsystem}/../../../third_party/skia/include/core/",
"${image_subsystem}/../../../third_party/libjpeg-turbo/",
"//third_party/astc-encoder/Source",
"//third_party/skia",
"//third_party/skia/include/codec",
"//third_party/skia/include/core",
"//third_party/libjpeg-turbo",
"${image_subsystem}/../../../drivers/peripheral/base",
"${image_subsystem}/../../../drivers/peripheral/display/interfaces/include",
]
if (use_mingw_win) {
configs += [ ":win_config" ]
@ -215,7 +198,6 @@ ohos_shared_library("extplugin") {
"${third_party_root}/bounds_checking_function:libsec_static",
]
} else {
include_dirs += [ "${commonlibrary_subsystem}/base/include" ]
defines = []
deps = [
":exifhelper",
@ -224,29 +206,31 @@ ohos_shared_library("extplugin") {
"${image_subsystem}/frameworks/innerkitsimpl/utils:image_utils",
"${image_subsystem}/interfaces/innerkits:image_native",
"${image_subsystem}/plugins/manager:pluginmanager",
"//third_party/astc-encoder:astc_encoder_shared",
]
if (defined(global_parts_info) &&
defined(global_parts_info.open_source_libyuv)) {
defines += [ "ENABLE_ASTC_ENCODE_BASED_GPU" ]
deps += [
":textureEncoderCL",
"//third_party/opencl-headers:libcl",
]
}
deps += skia_platform
external_deps = [
"astc-encoder:astc_encoder_shared",
"c_utils:utils",
"drivers_interface_display:display_commontype_idl_headers",
"drivers_peripheral_display:hdi_gralloc_client",
"graphic_2d:color_manager",
"graphic_surface:surface",
"hilog:libhilog",
"hisysevent:libhisysevent",
"libexif:libexif",
"libjpeg-turbo:turbojpeg",
"skia:libjpeg",
"zlib:libz",
]
if (defined(global_parts_info) &&
defined(global_parts_info.open_source_libyuv)) {
defines += [ "ENABLE_ASTC_ENCODE_BASED_GPU" ]
deps += [ ":textureEncoderCL" ]
external_deps += [ "opencl-headers:libcl" ]
}
if (defined(global_parts_info) &&
defined(global_parts_info.graphic_graphic_2d_ext)) {
defines += [ "SUT_ENCODE_ENABLE" ]
@ -269,13 +253,11 @@ ohos_shared_library("extplugin") {
if (enable_heif_hw_decode) {
defines += [ "HEIF_HW_DECODE_ENABLE" ]
include_dirs += [
"include/heif_impl/heif_parser",
"//third_party/openmax/api/1.1.2",
]
include_dirs += [ "include/heif_impl/heif_parser" ]
external_deps += [
"drivers_interface_codec:codec_idl_headers",
"drivers_peripheral_codec:libcodec_hdi_omx_client",
"openmax:libopenmax_static",
]
}
}
@ -378,13 +360,6 @@ ohos_shared_library("heifimpl") {
"${image_subsystem}/interfaces/innerkits/include",
]
if (enable_heif_hw_decode) {
include_dirs += [
"//third_party/ffmpeg",
"//third_party/openmax/api/1.1.2",
]
}
sources = [ "src/heif_impl/HeifDecoderImpl.cpp" ]
if (enable_heif_hw_decode) {
@ -409,10 +384,6 @@ ohos_shared_library("heifimpl") {
"${image_subsystem}/frameworks/innerkitsimpl/utils:image_utils",
]
if (enable_heif_hw_decode) {
deps += [ "//third_party/ffmpeg:libohosffmpeg" ]
}
external_deps = [
"graphic_2d:color_manager",
"graphic_surface:surface",
@ -425,9 +396,11 @@ ohos_shared_library("heifimpl") {
"drivers_interface_codec:codec_idl_headers",
"drivers_interface_codec:libcodec_proxy_2.0",
"drivers_peripheral_codec:libcodec_hdi_omx_client",
"ffmpeg:libohosffmpeg",
"hdf_core:libhdi",
"init:libbegetutil",
"ipc:ipc_core",
"openmax:libopenmax_static",
"qos_manager:qos",
]
}

2
plugins/common/libs/image/libextplugin/include/ext_decoder.h
View File

@ -19,7 +19,6 @@
#include <cstdint>
#include <string>
#include "SkCodec.h"
#include "abs_image_decoder.h"
#if !defined(IOS_PLATFORM) && !defined(ANDROID_PLATFORM)
#include "display_type.h"
@ -27,6 +26,7 @@
#endif
#include "ext_stream.h"
#include "exif_info.h"
#include "include/codec/SkCodec.h"
#include "nocopyable.h"
#include "plugin_class_base.h"
#include "jpeg_yuv_decoder/jpeg_decoder_yuv.h"

4
plugins/common/libs/image/libextplugin/include/ext_encoder.h
View File

@ -20,9 +20,9 @@
#include "abs_image_encoder.h"
#include "plugin_class_base.h"
#include "SkEncodedImageFormat.h"
#include "ext_wstream.h"
#include "SkBitmap.h"
#include "include/core/SkBitmap.h"
#include "include/core/SkEncodedImageFormat.h"
#include "surface_buffer.h"
namespace OHOS {

2
plugins/common/libs/image/libextplugin/include/ext_stream.h
View File

@ -18,7 +18,7 @@
#include <cstddef>
#include "SkStream.h"
#include "include/core/SkStream.h"
#include "input_data_stream.h"
#include "nocopyable.h"

2
plugins/common/libs/image/libextplugin/include/ext_wstream.h
View File

@ -18,7 +18,7 @@
#include <cstddef>
#include <vector>
#include "SkStream.h"
#include "include/core/SkStream.h"
#include "output_data_stream.h"
#include "nocopyable.h"
#include "buffer_metadata_stream.h"

2
plugins/common/libs/image/libextplugin/include/hardware/jpeg_hw_decoder.h
View File

@ -21,8 +21,8 @@
#include "v1_0/include/idisplay_buffer.h"
#include "image/image_plugin_type.h"
#include "image/input_data_stream.h"
#include "include/codec/SkCodec.h"
#include "image_log.h"
#include "SkCodec.h"
#include "jpeglib.h"
#undef LOG_DOMAIN

3
plugins/common/libs/image/libextplugin/src/ext_encoder.cpp
View File

@ -17,8 +17,7 @@
#include <algorithm>
#include <map>
#include "SkBitmap.h"
#include "SkImageEncoder.h"
#include "include/core/SkImageEncoder.h"
#ifdef IMAGE_COLORSPACE_FLAG
#include "color_space.h"
#endif

15
plugins/common/libs/image/libgifplugin/BUILD.gn
View File

@ -28,20 +28,12 @@ ohos_shared_library("gifplugin") {
]
include_dirs = [
"//foundation/multimedia/utils/include",
"//foundation/multimedia/image_framework/plugins/manager/include",
"//foundation/multimedia/image_framework/plugins/manager/include/image",
"//foundation/multimedia/image_framework/plugins/manager/include/pluginbase",
"//foundation/multimedia/image_framework/plugins/common/libs/image/libgifplugin/include",
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include",
#"//third_party/giflib",
"//foundation/graphic/graphic_2d/utils/color_manager/export",
"$skia_root/skia/include/codec",
"$skia_root/skia",
"$skia_root/skia/include/core",
"//third_party/skia/third_party/skcms",
]
if (use_mingw_win) {
@ -51,8 +43,6 @@ ohos_shared_library("gifplugin") {
deps = [
"//foundation/multimedia/image_framework/mock/native:log_mock_static",
"//foundation/multimedia/image_framework/plugins/manager:pluginmanager_static",
#"//third_party/giflib:gif_static",
]
} else if (use_clang_mac) {
defines = image_decode_mac_defines
@ -64,16 +54,11 @@ ohos_shared_library("gifplugin") {
"//foundation/multimedia/image_framework/mock/native:log_mock_static",
"//foundation/multimedia/image_framework/plugins/manager:pluginmanager_static",
"//third_party/bounds_checking_function:libsec_static",
#"//third_party/giflib:gif_static",
]
} else {
include_dirs += [ "//commonlibrary/c_utils/base/include" ]
deps = [
"${image_subsystem}/frameworks/innerkitsimpl/utils:image_utils",
"//foundation/multimedia/image_framework/plugins/manager:pluginmanager",
#"//third_party/giflib:libgif",
]
external_deps = [

14
plugins/common/libs/image/libjpegplugin/BUILD.gn
View File

@ -12,7 +12,6 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
import("//foundation/multimedia/image_framework/ide/image_decode_config.gni")
ohos_shared_library("jpegplugin") {
@ -38,7 +37,6 @@ ohos_shared_library("jpegplugin") {
]
include_dirs = [
"//foundation/multimedia/utils/include",
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
"//foundation/multimedia/image_framework/plugins/manager/include",
"//foundation/multimedia/image_framework/plugins/manager/include/image",
@ -46,14 +44,6 @@ ohos_shared_library("jpegplugin") {
"//foundation/multimedia/image_framework/plugins/common/libs/image/libjpegplugin/include",
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include",
"//foundation/graphic/graphic_2d/utils/color_manager/export",
"$skia_root/skia/include/codec",
"$skia_root/skia",
"$skia_root/skia/include/core",
"//third_party/skia/third_party/libjpeg-turbo",
"//third_party/skia/third_party/externals/libjpeg-turbo",
"//third_party/skia/third_party/skcms",
"//third_party/libexif",
]
if (use_mingw_win) {
@ -91,17 +81,14 @@ ohos_shared_library("jpegplugin") {
} else {
defines = [ "DUAL_ADAPTER" ]
DUAL_ADAPTER = true
include_dirs += [ "//commonlibrary/c_utils/base/include" ]
sources += [
"//foundation/multimedia/image_framework/plugins/common/libs/image/libjpegplugin/src/jpeg_encoder.cpp",
"//third_party/skia/third_party/externals/libjpeg-turbo/jdicc.c",
]
deps = [
#"//third_party/skia/third_party/libjpeg-turbo:libjpeg",
"${image_subsystem}/frameworks/innerkitsimpl/utils:image_utils",
"//foundation/multimedia/image_framework/interfaces/innerkits:image_native",
"//foundation/multimedia/image_framework/plugins/manager:pluginmanager",
"//third_party/skia/third_party/libjpeg-turbo:libjpeg",
]
deps += skia_skcms
deps += skia_platform
@ -122,6 +109,7 @@ ohos_shared_library("jpegplugin") {
"hilog:libhilog",
"hitrace:hitrace_meter",
"libexif:libexif",
"skia:libjpeg",
]
}

22
plugins/common/libs/image/libpngplugin/BUILD.gn
View File

@ -29,25 +29,15 @@ ohos_shared_library("pngplugin") {
"//foundation/multimedia/image_framework/plugins/common/libs/image/libpngplugin/src/png_ninepatch_res.cpp",
]
include_dirs = [
"//foundation/multimedia/utils/include",
"//foundation/multimedia/image_framework/plugins/manager/include",
"//foundation/multimedia/image_framework/plugins/manager/include/image",
"//foundation/multimedia/image_framework/plugins/manager/include/pluginbase",
"//foundation/multimedia/image_framework/plugins/common/libs/image/libpngplugin/include",
"//third_party/zlib",
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include",
"//third_party/skia/third_party/libjpeg-turbo",
"//foundation/graphic/graphic_2d/utils/color_manager/export",
"$skia_root/skia/include/codec",
"$skia_root/skia",
"$skia_root/skia/include/core",
"//third_party/skia/third_party/skcms",
]
deps = [
"//third_party/libpng:png_static",
"//third_party/zlib:shared_libz",
]
deps = []
external_deps = [ "zlib:shared_libz" ]
if (use_mingw_win) {
defines = image_decode_windows_defines
@ -77,24 +67,20 @@ ohos_shared_library("pngplugin") {
} else {
defines = [ "DUAL_ADAPTER" ]
DUAL_ADAPTER = true
include_dirs += [
"//commonlibrary/c_utils/base/include",
"//third_party/libpng",
]
deps += [
"${image_subsystem}/frameworks/innerkitsimpl/utils:image_utils",
"//foundation/multimedia/image_framework/plugins/manager:pluginmanager",
"//third_party/libpng:png_static",
]
if (DUAL_ADAPTER) {
} else {
deps += [ "//third_party/libpng:libpng" ]
}
external_deps = [
external_deps += [
"c_utils:utils",
"graphic_2d:color_manager",
"graphic_surface:surface",
"hilog:libhilog",
"libpng:libpng",
]
}
cflags = [ "-DIMAGE_COLORSPACE_FLAG" ]

9
plugins/common/libs/image/librawplugin/BUILD.gn
View File

@ -34,7 +34,6 @@ ohos_shared_library("rawplugin") {
]
include_dirs = [
"//foundation/graphic/graphic_2d/utils/color_manager/export",
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/include",
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include",
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
@ -43,10 +42,6 @@ ohos_shared_library("rawplugin") {
"//foundation/multimedia/image_framework/plugins/manager/include",
"//foundation/multimedia/image_framework/plugins/manager/include/image",
"//foundation/multimedia/image_framework/plugins/manager/include/pluginbase",
"//third_party/libexif",
"//third_party/skia",
"//third_party/skia/third_party/externals/libjpeg-turbo",
"//foundation/graphic/graphic_2d/utils/color_manager/export",
]
if (use_mingw_win) {
@ -68,7 +63,6 @@ ohos_shared_library("rawplugin") {
"//foundation/multimedia/image_framework/interfaces/innerkits:image_native",
"//foundation/multimedia/image_framework/plugins/common/libs/image/libjpegplugin:jpegplugin",
"//foundation/multimedia/image_framework/plugins/manager:pluginmanager",
"//third_party/skia/third_party/piex",
]
if (DUAL_ADAPTER) {
@ -77,6 +71,9 @@ ohos_shared_library("rawplugin") {
external_deps = [
"graphic_2d:color_manager",
"hilog:libhilog",
"libexif:libexif",
"skia:libjpeg",
"skia:piex",
]
}

2
plugins/common/libs/image/libsvgplugin/BUILD.gn
View File

@ -29,14 +29,12 @@ ohos_shared_library("svgplugin") {
]
include_dirs = [
"$graphic_subsystem/utils/color_manager/export",
"$image_subsystem/plugins/manager/include",
"$image_subsystem/plugins/manager/include/image",
"$image_subsystem/plugins/manager/include/pluginbase",
"$image_subsystem/plugins/common/libs/image/libsvgplugin/include",
"$image_subsystem/interfaces/innerkits/include",
"$image_subsystem/frameworks/innerkitsimpl/utils/include",
"$skia_root/skia",
]
deps = [

14
plugins/common/libs/image/libwebpplugin/BUILD.gn
View File

@ -31,23 +31,11 @@ ohos_shared_library("webpplugin") {
include_dirs = [
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include",
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/pixelconverter/include",
"//foundation/multimedia/utils/include",
"//foundation/multimedia/image_framework/plugins/manager/include",
"//foundation/multimedia/image_framework/plugins/manager/include/image",
"//foundation/multimedia/image_framework/plugins/manager/include/pluginbase",
"//foundation/multimedia/image_framework/plugins/common/libs/image/libwebpplugin/include",
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
"//third_party/skia/third_party/externals/libwebp/src",
"$skia_root/skia/include/core",
"$skia_root/skia/include/encode",
"$skia_root/skia",
"$skia_root/skia/src/ports/skia_ohos",
"$skia_root/skia/src/ports",
"$skia_root/skia/src/images",
"//third_party/expat/lib",
"$skia_root/skia/include/private",
"//third_party/skia/third_party/externals/freetype/include/freetype",
"//foundation/graphic/graphic_2d/utils/color_manager/export",
]
if (use_mingw_win) {
defines = image_decode_windows_defines
@ -61,7 +49,6 @@ ohos_shared_library("webpplugin") {
} else {
defines = [ "DUAL_ADAPTER" ]
DUAL_ADAPTER = true
include_dirs += [ "//commonlibrary/c_utils/base/include" ]
deps = [
"${image_subsystem}/frameworks/innerkitsimpl/utils:image_utils",
@ -79,6 +66,7 @@ ohos_shared_library("webpplugin") {
"graphic_2d:color_manager",
"graphic_surface:surface",
"hilog:libhilog",
"skia:libwebp",
]
}

3
plugins/common/libs/image/libwebpplugin/include/webp_encoder.h
View File

@ -19,8 +19,7 @@
#include "plugin_class_base.h"
#include "webp/encode.h"
#include "src/images/SkImageEncoderFns.h"
#include "SkImageEncoderFns.h"
#include "SkStream.h"
#include "include/core/SkStream.h"
namespace OHOS {
namespace ImagePlugin {
class WebpEncoder : public AbsImageEncoder, public OHOS::MultimediaPlugin::PluginClassBase {

1
plugins/cross/image_native_android.gni
View File

@ -12,7 +12,6 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
import("//foundation/multimedia/image_framework/ide/image_decode_config.gni")
image_native_android_cflags = [

1
plugins/cross/image_native_ios.gni
View File

@ -12,7 +12,6 @@
# limitations under the License.
import("//build/ohos.gni")
import("//foundation/arkui/ace_engine/ace_config.gni")
import("//foundation/multimedia/image_framework/ide/image_decode_config.gni")
image_native_ios_cflags = [

12
plugins/manager/BUILD.gn
View File

@ -109,9 +109,6 @@ if (use_clang_ios) {
"//foundation/multimedia/image_framework/plugins/manager/src/thirdpartyadp/gstreamer",
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include",
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
"//foundation/multimedia/utils/include",
"//third_party/json/single_include/nlohmann",
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
"$image_subsystem/mock/native/include/log",
]
@ -138,14 +135,13 @@ if (use_clang_ios) {
"//foundation/multimedia/image_framework/mock/native:log_mock_static",
]
} else {
include_dirs += [ "//commonlibrary/c_utils/base/include" ]
ldflags = [ "-Wl,-Bsymbolic" ]
external_deps = [
"c_utils:utils",
"graphic_2d:color_manager",
"hilog:libhilog",
"json:nlohmann_json_static",
]
}
@ -182,11 +178,8 @@ ohos_static_library("pluginmanager_static") {
"//foundation/multimedia/image_framework/plugins/manager/src/framework",
"//foundation/multimedia/image_framework/plugins/manager/src/pluginbase",
"//foundation/multimedia/image_framework/plugins/manager/src/thirdpartyadp/gstreamer",
"//foundation/multimedia/utils/include",
"//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include",
"//foundation/multimedia/image_framework/interfaces/innerkits/include",
"//third_party/json/single_include/nlohmann",
"//base/hiviewdfx/hilog/interfaces/native/innerkits/include",
]
if (use_mingw_win) {
@ -221,14 +214,13 @@ ohos_static_library("pluginmanager_static") {
"//commonlibrary/c_utils/base:utils",
]
} else {
include_dirs += [ "//commonlibrary/c_utils/base/include" ]
ldflags = [ "-Wl,-Bsymbolic" ]
external_deps = [
"c_utils:utils",
"graphic_2d:color_manager",
"hilog:libhilog",
"json:nlohmann_json_static",
]
}
subsystem_name = "multimedia"