diff --git a/bundle.json b/bundle.json index 2fa5122..4eb0176 100644 --- a/bundle.json +++ b/bundle.json @@ -5,7 +5,7 @@ "license": "Apache License 2.0", "publishAs": "code-segment", "segment": { - "destPath": "foundation/multimedia/image_standard" + "destPath": "foundation/multimedia/image_framework" }, "dirs": {}, "scripts": {}, @@ -43,8 +43,8 @@ }, "build": { "sub_component": [ - "//foundation/multimedia/image_standard:image_framework", - "//foundation/multimedia/image_standard:plugins" + "//foundation/multimedia/image_framework:image_framework", + "//foundation/multimedia/image_framework:plugins" ], "inner_kits": [ { @@ -60,9 +60,9 @@ "decode_listener.h", "pixel_map_parcel.h" ], - "header_base": "//foundation/multimedia/image_standard/interfaces/innerkits/include" + "header_base": "//foundation/multimedia/image_framework/interfaces/innerkits/include" }, - "name": "//foundation/multimedia/image_standard/interfaces/innerkits:image_native" + "name": "//foundation/multimedia/image_framework/interfaces/innerkits:image_native" }, { "header": { @@ -72,9 +72,9 @@ "native_module_ohos_image.h", "pixel_map_napi.h" ], - "header_base": "//foundation/multimedia/image_standard/interfaces/kits/js/common/include" + "header_base": "//foundation/multimedia/image_framework/interfaces/kits/js/common/include" }, - "name": "//foundation/multimedia/image_standard/interfaces/innerkits:image" + "name": "//foundation/multimedia/image_framework/interfaces/innerkits:image" } ] } diff --git a/frameworks/innerkitsimpl/pixelconverter/BUILD.gn b/frameworks/innerkitsimpl/pixelconverter/BUILD.gn index ebd0eac..137afe1 100644 --- a/frameworks/innerkitsimpl/pixelconverter/BUILD.gn +++ b/frameworks/innerkitsimpl/pixelconverter/BUILD.gn @@ -12,14 +12,14 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/multimedia/image_standard/ide/image_decode_config.gni") +import("//foundation/multimedia/image_framework/ide/image_decode_config.gni") config("pixelconvertadapter_public_config") { visibility = [ ":*" ] include_dirs = [ "//foundation/multimedia/utils/include", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/pixelconverter/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/utils/lite/interfaces/kits", @@ -37,7 +37,7 @@ config("pixelconvertadapter_public_config") { if (use_mingw_win) { include_dirs += [ - "//foundation/multimedia/image_standard/mock/native/include", + "//foundation/multimedia/image_framework/mock/native/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//foundation/communication/ipc/utils/include", "//third_party/flutter/skia/include/core", @@ -52,7 +52,7 @@ config("pixelconvertadapter_public_config") { ] } else if (use_clang_mac) { include_dirs += [ - "//foundation/multimedia/image_standard/mock/native/include", + "//foundation/multimedia/image_framework/mock/native/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//third_party/flutter/skia/include/core", "//third_party/flutter/skia/include/encode", @@ -84,7 +84,7 @@ config("pixelconvertadapter_public_config") { } ohos_shared_library("pixelconvertadapter") { - sources = [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/pixelconverter/src/pixel_convert_adapter.cpp" ] + sources = [ "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/pixelconverter/src/pixel_convert_adapter.cpp" ] public_configs = [ ":pixelconvertadapter_public_config" ] @@ -93,19 +93,19 @@ ohos_shared_library("pixelconvertadapter") { deps = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//foundation/communication/ipc/utils/include", - "//foundation/multimedia/image_standard/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", "//third_party/flutter/build/skia:ace_skia_windows", "//utils/jni:utils_jnikit_win", ] } else if (use_clang_mac) { defines = image_decode_mac_defines deps = [ - "//foundation/multimedia/image_standard/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", "//third_party/flutter/build/skia:ace_skia_mac", ] } else { deps = [ - "//foundation/multimedia/image_standard/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", "//third_party/flutter/build/skia:ace_skia_ohos", ] @@ -118,24 +118,24 @@ ohos_shared_library("pixelconvertadapter") { } ohos_static_library("pixelconvertadapter_static") { - sources = [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/pixelconverter/src/pixel_convert_adapter.cpp" ] + sources = [ "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/pixelconverter/src/pixel_convert_adapter.cpp" ] public_configs = [ ":pixelconvertadapter_public_config" ] if (use_mingw_win) { defines = image_decode_windows_defines deps = [ - "//foundation/multimedia/image_standard/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", "//third_party/flutter/build/skia:ace_skia_windows", ] } else if (use_clang_mac) { defines = image_decode_mac_defines deps = [ - "//foundation/multimedia/image_standard/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", "//third_party/flutter/build/skia:ace_skia_mac", ] } else { deps = [ - "//foundation/multimedia/image_standard/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", "//third_party/flutter/build/skia:ace_skia_ohos", ] diff --git a/frameworks/innerkitsimpl/test/BUILD.gn b/frameworks/innerkitsimpl/test/BUILD.gn index f2ca0f7..db59147 100644 --- a/frameworks/innerkitsimpl/test/BUILD.gn +++ b/frameworks/innerkitsimpl/test/BUILD.gn @@ -19,18 +19,18 @@ ohos_unittest("imagepixelmaptest") { module_out_path = module_output_path include_dirs = [ - "//foundation/multimedia/image_standard/interfaces/innerkits/include", + "//foundation/multimedia/image_framework/interfaces/innerkits/include", "//foundation/multimedia/utils/include", "//third_party/googletest/googletest/include", "//commonlibrary/c_utils/base/include", - "//foundation/multimedia/image_standard/adapter/frameworks/bitmapconverter/native/include", + "//foundation/multimedia/image_framework/adapter/frameworks/bitmapconverter/native/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", ] - sources = [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/test/unittest/image_pixel_map_test.cpp" ] + sources = [ "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/test/unittest/image_pixel_map_test.cpp" ] deps = [ - # "//foundation/multimedia/image_standard/adapter/frameworks/bitmapconverter/native:bitmapconverter", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", + # "//foundation/multimedia/image_framework/adapter/frameworks/bitmapconverter/native:bitmapconverter", + "//foundation/multimedia/image_framework/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] @@ -44,24 +44,24 @@ ohos_unittest("imagepixelmapparceltest") { module_out_path = module_output_path include_dirs = [ - "//foundation/multimedia/image_standard/interfaces/innerkits/include", + "//foundation/multimedia/image_framework/interfaces/innerkits/include", "//foundation/multimedia/utils/include", "//third_party/googletest/googletest/include", "//commonlibrary/c_utils/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", - "//foundation/multimedia/image_standard/mock/native/include", + "//foundation/multimedia/image_framework/mock/native/include", ] sources = [ "./unittest/image_pixel_map_parcel_test.cpp" ] deps = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", + "//foundation/multimedia/image_framework/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", - # "//foundation/multimedia/image_standard/mock/native:utils_mock_static", - # "//foundation/multimedia/image_standard/mock/native:log_mock_static", + # "//foundation/multimedia/image_framework/mock/native:utils_mock_static", + # "//foundation/multimedia/image_framework/mock/native:log_mock_static", ] external_deps = [ "c_utils:utils", @@ -69,7 +69,7 @@ ohos_unittest("imagepixelmapparceltest") { "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", - #"//foundation/multimedia/image_standard/interfaces/innerkits:image_native", + #"//foundation/multimedia/image_framework/interfaces/innerkits:image_native", ] } @@ -78,33 +78,33 @@ ohos_unittest("imagesourcetest") { module_out_path = module_output_path include_dirs = [ - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/include", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils/include", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/converter/include", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include", + "//foundation/multimedia/image_framework/interfaces/innerkits/include", "//foundation/multimedia/utils/include", "//third_party/googletest/googletest/include", "//commonlibrary/c_utils/base/include", - "//foundation/multimedia/image_standard/plugins/manager/include", + "//foundation/multimedia/image_framework/plugins/manager/include", ] sources = [ - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/test/unittest/image_source_gif_test.cpp", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/test/unittest/image_source_jpeg_test.cpp", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/test/unittest/image_source_png_test.cpp", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/test/unittest/image_source_util.cpp", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/test/unittest/image_source_webp_test.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/test/unittest/image_source_gif_test.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/test/unittest/image_source_jpeg_test.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/test/unittest/image_source_png_test.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/test/unittest/image_source_util.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/test/unittest/image_source_webp_test.cpp", ] if (DUAL_ADAPTER) { sources += [ - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/test/unittest/image_source_bmp_test.cpp", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/test/unittest/image_source_raw_test.cpp", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/test/unittest/image_source_wbmp_test.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/test/unittest/image_source_bmp_test.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/test/unittest/image_source_raw_test.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/test/unittest/image_source_wbmp_test.cpp", ] } deps = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils:image_utils", + "//foundation/multimedia/image_framework/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] @@ -112,25 +112,24 @@ ohos_unittest("imagesourcetest") { external_deps = [ "c_utils:utils" ] # external_deps = [ "hiviewdfx_hilog_native:libhilog" ] - resource_config_file = - "//foundation/multimedia/image_standard/test/resource/image/ohos_test.xml" + resource_config_file = "//foundation/multimedia/image_framework/test/resource/image/ohos_test.xml" } ohos_unittest("colorconvertertest") { module_out_path = module_output_path include_dirs = [ - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/include", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/converter/include", + "//foundation/multimedia/image_framework/interfaces/innerkits/include", "//foundation/multimedia/utils/include", "//third_party/googletest/googletest/include", "//commonlibrary/c_utils/base/include", - "//foundation/multimedia/image_standard/plugins/manager/include", + "//foundation/multimedia/image_framework/plugins/manager/include", ] - sources = [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/test/unittest/color_converter_test.cpp" ] + sources = [ "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/test/unittest/color_converter_test.cpp" ] deps = [ - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", + "//foundation/multimedia/image_framework/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] @@ -144,19 +143,19 @@ ohos_unittest("transformtest") { module_out_path = module_output_path include_dirs = [ - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils/include", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/include", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/converter/include", + "//foundation/multimedia/image_framework/interfaces/innerkits/include", "//foundation/multimedia/utils/include", "//third_party/googletest/googletest/include", "//commonlibrary/c_utils/base/include", - "//foundation/multimedia/image_standard/plugins/manager/include", + "//foundation/multimedia/image_framework/plugins/manager/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", ] - sources = [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/test/unittest/image_transform_test.cpp" ] + sources = [ "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/test/unittest/image_transform_test.cpp" ] deps = [ - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", + "//foundation/multimedia/image_framework/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] @@ -169,10 +168,10 @@ ohos_unittest("imagecolorspacetest") { module_out_path = module_output_path include_dirs = [ - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/include", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils/include", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", - "//foundation/multimedia/image_standard/plugins/manager/include", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/converter/include", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include", + "//foundation/multimedia/image_framework/interfaces/innerkits/include", + "//foundation/multimedia/image_framework/plugins/manager/include", "//foundation/multimedia/utils/include", "//foundation/graphic/graphic_2d/utils/color_manager/export", "//third_party/googletest/googletest/include", @@ -185,20 +184,19 @@ ohos_unittest("imagecolorspacetest") { ] sources = [ - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/test/unittest/image_color_space_test.cpp", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/test/unittest/image_source_util.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/test/unittest/image_color_space_test.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/test/unittest/image_source_util.cpp", ] deps = [ "//base/hiviewdfx/hilog/interfaces/native/innerkits:libhilog", "//foundation/graphic/graphic_2d/utils/color_manager:color_manager", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils:image_utils", + "//foundation/multimedia/image_framework/interfaces/innerkits:image_native", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", ] - resource_config_file = - "//foundation/multimedia/image_standard/test/resource/image/ohos_test.xml" + resource_config_file = "//foundation/multimedia/image_framework/test/resource/image/ohos_test.xml" external_deps = [ "c_utils:utils" ] } diff --git a/frameworks/innerkitsimpl/utils/BUILD.gn b/frameworks/innerkitsimpl/utils/BUILD.gn index 39f6d58..6aa996d 100644 --- a/frameworks/innerkitsimpl/utils/BUILD.gn +++ b/frameworks/innerkitsimpl/utils/BUILD.gn @@ -12,50 +12,50 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/multimedia/image_standard/ide/image_decode_config.gni") +import("//foundation/multimedia/image_framework/ide/image_decode_config.gni") ohos_shared_library("image_utils") { include_dirs = [ - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils/include", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include", "//foundation/multimedia/utils/include", - "//foundation/multimedia/image_standard/plugins/manager/include", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", + "//foundation/multimedia/image_framework/plugins/manager/include", + "//foundation/multimedia/image_framework/interfaces/innerkits/include", "//commonlibrary/c_utils/base/include", "//foundation/multimedia/utils/lite/interfaces/kits", "//foundation/communication/ipc/utils/include", ] sources = [ - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils/src/image_trace.cpp", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils/src/image_utils.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/src/image_trace.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/src/image_utils.cpp", ] if (use_mingw_win) { defines = image_decode_windows_defines - sources -= [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils/src/image_trace.cpp" ] + sources -= [ "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/src/image_trace.cpp" ] include_dirs += - [ "//foundation/multimedia/image_standard/mock/native/include" ] + [ "//foundation/multimedia/image_framework/mock/native/include" ] deps = [ - "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager_static", ] } else if (use_clang_mac) { defines = image_decode_mac_defines - sources -= [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils/src/image_trace.cpp" ] + sources -= [ "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/src/image_trace.cpp" ] include_dirs += [ - "//foundation/multimedia/image_standard/mock/native/include", + "//foundation/multimedia/image_framework/mock/native/include", "//third_party/bounds_checking_function/include", ] deps = [ - "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager_static", "//third_party/bounds_checking_function:libsec_static", ] } else { defines = [ "DUAL_ADAPTER" ] deps = [ - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", ] external_deps = [ @@ -72,38 +72,38 @@ ohos_shared_library("image_utils") { ohos_static_library("image_utils_static") { include_dirs = [ - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils/include", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include", "//foundation/multimedia/utils/include", - "//foundation/multimedia/image_standard/plugins/manager/include", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", + "//foundation/multimedia/image_framework/plugins/manager/include", + "//foundation/multimedia/image_framework/interfaces/innerkits/include", "//commonlibrary/c_utils/base/include", ] - sources = [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils/src/image_utils.cpp" ] + sources = [ "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/src/image_utils.cpp" ] if (use_mingw_win) { defines = image_decode_windows_defines include_dirs += - [ "//foundation/multimedia/image_standard/mock/native/include" ] + [ "//foundation/multimedia/image_framework/mock/native/include" ] deps = [ - "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager_static", ] } else if (use_clang_mac) { defines = image_decode_mac_defines include_dirs += [ - "//foundation/multimedia/image_standard/mock/native/include", + "//foundation/multimedia/image_framework/mock/native/include", "//third_party/bounds_checking_function/include", ] deps = [ - "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager_static", "//third_party/bounds_checking_function:libsec_static", ] } else { - sources += [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils/src/image_trace.cpp" ] + sources += [ "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/src/image_trace.cpp" ] deps = [ - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", ] external_deps = [ diff --git a/frameworks/kits/js/common/pixelmap_ndk/BUILD.gn b/frameworks/kits/js/common/pixelmap_ndk/BUILD.gn index 43be9ab..d30a91d 100644 --- a/frameworks/kits/js/common/pixelmap_ndk/BUILD.gn +++ b/frameworks/kits/js/common/pixelmap_ndk/BUILD.gn @@ -13,7 +13,7 @@ import("//build/ohos.gni") -SUBSYSTEM_DIR = "//foundation/multimedia/image_standard" +SUBSYSTEM_DIR = "//foundation/multimedia/image_framework" ohos_shared_library("pixelmap_ndk") { include_dirs = [ diff --git a/ide/BUILD.gn b/ide/BUILD.gn index d9ab8aa..7543295 100644 --- a/ide/BUILD.gn +++ b/ide/BUILD.gn @@ -13,26 +13,26 @@ import("//build/config/ohos/rules.gni") import("//build/ohos.gni") -import("//foundation/multimedia/image_standard/ide/image_decode_config.gni") +import("//foundation/multimedia/image_framework/ide/image_decode_config.gni") group("image_decode_only") { if (host_os == "mac") { deps = [ - "//foundation/multimedia/image_standard/frameworks/jni/imagesource:image_source_jni(${mac_buildtool})", - "//foundation/multimedia/image_standard/frameworks/jni/incrementalpixelmap:incremental_pixelmap_jni(${mac_buildtool})", - "//foundation/multimedia/image_standard/frameworks/jni/pixelmap:pixelmap_jni(${mac_buildtool})", - "//foundation/multimedia/image_standard/interfaces/innerkits:image(${mac_buildtool})", - "//foundation/multimedia/image_standard/plugins/common/libs:multimediaplugin(${mac_buildtool})", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager(${mac_buildtool})", + "//foundation/multimedia/image_framework/frameworks/jni/imagesource:image_source_jni(${mac_buildtool})", + "//foundation/multimedia/image_framework/frameworks/jni/incrementalpixelmap:incremental_pixelmap_jni(${mac_buildtool})", + "//foundation/multimedia/image_framework/frameworks/jni/pixelmap:pixelmap_jni(${mac_buildtool})", + "//foundation/multimedia/image_framework/interfaces/innerkits:image(${mac_buildtool})", + "//foundation/multimedia/image_framework/plugins/common/libs:multimediaplugin(${mac_buildtool})", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager(${mac_buildtool})", ] } else { deps = [ - "//foundation/multimedia/image_standard/frameworks/jni/imagesource:image_source_jni(${windows_buildtool})", - "//foundation/multimedia/image_standard/frameworks/jni/incrementalpixelmap:incremental_pixelmap_jni(${windows_buildtool})", - "//foundation/multimedia/image_standard/frameworks/jni/pixelmap:pixelmap_jni(${windows_buildtool})", - "//foundation/multimedia/image_standard/interfaces/innerkits:image(${windows_buildtool})", - "//foundation/multimedia/image_standard/plugins/common/libs:multimediaplugin(${windows_buildtool})", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager(${windows_buildtool})", + "//foundation/multimedia/image_framework/frameworks/jni/imagesource:image_source_jni(${windows_buildtool})", + "//foundation/multimedia/image_framework/frameworks/jni/incrementalpixelmap:incremental_pixelmap_jni(${windows_buildtool})", + "//foundation/multimedia/image_framework/frameworks/jni/pixelmap:pixelmap_jni(${windows_buildtool})", + "//foundation/multimedia/image_framework/interfaces/innerkits:image(${windows_buildtool})", + "//foundation/multimedia/image_framework/plugins/common/libs:multimediaplugin(${windows_buildtool})", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager(${windows_buildtool})", ] } } diff --git a/interfaces/innerkits/BUILD.gn b/interfaces/innerkits/BUILD.gn index f086c11..1663985 100644 --- a/interfaces/innerkits/BUILD.gn +++ b/interfaces/innerkits/BUILD.gn @@ -14,26 +14,26 @@ import("//build/ohos.gni") import("//build/ohos/ace/ace.gni") import("//foundation/graphic/graphic_2d/graphic_config.gni") -import("//foundation/multimedia/image_standard/ide/image_decode_config.gni") +import("//foundation/multimedia/image_framework/ide/image_decode_config.gni") config("image_external_config") { include_dirs = [ "include", "//utils/system/safwk/native/include", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/receiver/include", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/creator/include", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/pixelconverter/include", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/include", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/codec/include", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/common/include", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/include", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils/include", - "//foundation/multimedia/image_standard/frameworks/kits/js/common/include", - "//foundation/multimedia/image_standard/interfaces/kits/js/common/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", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/converter/include", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/codec/include", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/common/include", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/include", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/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_standard/plugins/manager/include", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", - "//foundation/multimedia/image_standard/interfaces/kits/native/include", + "//foundation/multimedia/image_framework/plugins/manager/include", + "//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", "//foundation/graphic/graphic_2d/interfaces/inner_api/surface", @@ -47,10 +47,10 @@ config("image_external_config") { if (use_mingw_win) { include_dirs += - [ "//foundation/multimedia/image_standard/mock/native/include" ] + [ "//foundation/multimedia/image_framework/mock/native/include" ] } else if (use_clang_mac) { include_dirs += [ - "//foundation/multimedia/image_standard/mock/native/include", + "//foundation/multimedia/image_framework/mock/native/include", "//third_party/bounds_checking_function/include", "//commonlibrary/c_utils/base/include", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", @@ -66,11 +66,11 @@ 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_framework/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_framework/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 = "" @@ -79,14 +79,14 @@ ohos_copy("image_declaration") { ohos_shared_library("image") { public_configs = [ ":image_external_config" ] sources = [ - "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_creator_napi.cpp", - "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_napi.cpp", - "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_napi_utils.cpp", - "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_packer_napi.cpp", - "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_receiver_napi.cpp", - "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_source_napi.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_framework/frameworks/kits/js/common/image_creator_napi.cpp", + "//foundation/multimedia/image_framework/frameworks/kits/js/common/image_napi.cpp", + "//foundation/multimedia/image_framework/frameworks/kits/js/common/image_napi_utils.cpp", + "//foundation/multimedia/image_framework/frameworks/kits/js/common/image_packer_napi.cpp", + "//foundation/multimedia/image_framework/frameworks/kits/js/common/image_receiver_napi.cpp", + "//foundation/multimedia/image_framework/frameworks/kits/js/common/image_source_napi.cpp", + "//foundation/multimedia/image_framework/frameworks/kits/js/common/native_module_ohos_image.cpp", + "//foundation/multimedia/image_framework/frameworks/kits/js/common/pixel_map_napi.cpp", ] cflags = [ @@ -97,7 +97,7 @@ ohos_shared_library("image") { deps = [ ":image_native", "//foundation/arkui/napi:ace_napi", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter", ] external_deps = [ @@ -119,63 +119,63 @@ ohos_shared_library("image_native") { ] 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/creator/src/image_creator.cpp", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/creator/src/image_creator_manager.cpp", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/receiver/src/image_receiver.cpp", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/receiver/src/image_receiver_manager.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_framework/frameworks/innerkitsimpl/codec/src/image_packer.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/codec/src/image_packer_ex.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/codec/src/image_source.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/common/src/incremental_pixel_map.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/common/src/pixel_map.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/common/src/pixel_map_parcel.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/converter/src/basic_transformer.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/converter/src/matrix.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/converter/src/pixel_convert.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/converter/src/post_proc.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/converter/src/scan_line_filter.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/creator/src/image_creator.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/creator/src/image_creator_manager.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/receiver/src/image_receiver.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/receiver/src/image_receiver_manager.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/buffer_packer_stream.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/buffer_source_stream.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/file_packer_stream.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/incremental_source_stream.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/istream_source_stream.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", ] if (use_mingw_win) { defines = image_decode_windows_defines 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/stream/src/buffer_packer_stream.cpp", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/file_packer_stream.cpp", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/codec/src/image_packer.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/codec/src/image_packer_ex.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/buffer_packer_stream.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/file_packer_stream.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", ] deps = [ "//foundation/graphic/graphic_2d:libsurface", "//foundation/graphic/graphic_2d/utils/color_manager:color_manager", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter_static", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils_static", - "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager_static", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter_static", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils:image_utils_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager_static", ] } else if (use_clang_mac) { defines = image_decode_mac_defines 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/stream/src/buffer_packer_stream.cpp", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/file_packer_stream.cpp", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/codec/src/image_packer.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/codec/src/image_packer_ex.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/buffer_packer_stream.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/file_packer_stream.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", ] deps = [ "//foundation/graphic/graphic_2d:libsurface", "//foundation/graphic/graphic_2d/utils/color_manager:color_manager", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter_static", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils_static", - "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager_static", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter_static", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils:image_utils_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager_static", "//third_party/bounds_checking_function:libsec_statics", ] } else { @@ -186,15 +186,15 @@ ohos_shared_library("image_native") { defines += [ "UPLOAD_GPU_ENABLED" ] } - sources += [ "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/converter/src/pixel_map_rosen_utils.cpp" ] + sources += [ "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/converter/src/pixel_map_rosen_utils.cpp" ] deps = [ "//foundation/arkui/napi:ace_napi", "//foundation/graphic/graphic_2d:libsurface", "//foundation/graphic/graphic_2d/utils/color_manager:color_manager", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", + "//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/flutter/build/skia:ace_skia_ohos", ] @@ -217,14 +217,14 @@ ohos_static_library("image_static_napi") { public_configs = [ ":image_external_config" ] sources = [ - "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_creator_napi.cpp", - "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_napi.cpp", - "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_napi_utils.cpp", - "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_packer_napi.cpp", - "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_receiver_napi.cpp", - "//foundation/multimedia/image_standard/frameworks/kits/js/common/image_source_napi.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_framework/frameworks/kits/js/common/image_creator_napi.cpp", + "//foundation/multimedia/image_framework/frameworks/kits/js/common/image_napi.cpp", + "//foundation/multimedia/image_framework/frameworks/kits/js/common/image_napi_utils.cpp", + "//foundation/multimedia/image_framework/frameworks/kits/js/common/image_packer_napi.cpp", + "//foundation/multimedia/image_framework/frameworks/kits/js/common/image_receiver_napi.cpp", + "//foundation/multimedia/image_framework/frameworks/kits/js/common/image_source_napi.cpp", + "//foundation/multimedia/image_framework/frameworks/kits/js/common/native_module_ohos_image.cpp", + "//foundation/multimedia/image_framework/frameworks/kits/js/common/pixel_map_napi.cpp", ] cflags = [ @@ -237,9 +237,9 @@ ohos_static_library("image_static_napi") { "//foundation/arkui/napi:ace_napi", "//foundation/graphic/graphic_2d:libsurface", "//foundation/graphic/graphic_2d/utils/color_manager:color_manager", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils:image_utils", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", ] subsystem_name = "multimedia" part_name = "multimedia_image_standard" @@ -250,63 +250,63 @@ 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/creator/src/image_creator.cpp", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/creator/src/image_creator_manager.cpp", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/receiver/src/image_receiver.cpp", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/receiver/src/image_receiver_manager.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_framework/frameworks/innerkitsimpl/codec/src/image_packer.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/codec/src/image_packer_ex.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/codec/src/image_source.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/common/src/incremental_pixel_map.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/common/src/pixel_map.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/converter/src/basic_transformer.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/converter/src/matrix.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/converter/src/pixel_convert.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/converter/src/post_proc.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/converter/src/scan_line_filter.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/creator/src/image_creator.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/creator/src/image_creator_manager.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/receiver/src/image_receiver.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/receiver/src/image_receiver_manager.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/buffer_packer_stream.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/buffer_source_stream.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/file_packer_stream.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/file_source_stream.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/incremental_source_stream.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/istream_source_stream.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", ] if (use_mingw_win) { defines = image_decode_windows_defines 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/stream/src/buffer_packer_stream.cpp", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/file_packer_stream.cpp", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/codec/src/image_packer.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/codec/src/image_packer_ex.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/buffer_packer_stream.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/file_packer_stream.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", ] deps = [ "//foundation/graphic/graphic_2d:libsurface", "//foundation/graphic/graphic_2d/utils/color_manager:color_manager", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter_static", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils_static", - "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager_static", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter_static", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils:image_utils_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager_static", ] } else if (use_clang_mac) { defines = image_decode_mac_defines 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/stream/src/buffer_packer_stream.cpp", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/file_packer_stream.cpp", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/codec/src/image_packer.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/codec/src/image_packer_ex.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/buffer_packer_stream.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/file_packer_stream.cpp", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/src/ostream_packer_stream.cpp", ] deps = [ "//foundation/graphic/graphic_2d:libsurface", "//foundation/graphic/graphic_2d/utils/color_manager:color_manager", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter_static", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils_static", - "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager_static", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter_static", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils:image_utils_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager_static", "//third_party/bounds_checking_function:libsec_static", ] } else { @@ -317,9 +317,9 @@ ohos_static_library("image_static") { "//foundation/arkui/napi:ace_napi", "//foundation/graphic/graphic_2d:libsurface", "//foundation/graphic/graphic_2d/utils/color_manager:color_manager", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils:image_utils", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", ] if (DUAL_ADAPTER) { diff --git a/interfaces/kits/native/ndk_test_example/BUILD.gn b/interfaces/kits/native/ndk_test_example/BUILD.gn index f505b09..d0ae714 100644 --- a/interfaces/kits/native/ndk_test_example/BUILD.gn +++ b/interfaces/kits/native/ndk_test_example/BUILD.gn @@ -19,11 +19,11 @@ import("//build/ohos.gni") js_declaration("mypixelmap_js") { part_name = "multimedia_image" - sources = [ "//foundation/multimedia/image_standard/interfaces/kits/native/ndk_test_example/@ohos.xtstest.mypixelmap.d.ts" ] + sources = [ "//foundation/multimedia/image_framework/interfaces/kits/native/ndk_test_example/@ohos.xtstest.mypixelmap.d.ts" ] } ohos_copy("mypixelmap_declaration") { - sources = [ "//foundation/multimedia/image_standard/interfaces/kits/native/ndk_test_example/@ohos.xtstest.mypixelmap.d.ts" ] + sources = [ "//foundation/multimedia/image_framework/interfaces/kits/native/ndk_test_example/@ohos.xtstest.mypixelmap.d.ts" ] outputs = [ target_out_dir + "/$target_name/" ] module_source_dir = target_out_dir + "/$target_name" module_install_name = "" @@ -36,12 +36,12 @@ ohos_shared_library("mypixelmap") { include_dirs = [ "include", - "//foundation/multimedia/image_standard/interfaces/kits/native/include", + "//foundation/multimedia/image_framework/interfaces/kits/native/include", ] deps = [ "//foundation/arkui/napi:ace_napi", - "//foundation/multimedia/image_standard/frameworks/kits/js/common/pixelmap_ndk:pixelmap_ndk", + "//foundation/multimedia/image_framework/frameworks/kits/js/common/pixelmap_ndk:pixelmap_ndk", ] external_deps = [ "hiviewdfx_hilog_native:libhilog" ] diff --git a/mock/native/BUILD.gn b/mock/native/BUILD.gn index af3d9b5..b836bd9 100644 --- a/mock/native/BUILD.gn +++ b/mock/native/BUILD.gn @@ -12,28 +12,28 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/multimedia/image_standard/ide/image_decode_config.gni") +import("//foundation/multimedia/image_framework/ide/image_decode_config.gni") config("log_mock_config") { visibility = [ ":*" ] include_dirs = [ - "//foundation/multimedia/image_standard/mock/native/include", - "//foundation/multimedia/image_standard/mock/native/include/hilog", + "//foundation/multimedia/image_framework/mock/native/include", + "//foundation/multimedia/image_framework/mock/native/include/hilog", ] } ohos_static_library("log_mock_static") { configs = [ ":log_mock_config" ] sources = - [ "//foundation/multimedia/image_standard/mock/native/src/HiLog.cpp" ] + [ "//foundation/multimedia/image_framework/mock/native/src/HiLog.cpp" ] subsystem_name = "multimedia" } config("utils_mock_config") { visibility = [ ":*" ] include_dirs = [ - "//foundation/multimedia/image_standard/mock/native/include", + "//foundation/multimedia/image_framework/mock/native/include", "//foundation/multimedia/utils/include", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", + "//foundation/multimedia/image_framework/interfaces/innerkits/include", ] } @@ -45,11 +45,11 @@ ohos_static_library("utils_mock_static") { } configs = [ ":utils_mock_config" ] sources = [ - "//foundation/multimedia/image_standard/mock/native/src/directory_ex.cpp", - "//foundation/multimedia/image_standard/mock/native/src/message_parcel.cpp", - "//foundation/multimedia/image_standard/mock/native/src/parcel.cpp", - "//foundation/multimedia/image_standard/mock/native/src/refbase.cpp", - "//foundation/multimedia/image_standard/mock/native/src/rwlock.cpp", + "//foundation/multimedia/image_framework/mock/native/src/directory_ex.cpp", + "//foundation/multimedia/image_framework/mock/native/src/message_parcel.cpp", + "//foundation/multimedia/image_framework/mock/native/src/parcel.cpp", + "//foundation/multimedia/image_framework/mock/native/src/refbase.cpp", + "//foundation/multimedia/image_framework/mock/native/src/rwlock.cpp", ] deps = [ ":log_mock_static" ] subsystem_name = "multimedia" diff --git a/plugins/common/libs/BUILD.gn b/plugins/common/libs/BUILD.gn index 52274d2..b3a408d 100644 --- a/plugins/common/libs/BUILD.gn +++ b/plugins/common/libs/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/multimedia/image_standard/ide/image_decode_config.gni") +import("//foundation/multimedia/image_framework/ide/image_decode_config.gni") group("multimediaplugin") { if (use_mingw_win || use_clang_mac) { @@ -27,10 +27,10 @@ group("multimediaplugin") { "image/libpngplugin:pngpluginmetadata", "image/librawplugin:rawplugin", "image/librawplugin:rawpluginmetadata", - "//foundation/multimedia/image_standard/adapter/frameworks/libbmpplugin:bmpplugin", - "//foundation/multimedia/image_standard/adapter/frameworks/libbmpplugin:bmppluginmetadata", - "//foundation/multimedia/image_standard/adapter/frameworks/libwbmpplugin:wbmpplugin", - "//foundation/multimedia/image_standard/adapter/frameworks/libwbmpplugin:wbmppluginmetadata", + "//foundation/multimedia/image_framework/adapter/frameworks/libbmpplugin:bmpplugin", + "//foundation/multimedia/image_framework/adapter/frameworks/libbmpplugin:bmppluginmetadata", + "//foundation/multimedia/image_framework/adapter/frameworks/libwbmpplugin:wbmpplugin", + "//foundation/multimedia/image_framework/adapter/frameworks/libwbmpplugin:wbmppluginmetadata", ] } else { DUAL_ADAPTER = true @@ -53,17 +53,17 @@ group("multimediaplugin") { "image/libwebpplugin:webpplugin", "image/libwebpplugin:webppluginmetadata", - # "//foundation/multimedia/image_standard/adapter/frameworks/libhwjpegplugin:hwjpegplugin", - # "//foundation/multimedia/image_standard/adapter/frameworks/libhwjpegplugin:hwjpegpluginmetadata", + # "//foundation/multimedia/image_framework/adapter/frameworks/libhwjpegplugin:hwjpegplugin", + # "//foundation/multimedia/image_framework/adapter/frameworks/libhwjpegplugin:hwjpegpluginmetadata", ] if (DUAL_ADAPTER) { deps += [ - # "//foundation/multimedia/image_standard/adapter/frameworks/libbmpplugin:bmpplugin", - # "//foundation/multimedia/image_standard/adapter/frameworks/libbmpplugin:bmppluginmetadata", - # "//foundation/multimedia/image_standard/adapter/frameworks/librawplugin:rawplugin", - # "//foundation/multimedia/image_standard/adapter/frameworks/librawplugin:rawpluginmetadata", - # "//foundation/multimedia/image_standard/adapter/frameworks/libwbmpplugin:wbmpplugin", - # "//foundation/multimedia/image_standard/adapter/frameworks/libwbmpplugin:wbmppluginmetadata", + # "//foundation/multimedia/image_framework/adapter/frameworks/libbmpplugin:bmpplugin", + # "//foundation/multimedia/image_framework/adapter/frameworks/libbmpplugin:bmppluginmetadata", + # "//foundation/multimedia/image_framework/adapter/frameworks/librawplugin:rawplugin", + # "//foundation/multimedia/image_framework/adapter/frameworks/librawplugin:rawpluginmetadata", + # "//foundation/multimedia/image_framework/adapter/frameworks/libwbmpplugin:wbmpplugin", + # "//foundation/multimedia/image_framework/adapter/frameworks/libwbmpplugin:wbmppluginmetadata", ] } } diff --git a/plugins/common/libs/image/formatagentplugin/BUILD.gn b/plugins/common/libs/image/formatagentplugin/BUILD.gn index 38b5732..7aa1ebd 100644 --- a/plugins/common/libs/image/formatagentplugin/BUILD.gn +++ b/plugins/common/libs/image/formatagentplugin/BUILD.gn @@ -12,51 +12,51 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/multimedia/image_standard/ide/image_decode_config.gni") +import("//foundation/multimedia/image_framework/ide/image_decode_config.gni") ohos_shared_library("imageformatagent") { sources = [ - "//foundation/multimedia/image_standard/plugins/common/libs/image/formatagentplugin/src/bmp_format_agent.cpp", - "//foundation/multimedia/image_standard/plugins/common/libs/image/formatagentplugin/src/gif_format_agent.cpp", - "//foundation/multimedia/image_standard/plugins/common/libs/image/formatagentplugin/src/heif_format_agent.cpp", - "//foundation/multimedia/image_standard/plugins/common/libs/image/formatagentplugin/src/jpeg_format_agent.cpp", - "//foundation/multimedia/image_standard/plugins/common/libs/image/formatagentplugin/src/plugin_export.cpp", - "//foundation/multimedia/image_standard/plugins/common/libs/image/formatagentplugin/src/png_format_agent.cpp", - "//foundation/multimedia/image_standard/plugins/common/libs/image/formatagentplugin/src/raw_format_agent.cpp", - "//foundation/multimedia/image_standard/plugins/common/libs/image/formatagentplugin/src/wbmp_format_agent.cpp", - "//foundation/multimedia/image_standard/plugins/common/libs/image/formatagentplugin/src/webp_format_agent.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/formatagentplugin/src/bmp_format_agent.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/formatagentplugin/src/gif_format_agent.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/formatagentplugin/src/heif_format_agent.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/formatagentplugin/src/jpeg_format_agent.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/formatagentplugin/src/plugin_export.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/formatagentplugin/src/png_format_agent.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/formatagentplugin/src/raw_format_agent.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/formatagentplugin/src/wbmp_format_agent.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/formatagentplugin/src/webp_format_agent.cpp", ] include_dirs = [ "//foundation/multimedia/utils/include", - "//foundation/multimedia/image_standard/plugins/manager/include", - "//foundation/multimedia/image_standard/plugins/manager/include/image", - "//foundation/multimedia/image_standard/plugins/manager/include/pluginbase", - "//foundation/multimedia/image_standard/plugins/common/libs/image/formatagentplugin/include", - "//foundation/multimedia/image_standard/plugins/manager/include/utils", - "//foundation/multimedia/image_standard/interfaces/innerkits/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/formatagentplugin/include", + "//foundation/multimedia/image_framework/plugins/manager/include/utils", + "//foundation/multimedia/image_framework/interfaces/innerkits/include", ] if (use_mingw_win) { defines = image_decode_windows_defines include_dirs += - [ "//foundation/multimedia/image_standard/mock/native/include" ] + [ "//foundation/multimedia/image_framework/mock/native/include" ] deps = [ - "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager_static", ] } else if (use_clang_mac) { defines = image_decode_mac_defines include_dirs += - [ "//foundation/multimedia/image_standard/mock/native/include" ] + [ "//foundation/multimedia/image_framework/mock/native/include" ] deps = [ - "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager_static", ] } else { include_dirs += [ "//commonlibrary/c_utils/base/include" ] deps = [ - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", ] # external_deps = [ "hilog:libhilog" ] diff --git a/plugins/common/libs/image/libbmpplugin/BUILD.gn b/plugins/common/libs/image/libbmpplugin/BUILD.gn index 518885b..843f22f 100644 --- a/plugins/common/libs/image/libbmpplugin/BUILD.gn +++ b/plugins/common/libs/image/libbmpplugin/BUILD.gn @@ -12,23 +12,23 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/multimedia/image_standard/ide/image_decode_config.gni") +import("//foundation/multimedia/image_framework/ide/image_decode_config.gni") ohos_shared_library("bmpplugin") { sources = [ - "//foundation/multimedia/image_standard/plugins/common/libs/image/libbmpplugin/src/bmp_decoder.cpp", - "//foundation/multimedia/image_standard/plugins/common/libs/image/libbmpplugin/src/bmp_stream.cpp", - "//foundation/multimedia/image_standard/plugins/common/libs/image/libbmpplugin/src/plugin_export.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/libbmpplugin/src/bmp_decoder.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/libbmpplugin/src/bmp_stream.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/libbmpplugin/src/plugin_export.cpp", ] include_dirs = [ "//foundation/multimedia/utils/include", - "//foundation/multimedia/image_standard/plugins/manager/include", - "//foundation/multimedia/image_standard/plugins/manager/include/image", - "//foundation/multimedia/image_standard/plugins/manager/include/pluginbase", - "//foundation/multimedia/image_standard/plugins/common/libs/image/libbmpplugin/include", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/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/libbmpplugin/include", + "//foundation/multimedia/image_framework/interfaces/innerkits/include", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include", "//third_party/flutter/skia/include/core", "//third_party/flutter/skia/include/codec", "//third_party/flutter/skia", @@ -36,8 +36,8 @@ ohos_shared_library("bmpplugin") { if (use_mingw_win) { defines = image_decode_windows_defines include_dirs += [ - "//foundation/multimedia/image_standard/mock/native/include", - "//foundation/multimedia/image_standard/mock/native/include/secure", + "//foundation/multimedia/image_framework/mock/native/include", + "//foundation/multimedia/image_framework/mock/native/include/secure", "${asdk_dir}/static_library/${target_os}_${target_cpu}/include/external/skia/include/codec", "${asdk_dir}/static_library/${target_os}_${target_cpu}/include/external/skia/include/core", "${asdk_dir}/static_library/${target_os}_${target_cpu}/include/external/skia/include/config/win", @@ -45,9 +45,9 @@ ohos_shared_library("bmpplugin") { ] deps = [ "//foundation/graphic/ide/libs/skia:skia", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils_static", - "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager_static", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils:image_utils_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager_static", "//third_party/flutter/build/skia:ace_skia_core", ] @@ -55,7 +55,7 @@ ohos_shared_library("bmpplugin") { } else if (use_clang_mac) { defines = image_decode_mac_defines include_dirs += [ - "//foundation/multimedia/image_standard/mock/native/include", + "//foundation/multimedia/image_framework/mock/native/include", "${asdk_dir}/static_library/${target_os}_${target_cpu}/include/external/skia/include/codec", "${asdk_dir}/static_library/${target_os}_${target_cpu}/include/external/skia/include/core", "${asdk_dir}/static_library/${target_os}_${target_cpu}/include/external/skia/include/config/mac", @@ -64,16 +64,16 @@ ohos_shared_library("bmpplugin") { ] deps = [ "//foundation/graphic/ide/libs/skia:skia", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils_static", - "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager_static", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils:image_utils_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager_static", "//third_party/bounds_checking_function:libsec_static", ] } else { include_dirs += [ "//commonlibrary/c_utils/base/include" ] deps = [ - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils:image_utils", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils:image_utils", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", "//third_party/flutter/build/skia:ace_skia_ohos", ] diff --git a/plugins/common/libs/image/libgifplugin/BUILD.gn b/plugins/common/libs/image/libgifplugin/BUILD.gn index 64b52f8..86c220c 100644 --- a/plugins/common/libs/image/libgifplugin/BUILD.gn +++ b/plugins/common/libs/image/libgifplugin/BUILD.gn @@ -12,52 +12,52 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/multimedia/image_standard/ide/image_decode_config.gni") +import("//foundation/multimedia/image_framework/ide/image_decode_config.gni") ohos_shared_library("gifplugin") { sources = [ - "//foundation/multimedia/image_standard/plugins/common/libs/image/libgifplugin/src/gif_decoder.cpp", - "//foundation/multimedia/image_standard/plugins/common/libs/image/libgifplugin/src/plugin_export.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/libgifplugin/src/gif_decoder.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/libgifplugin/src/plugin_export.cpp", ] include_dirs = [ "//foundation/multimedia/utils/include", - "//foundation/multimedia/image_standard/plugins/manager/include", - "//foundation/multimedia/image_standard/plugins/manager/include/image", - "//foundation/multimedia/image_standard/plugins/manager/include/pluginbase", - "//foundation/multimedia/image_standard/plugins/common/libs/image/libgifplugin/include", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/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", ] if (use_mingw_win) { defines = image_decode_windows_defines include_dirs += - [ "//foundation/multimedia/image_standard/mock/native/include" ] + [ "//foundation/multimedia/image_framework/mock/native/include" ] deps = [ - "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//foundation/multimedia/image_standard/mock/native:utils_mock_static", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/mock/native:utils_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 include_dirs += [ - "//foundation/multimedia/image_standard/mock/native/include", + "//foundation/multimedia/image_framework/mock/native/include", "//third_party/bounds_checking_function/include", ] deps = [ - "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//foundation/multimedia/image_standard/mock/native:utils_mock_static", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/mock/native:utils_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 = [ - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", "//third_party/giflib:libgif", ] diff --git a/plugins/common/libs/image/libjpegplugin/BUILD.gn b/plugins/common/libs/image/libjpegplugin/BUILD.gn index 40c6495..3caf9b6 100644 --- a/plugins/common/libs/image/libjpegplugin/BUILD.gn +++ b/plugins/common/libs/image/libjpegplugin/BUILD.gn @@ -13,16 +13,16 @@ import("//build/ohos.gni") import("//foundation/arkui/ace_engine/ace_config.gni") -import("//foundation/multimedia/image_standard/ide/image_decode_config.gni") +import("//foundation/multimedia/image_framework/ide/image_decode_config.gni") import("//third_party/flutter/flutter_config.gni") ohos_shared_library("jpegplugin") { sources = [ - "//foundation/multimedia/image_standard/plugins/common/libs/image/libjpegplugin/src/exif_info.cpp", - "//foundation/multimedia/image_standard/plugins/common/libs/image/libjpegplugin/src/icc_profile_info.cpp", - "//foundation/multimedia/image_standard/plugins/common/libs/image/libjpegplugin/src/jpeg_decoder.cpp", - "//foundation/multimedia/image_standard/plugins/common/libs/image/libjpegplugin/src/jpeg_utils.cpp", - "//foundation/multimedia/image_standard/plugins/common/libs/image/libjpegplugin/src/plugin_export.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/libjpegplugin/src/exif_info.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/libjpegplugin/src/icc_profile_info.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/libjpegplugin/src/jpeg_decoder.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/libjpegplugin/src/jpeg_utils.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/libjpegplugin/src/plugin_export.cpp", ] cflags = [ @@ -32,13 +32,13 @@ ohos_shared_library("jpegplugin") { include_dirs = [ "//foundation/multimedia/utils/include", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", - "//foundation/multimedia/image_standard/plugins/manager/include", - "//foundation/multimedia/image_standard/plugins/manager/include/image", - "//foundation/multimedia/image_standard/plugins/manager/include/pluginbase", - "//foundation/multimedia/image_standard/plugins/common/libs/image/libjpegplugin/include", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils/include", + "//foundation/multimedia/image_framework/interfaces/innerkits/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/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", "//third_party/flutter/skia/third_party/externals/libjpeg-turbo", "//third_party/flutter/skia/include/codec", @@ -53,15 +53,15 @@ ohos_shared_library("jpegplugin") { if (use_mingw_win) { defines = image_decode_windows_defines include_dirs += [ - "//foundation/multimedia/image_standard/mock/native/include", + "//foundation/multimedia/image_framework/mock/native/include", "//third_party/flutter/skia/third_party/libjpeg-turbo", "//third_party/flutter/skia/third_party/externals/libjpeg-turbo", ] deps = [ "//foundation/graphic/graphic_2d/utils/color_manager:color_manager", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_static", - "//foundation/multimedia/image_standard/mock/native:utils_mock_static", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager_static", + "//foundation/multimedia/image_framework/interfaces/innerkits:image_static", + "//foundation/multimedia/image_framework/mock/native:utils_mock_static", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager_static", "//third_party/flutter/build/libjpeg:ace_libjpeg", "//third_party/flutter/build/skia:ace_skcms", "//third_party/flutter/build/skia:ace_skia_ohos", @@ -70,15 +70,15 @@ ohos_shared_library("jpegplugin") { } else if (use_clang_mac) { defines = image_decode_mac_defines include_dirs += [ - "//foundation/multimedia/image_standard/mock/native/include", + "//foundation/multimedia/image_framework/mock/native/include", "//third_party/flutter/skia/third_party/libjpeg-turbo", "//third_party/flutter/skia/third_party/externals/libjpeg-turbo", ] deps = [ "//foundation/graphic/graphic_2d/utils/color_manager:color_manager", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_static", - "//foundation/multimedia/image_standard/mock/native:utils_mock_static", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager_static", + "//foundation/multimedia/image_framework/interfaces/innerkits:image_static", + "//foundation/multimedia/image_framework/mock/native:utils_mock_static", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager_static", "//third_party/flutter/build/libjpeg:ace_libjpeg", "//third_party/flutter/build/skia:ace_skcms", "//third_party/flutter/build/skia:ace_skia_ohos", @@ -90,13 +90,13 @@ ohos_shared_library("jpegplugin") { include_dirs += [ "//commonlibrary/c_utils/base/include" ] sources += [ "$flutter_root/skia/third_party/externals/libjpeg-turbo/jdicc.c", - "//foundation/multimedia/image_standard/plugins/common/libs/image/libjpegplugin/src/jpeg_encoder.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/libjpegplugin/src/jpeg_encoder.cpp", ] deps = [ #"//third_party/flutter/skia/third_party/libjpeg-turbo:libjpeg", "//foundation/graphic/graphic_2d/utils/color_manager:color_manager", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", + "//foundation/multimedia/image_framework/interfaces/innerkits:image_native", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", "//third_party/flutter/build/libjpeg:ace_libjpeg", "//third_party/flutter/build/skia:ace_skcms", "//third_party/flutter/build/skia:ace_skia_ohos", diff --git a/plugins/common/libs/image/libpngplugin/BUILD.gn b/plugins/common/libs/image/libpngplugin/BUILD.gn index 05c3960..178fbb5 100644 --- a/plugins/common/libs/image/libpngplugin/BUILD.gn +++ b/plugins/common/libs/image/libpngplugin/BUILD.gn @@ -12,25 +12,25 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/multimedia/image_standard/ide/image_decode_config.gni") +import("//foundation/multimedia/image_framework/ide/image_decode_config.gni") ohos_shared_library("pngplugin") { sources = [ - "//foundation/multimedia/image_standard/plugins/common/libs/image/libpngplugin/src/nine_patch_listener.cpp", - "//foundation/multimedia/image_standard/plugins/common/libs/image/libpngplugin/src/plugin_export.cpp", - "//foundation/multimedia/image_standard/plugins/common/libs/image/libpngplugin/src/png_decoder.cpp", - "//foundation/multimedia/image_standard/plugins/common/libs/image/libpngplugin/src/png_ninepatch_res.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/libpngplugin/src/nine_patch_listener.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/libpngplugin/src/plugin_export.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/libpngplugin/src/png_decoder.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/libpngplugin/src/png_ninepatch_res.cpp", ] include_dirs = [ "//foundation/multimedia/utils/include", - "//foundation/multimedia/image_standard/plugins/manager/include", - "//foundation/multimedia/image_standard/plugins/manager/include/image", - "//foundation/multimedia/image_standard/plugins/manager/include/pluginbase", - "//foundation/multimedia/image_standard/plugins/common/libs/image/libpngplugin/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", "//third_party/libpng", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils/include", + "//foundation/multimedia/image_framework/interfaces/innerkits/include", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include", "//third_party/flutter/skia/third_party/libjpeg-turbo", ] deps = [ "//third_party/zlib:libz" ] @@ -38,12 +38,12 @@ ohos_shared_library("pngplugin") { if (use_mingw_win) { defines = image_decode_windows_defines include_dirs += [ - "//foundation/multimedia/image_standard/mock/native/include", + "//foundation/multimedia/image_framework/mock/native/include", "//third_party/libpng", ] deps += [ - "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager_static", "//third_party/libpng:png_static", ] @@ -51,13 +51,13 @@ ohos_shared_library("pngplugin") { } else if (use_clang_mac) { defines = image_decode_mac_defines include_dirs += [ - "//foundation/multimedia/image_standard/mock/native/include", + "//foundation/multimedia/image_framework/mock/native/include", "//third_party/libpng", "//third_party/bounds_checking_function/include", ] deps += [ - "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager_static", + "//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/libpng:png_static", ] @@ -69,7 +69,7 @@ ohos_shared_library("pngplugin") { "//third_party/libpng", ] deps += [ - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", "//third_party/libpng:png_static", ] if (DUAL_ADAPTER) { diff --git a/plugins/common/libs/image/librawplugin/BUILD.gn b/plugins/common/libs/image/librawplugin/BUILD.gn index 04d6c61..a164d4e 100644 --- a/plugins/common/libs/image/librawplugin/BUILD.gn +++ b/plugins/common/libs/image/librawplugin/BUILD.gn @@ -12,13 +12,13 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/multimedia/image_standard/ide/image_decode_config.gni") +import("//foundation/multimedia/image_framework/ide/image_decode_config.gni") ohos_shared_library("rawplugin") { sources = [ - "//foundation/multimedia/image_standard/plugins/common/libs/image/librawplugin/src/plugin_export.cpp", - "//foundation/multimedia/image_standard/plugins/common/libs/image/librawplugin/src/raw_decoder.cpp", - "//foundation/multimedia/image_standard/plugins/common/libs/image/librawplugin/src/raw_stream.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/librawplugin/src/plugin_export.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/librawplugin/src/raw_decoder.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/librawplugin/src/raw_stream.cpp", ] cflags = [ @@ -28,14 +28,14 @@ ohos_shared_library("rawplugin") { include_dirs = [ "//foundation/graphic/graphic_2d/utils/color_manager/export", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/stream/include", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils/include", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", - "//foundation/multimedia/image_standard/plugins/common/libs/image/libjpegplugin/include", - "//foundation/multimedia/image_standard/plugins/common/libs/image/librawplugin/include", - "//foundation/multimedia/image_standard/plugins/manager/include", - "//foundation/multimedia/image_standard/plugins/manager/include/image", - "//foundation/multimedia/image_standard/plugins/manager/include/pluginbase", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/stream/include", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include", + "//foundation/multimedia/image_framework/interfaces/innerkits/include", + "//foundation/multimedia/image_framework/plugins/common/libs/image/libjpegplugin/include", + "//foundation/multimedia/image_framework/plugins/common/libs/image/librawplugin/include", + "//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", @@ -44,10 +44,10 @@ ohos_shared_library("rawplugin") { if (use_mingw_win) { defines = image_decode_windows_defines include_dirs += - [ "//foundation/multimedia/image_standard/mock/native/include" ] + [ "//foundation/multimedia/image_framework/mock/native/include" ] deps = [ - "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager_static", ] libs = [ "//prebuilts/mingw-w64/ohos/linux-x86_64/clang-mingw/x86_64-w64-mingw32/lib/libws2_32.a" ] @@ -55,9 +55,9 @@ ohos_shared_library("rawplugin") { defines = [ "DUAL_ADAPTER" ] DUAL_ADAPTER = true deps = [ - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", - "//foundation/multimedia/image_standard/plugins/common/libs/image/libjpegplugin:jpegplugin", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", + "//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", ] diff --git a/plugins/common/libs/image/libwebpplugin/BUILD.gn b/plugins/common/libs/image/libwebpplugin/BUILD.gn index 2561fe9..2ab8a9c 100644 --- a/plugins/common/libs/image/libwebpplugin/BUILD.gn +++ b/plugins/common/libs/image/libwebpplugin/BUILD.gn @@ -12,24 +12,24 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/multimedia/image_standard/ide/image_decode_config.gni") +import("//foundation/multimedia/image_framework/ide/image_decode_config.gni") ohos_shared_library("webpplugin") { sources = [ - "//foundation/multimedia/image_standard/plugins/common/libs/image/libwebpplugin/src/plugin_export.cpp", - "//foundation/multimedia/image_standard/plugins/common/libs/image/libwebpplugin/src/webp_decoder.cpp", - "//foundation/multimedia/image_standard/plugins/common/libs/image/libwebpplugin/src/webp_encoder.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/libwebpplugin/src/plugin_export.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/libwebpplugin/src/webp_decoder.cpp", + "//foundation/multimedia/image_framework/plugins/common/libs/image/libwebpplugin/src/webp_encoder.cpp", ] include_dirs = [ - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils/include", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/pixelconverter/include", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/pixelconverter/include", "//foundation/multimedia/utils/include", - "//foundation/multimedia/image_standard/plugins/manager/include", - "//foundation/multimedia/image_standard/plugins/manager/include/image", - "//foundation/multimedia/image_standard/plugins/manager/include/pluginbase", - "//foundation/multimedia/image_standard/plugins/common/libs/image/libwebpplugin/include", - "//foundation/multimedia/image_standard/interfaces/innerkits/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/flutter/skia/third_party/externals/libwebp/src", "//third_party/flutter/skia/include/core", "//third_party/flutter/skia/include/encode", @@ -44,11 +44,11 @@ ohos_shared_library("webpplugin") { if (use_mingw_win) { defines = image_decode_windows_defines include_dirs += - [ "//foundation/multimedia/image_standard/mock/native/include" ] + [ "//foundation/multimedia/image_framework/mock/native/include" ] deps = [ "${asdk_dir}/static_library/${target_os}_${target_cpu}:libwebp-image_static", - "//foundation/multimedia/image_standard/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", ] } else { defines = [ "DUAL_ADAPTER" ] @@ -56,9 +56,9 @@ ohos_shared_library("webpplugin") { include_dirs += [ "//commonlibrary/c_utils/base/include" ] deps = [ - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter", - "//foundation/multimedia/image_standard/interfaces/innerkits:image_native", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/pixelconverter:pixelconvertadapter", + "//foundation/multimedia/image_framework/interfaces/innerkits:image_native", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", "//third_party/flutter/build/skia:ace_skia_ohos", ] diff --git a/plugins/manager/BUILD.gn b/plugins/manager/BUILD.gn index ed05c9a..bfe58aa 100644 --- a/plugins/manager/BUILD.gn +++ b/plugins/manager/BUILD.gn @@ -12,24 +12,24 @@ # limitations under the License. import("//build/ohos.gni") -import("//foundation/multimedia/image_standard/ide/image_decode_config.gni") +import("//foundation/multimedia/image_framework/ide/image_decode_config.gni") ohos_shared_library("pluginmanager") { sources = [ - "//foundation/multimedia/image_standard/plugins/manager/src/common/attr_data.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/common/platform_adp.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/framework/capability.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/framework/impl_class.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/framework/impl_class_key.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/framework/impl_class_mgr.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/framework/json_helper.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/framework/plugin.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/framework/plugin_fw.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/framework/plugin_info_lock.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/framework/plugin_mgr.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/plugin_server.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/pluginbase/plugin_class_base.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/thirdpartyadp/gstreamer/gst_plugin_fw.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/common/attr_data.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/common/platform_adp.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/framework/capability.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/framework/impl_class.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/framework/impl_class_key.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/framework/impl_class_mgr.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/framework/json_helper.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/framework/plugin.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/framework/plugin_fw.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/framework/plugin_info_lock.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/framework/plugin_mgr.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/plugin_server.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/pluginbase/plugin_class_base.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/thirdpartyadp/gstreamer/gst_plugin_fw.cpp", ] cflags = [ @@ -38,15 +38,15 @@ ohos_shared_library("pluginmanager") { ] include_dirs = [ - "//foundation/multimedia/image_standard/plugins/manager/include", - "//foundation/multimedia/image_standard/plugins/manager/include/pluginbase", - "//foundation/multimedia/image_standard/plugins/manager/include/utils", - "//foundation/multimedia/image_standard/plugins/manager/src/common", - "//foundation/multimedia/image_standard/plugins/manager/src/framework", - "//foundation/multimedia/image_standard/plugins/manager/src/pluginbase", - "//foundation/multimedia/image_standard/plugins/manager/src/thirdpartyadp/gstreamer", - "//foundation/multimedia/image_standard/frameworks/innerkitsimpl/utils/include", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", + "//foundation/multimedia/image_framework/plugins/manager/include", + "//foundation/multimedia/image_framework/plugins/manager/include/pluginbase", + "//foundation/multimedia/image_framework/plugins/manager/include/utils", + "//foundation/multimedia/image_framework/plugins/manager/src/common", + "//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/image_framework/frameworks/innerkitsimpl/utils/include", + "//foundation/multimedia/image_framework/interfaces/innerkits/include", "//foundation/multimedia/utils/include", "//third_party/json/single_include/nlohmann", "//third_party/boost/tools/build/src/engine", @@ -56,20 +56,20 @@ ohos_shared_library("pluginmanager") { if (use_mingw_win) { defines = image_decode_windows_defines include_dirs += - [ "//foundation/multimedia/image_standard/mock/native/include" ] + [ "//foundation/multimedia/image_framework/mock/native/include" ] deps = [ - "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//foundation/multimedia/image_standard/mock/native:utils_mock_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/mock/native:utils_mock_static", ] } else if (use_clang_mac) { defines = image_decode_mac_defines include_dirs += [ - "//foundation/multimedia/image_standard/mock/native/include", + "//foundation/multimedia/image_framework/mock/native/include", "//third_party/bounds_checking_function/include", ] deps = [ - "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//foundation/multimedia/image_standard/mock/native:utils_mock_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/mock/native:utils_mock_static", "//third_party/bounds_checking_function:libsec_static", ] } else { @@ -90,33 +90,33 @@ ohos_shared_library("pluginmanager") { ohos_static_library("pluginmanager_static") { sources = [ - "//foundation/multimedia/image_standard/plugins/manager/src/common/attr_data.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/common/platform_adp.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/framework/capability.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/framework/impl_class.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/framework/impl_class_key.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/framework/impl_class_mgr.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/framework/json_helper.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/framework/plugin.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/framework/plugin_fw.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/framework/plugin_info_lock.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/framework/plugin_mgr.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/plugin_server.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/pluginbase/plugin_class_base.cpp", - "//foundation/multimedia/image_standard/plugins/manager/src/thirdpartyadp/gstreamer/gst_plugin_fw.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/common/attr_data.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/common/platform_adp.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/framework/capability.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/framework/impl_class.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/framework/impl_class_key.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/framework/impl_class_mgr.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/framework/json_helper.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/framework/plugin.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/framework/plugin_fw.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/framework/plugin_info_lock.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/framework/plugin_mgr.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/plugin_server.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/pluginbase/plugin_class_base.cpp", + "//foundation/multimedia/image_framework/plugins/manager/src/thirdpartyadp/gstreamer/gst_plugin_fw.cpp", ] include_dirs = [ - "//foundation/multimedia/image_standard/plugins/manager/include", - "//foundation/multimedia/image_standard/plugins/manager/include/pluginbase", - "//foundation/multimedia/image_standard/plugins/manager/include/utils", - "//foundation/multimedia/image_standard/plugins/manager/src/common", - "//foundation/multimedia/image_standard/plugins/manager/src/framework", - "//foundation/multimedia/image_standard/plugins/manager/src/pluginbase", - "//foundation/multimedia/image_standard/plugins/manager/src/thirdpartyadp/gstreamer", + "//foundation/multimedia/image_framework/plugins/manager/include", + "//foundation/multimedia/image_framework/plugins/manager/include/pluginbase", + "//foundation/multimedia/image_framework/plugins/manager/include/utils", + "//foundation/multimedia/image_framework/plugins/manager/src/common", + "//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_standard/frameworks/innerkitsimpl/utils/include", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", + "//foundation/multimedia/image_framework/frameworks/innerkitsimpl/utils/include", + "//foundation/multimedia/image_framework/interfaces/innerkits/include", "//third_party/json/single_include/nlohmann", "//third_party/boost/tools/build/src/engine", "//base/hiviewdfx/hilog/interfaces/native/innerkits/include", @@ -125,20 +125,20 @@ ohos_static_library("pluginmanager_static") { if (use_mingw_win) { defines = image_decode_windows_defines include_dirs += - [ "//foundation/multimedia/image_standard/mock/native/include" ] + [ "//foundation/multimedia/image_framework/mock/native/include" ] deps = [ - "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//foundation/multimedia/image_standard/mock/native:utils_mock_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/mock/native:utils_mock_static", ] } else if (use_clang_mac) { defines = image_decode_mac_defines include_dirs += [ - "//foundation/multimedia/image_standard/mock/native/include", + "//foundation/multimedia/image_framework/mock/native/include", "//third_party/bounds_checking_function/include", ] deps = [ - "//foundation/multimedia/image_standard/mock/native:log_mock_static", - "//foundation/multimedia/image_standard/mock/native:utils_mock_static", + "//foundation/multimedia/image_framework/mock/native:log_mock_static", + "//foundation/multimedia/image_framework/mock/native:utils_mock_static", "//third_party/bounds_checking_function:libsec_static", ] } else { diff --git a/plugins/manager/test/unittest/common/BUILD.gn b/plugins/manager/test/unittest/common/BUILD.gn index 6caeaf9..42727d8 100644 --- a/plugins/manager/test/unittest/common/BUILD.gn +++ b/plugins/manager/test/unittest/common/BUILD.gn @@ -22,9 +22,9 @@ config("module_private_config") { include_dirs = [ "//commonlibrary/c_utils/base/include", "//foundation/multimedia/utils/include", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", - "//foundation/multimedia/image_standard/plugins/manager/include", - "//foundation/multimedia/image_standard/plugins/manager/test/unittest/common/plugin_example/interface/vision", + "//foundation/multimedia/image_framework/interfaces/innerkits/include", + "//foundation/multimedia/image_framework/plugins/manager/include", + "//foundation/multimedia/image_framework/plugins/manager/test/unittest/common/plugin_example/interface/vision", ] } @@ -32,19 +32,19 @@ config("module_private_config") { ohos_unittest("PluginManagerTest") { module_out_path = module_output_path - sources = [ "//foundation/multimedia/image_standard/plugins/manager/test/unittest/common/plugin_manager_test.cpp" ] + sources = [ "//foundation/multimedia/image_framework/plugins/manager/test/unittest/common/plugin_manager_test.cpp" ] configs = [ ":module_private_config" ] deps = [ - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", - "//foundation/multimedia/image_standard/plugins/manager/test/unittest/common/plugin_example/plugin_example1:pluginexample1", - "//foundation/multimedia/image_standard/plugins/manager/test/unittest/common/plugin_example/plugin_example2:pluginexample2", - "//foundation/multimedia/image_standard/plugins/manager/test/unittest/common/plugin_example/plugin_example3:pluginexample3", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", + "//foundation/multimedia/image_framework/plugins/manager/test/unittest/common/plugin_example/plugin_example1:pluginexample1", + "//foundation/multimedia/image_framework/plugins/manager/test/unittest/common/plugin_example/plugin_example2:pluginexample2", + "//foundation/multimedia/image_framework/plugins/manager/test/unittest/common/plugin_example/plugin_example3:pluginexample3", "//third_party/googletest:gtest_main", ] - resource_config_file = "//foundation/multimedia/image_standard/test/resource/plugins/ohos_test.xml" + resource_config_file = "//foundation/multimedia/image_framework/test/resource/plugins/ohos_test.xml" } ############################################################################### diff --git a/plugins/manager/test/unittest/common/plugin_example/plugin_example1/BUILD.gn b/plugins/manager/test/unittest/common/plugin_example/plugin_example1/BUILD.gn index 7c97c80..a02e75a 100644 --- a/plugins/manager/test/unittest/common/plugin_example/plugin_example1/BUILD.gn +++ b/plugins/manager/test/unittest/common/plugin_example/plugin_example1/BUILD.gn @@ -15,23 +15,23 @@ import("//build/ohos.gni") ohos_shared_library("pluginexample1") { sources = [ - "//foundation/multimedia/image_standard/plugins/manager/test/unittest/common/plugin_example/plugin_example1/cloud_label_detector.cpp", - "//foundation/multimedia/image_standard/plugins/manager/test/unittest/common/plugin_example/plugin_example1/label_detector.cpp", - "//foundation/multimedia/image_standard/plugins/manager/test/unittest/common/plugin_example/plugin_example1/plugin_export.cpp", + "//foundation/multimedia/image_framework/plugins/manager/test/unittest/common/plugin_example/plugin_example1/cloud_label_detector.cpp", + "//foundation/multimedia/image_framework/plugins/manager/test/unittest/common/plugin_example/plugin_example1/label_detector.cpp", + "//foundation/multimedia/image_framework/plugins/manager/test/unittest/common/plugin_example/plugin_example1/plugin_export.cpp", ] include_dirs = [ "//commonlibrary/c_utils/base/include", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", + "//foundation/multimedia/image_framework/interfaces/innerkits/include", "//foundation/multimedia/utils/include", - "//foundation/multimedia/image_standard/plugins/manager/include", - "//foundation/multimedia/image_standard/plugins/manager/include/pluginbase", - "//foundation/multimedia/image_standard/plugins/manager/test/unittest/common/plugin_example/interface/vision", + "//foundation/multimedia/image_framework/plugins/manager/include", + "//foundation/multimedia/image_framework/plugins/manager/include/pluginbase", + "//foundation/multimedia/image_framework/plugins/manager/test/unittest/common/plugin_example/interface/vision", ] deps = [ "//base/hiviewdfx/hilog/frameworks/native:libhilogutil", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", ] subsystem_name = "multimedia" diff --git a/plugins/manager/test/unittest/common/plugin_example/plugin_example2/BUILD.gn b/plugins/manager/test/unittest/common/plugin_example/plugin_example2/BUILD.gn index 7d35fa4..b713514 100644 --- a/plugins/manager/test/unittest/common/plugin_example/plugin_example2/BUILD.gn +++ b/plugins/manager/test/unittest/common/plugin_example/plugin_example2/BUILD.gn @@ -15,23 +15,23 @@ import("//build/ohos.gni") ohos_shared_library("pluginexample2") { sources = [ - "//foundation/multimedia/image_standard/plugins/manager/test/unittest/common/plugin_example/plugin_example2/cloud_label_detector2.cpp", - "//foundation/multimedia/image_standard/plugins/manager/test/unittest/common/plugin_example/plugin_example2/label_detector2.cpp", - "//foundation/multimedia/image_standard/plugins/manager/test/unittest/common/plugin_example/plugin_example2/plugin_export.cpp", + "//foundation/multimedia/image_framework/plugins/manager/test/unittest/common/plugin_example/plugin_example2/cloud_label_detector2.cpp", + "//foundation/multimedia/image_framework/plugins/manager/test/unittest/common/plugin_example/plugin_example2/label_detector2.cpp", + "//foundation/multimedia/image_framework/plugins/manager/test/unittest/common/plugin_example/plugin_example2/plugin_export.cpp", ] include_dirs = [ "//commonlibrary/c_utils/base/include", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", + "//foundation/multimedia/image_framework/interfaces/innerkits/include", "//foundation/multimedia/utils/include", - "//foundation/multimedia/image_standard/plugins/manager/include", - "//foundation/multimedia/image_standard/plugins/manager/include/pluginbase", - "//foundation/multimedia/image_standard/plugins/manager/test/unittest/common/plugin_example/interface/vision", + "//foundation/multimedia/image_framework/plugins/manager/include", + "//foundation/multimedia/image_framework/plugins/manager/include/pluginbase", + "//foundation/multimedia/image_framework/plugins/manager/test/unittest/common/plugin_example/interface/vision", ] deps = [ "//base/hiviewdfx/hilog/frameworks/native:libhilogutil", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", ] subsystem_name = "multimedia" diff --git a/plugins/manager/test/unittest/common/plugin_example/plugin_example3/BUILD.gn b/plugins/manager/test/unittest/common/plugin_example/plugin_example3/BUILD.gn index 1e27f42..a79058d 100644 --- a/plugins/manager/test/unittest/common/plugin_example/plugin_example3/BUILD.gn +++ b/plugins/manager/test/unittest/common/plugin_example/plugin_example3/BUILD.gn @@ -15,23 +15,23 @@ import("//build/ohos.gni") ohos_shared_library("pluginexample3") { sources = [ - "//foundation/multimedia/image_standard/plugins/manager/test/unittest/common/plugin_example/plugin_example3/cloud_label_detector3.cpp", - "//foundation/multimedia/image_standard/plugins/manager/test/unittest/common/plugin_example/plugin_example3/label_detector3.cpp", - "//foundation/multimedia/image_standard/plugins/manager/test/unittest/common/plugin_example/plugin_example3/plugin_export.cpp", + "//foundation/multimedia/image_framework/plugins/manager/test/unittest/common/plugin_example/plugin_example3/cloud_label_detector3.cpp", + "//foundation/multimedia/image_framework/plugins/manager/test/unittest/common/plugin_example/plugin_example3/label_detector3.cpp", + "//foundation/multimedia/image_framework/plugins/manager/test/unittest/common/plugin_example/plugin_example3/plugin_export.cpp", ] include_dirs = [ "//commonlibrary/c_utils/base/include", - "//foundation/multimedia/image_standard/interfaces/innerkits/include", + "//foundation/multimedia/image_framework/interfaces/innerkits/include", "//foundation/multimedia/utils/include", - "//foundation/multimedia/image_standard/plugins/manager/include", - "//foundation/multimedia/image_standard/plugins/manager/include/pluginbase", - "//foundation/multimedia/image_standard/plugins/manager/test/unittest/common/plugin_example/interface/vision", + "//foundation/multimedia/image_framework/plugins/manager/include", + "//foundation/multimedia/image_framework/plugins/manager/include/pluginbase", + "//foundation/multimedia/image_framework/plugins/manager/test/unittest/common/plugin_example/interface/vision", ] deps = [ "//base/hiviewdfx/hilog/frameworks/native:libhilogutil", - "//foundation/multimedia/image_standard/plugins/manager:pluginmanager", + "//foundation/multimedia/image_framework/plugins/manager:pluginmanager", ] # external_deps = [ "hilog:libhilog" ]