openharmony/multimedia_video_processing_engine
1
0
Fork 0
mirror of https://github.com/openharmony/multimedia_video_processing_engine.git synced 2026-07-15 15:25:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix bug

Browse Source 
Signed-off-by: liushang <liushang2@huawei.com>
This commit is contained in:
liushang
2025-03-08 18:09:43 +08:00
parent f9d242e8c5
commit ec6b1ffab0
12 changed files with 59 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/BUILD.gn
+51 -58
View File
@@ -79,66 +79,62 @@ config("video_process_config") {
"$INTERFACES_INNER_API_DIR/module",
"$INTERFACES_DIR/plugin",
"$VIDEO_PROCESSING_ENGINE_ROOT_DIR/services/include",
# temporary dir
"$SKIA_DIR",
"${target_gen_dir}/../services/",
"$SKIA_DIR/include/core",
"$SKIA_DIR/include/encode",
"$SKIA_DIR",
"$SKIA_DIR/src/ports/skia_ohos",
"$SKIA_DIR/src/ports",
"$SKIA_DIR/src/images",
"$SKIA_DIR/include/private",
"$SKIA_DIR/include/effects",
"$SKIA_DIR/third_party/externals/angle2/src/common",
"$SKIA_DIR/third_party/externals/angle2/src/",
"$SKIA_DIR/third_party/externals/angle2/src/common/third_party/base/",
"//foundation/graphic/graphic_2d/utils/color_manager/export",
"//base/startup/init/interfaces/innerkits/include/syspara/",
]
}
ohos_prebuilt_shared_library("extream_vision_engine") {
if (is_asan && use_hwasan) {
source = "//binary/artifacts/display/AIPQ20/asan/libextream_vision_engine.so"
} else {
source = "//binary/artifacts/display/AIPQ20/libextream_vision_engine.so"
}
module_install_dir = "lib64/"
output = "libextream_vision_engine.so"
install_images = [ "system" ]
subsystem_name = "multimedia"
part_name = "video_processing_engine"
install_enable = true
}
if (defined(global_parts_info) &&
defined(global_parts_info.multimedia_video_processing_engine_ext)) {
ohos_prebuilt_shared_library("extream_vision_engine") {
if (is_asan && use_hwasan) {
source = "//binary/artifacts/display/AIPQ20/asan/libextream_vision_engine.so"
} else {
source = "//binary/artifacts/display/AIPQ20/libextream_vision_engine.so"
}
module_install_dir = "lib64/"
output = "libextream_vision_engine.so"
install_images = [ "system" ]
subsystem_name = "multimedia"
part_name = "video_processing_engine"
install_enable = true
}
ohos_prebuilt_shared_library("ai_super_resolution") {
if (is_asan && use_hwasan) {
source = "//binary/artifacts/display/AIPQ20/asan/libdisplay_aipq_imagesr.so"
} else {
source = "//binary/artifacts/display/AIPQ20/libdisplay_aipq_imagesr.so"
}
module_install_dir = "lib64/"
output = "libdisplay_aipq_imagesr.so"
install_images = [ "system" ]
subsystem_name = "multimedia"
part_name = "video_processing_engine"
install_enable = true
}
ohos_prebuilt_shared_library("ai_super_resolution") {
if (is_asan && use_hwasan) {
source = "//binary/artifacts/display/AIPQ20/asan/libdisplay_aipq_imagesr.so"
} else {
source = "//binary/artifacts/display/AIPQ20/libdisplay_aipq_imagesr.so"
}
module_install_dir = "lib64/"
output = "libdisplay_aipq_imagesr.so"
install_images = [ "system" ]
subsystem_name = "multimedia"
part_name = "video_processing_engine"
install_enable = true
}
ohos_prebuilt_shared_library("aihdr_engine") {
if (is_asan && use_hwasan) {
source = "//binary/artifacts/display/AIPQ20/asan/libaihdr_engine.so"
} else {
source = "//binary/artifacts/display/AIPQ20/libaihdr_engine.so"
}
module_install_dir = "lib64/"
output = "libaihdr_engine.so"
install_images = [ "system" ]
subsystem_name = "multimedia"
part_name = "video_processing_engine"
install_enable = true
ohos_prebuilt_shared_library("aihdr_engine") {
if (is_asan && use_hwasan) {
source = "//binary/artifacts/display/AIPQ20/asan/libaihdr_engine.so"
} else {
source = "//binary/artifacts/display/AIPQ20/libaihdr_engine.so"
}
module_install_dir = "lib64/"
output = "libaihdr_engine.so"
install_images = [ "system" ]
subsystem_name = "multimedia"
part_name = "video_processing_engine"
install_enable = true
}
} else {
group("extream_vision_engine") {
}
group("ai_super_resolution") {
}
group("aihdr_engine") {
}
}
ohos_shared_library("videoprocessingengine") {
@@ -217,7 +213,7 @@ ohos_shared_library("videoprocessingengine") {
"hdf_core:libhdf_host",
"hdf_core:libhdf_ipc_adapter",
"hdf_core:libhdf_utils",
"hdf_core:hdf_posix_osal",
#"hdf_core:hdf_posix_osal",
"graphic_2d:2d_graphics",
"ipc:ipc_single",
"safwk:system_ability_fwk",
@@ -444,9 +440,6 @@ ohos_shared_library("detailEnhancer") {
include_dirs = [
"$DFX_DIR/include",
"//foundation/multimedia/media_foundation/interface/kits/c",
"//foundation/multimedia/image_framework/interfaces/kits/native/include/image",
"//foundation/multimedia/image_framework/frameworks/kits/js/common/ndk/include",
"//foundation/multimedia/video_processing_engine/interfaces/kits/js",
"//foundation/multimedia/video_processing_engine/interfaces/inner_api",
"//foundation/multimedia/video_processing_engine/framework/capi/image_processing/include/",
framework/algorithm/colorspace_converter_display/colorspace_converter_display_fwk.cpp
+1 -1
View File
@@ -40,7 +40,7 @@ VPEAlgoErrCode ColorSpaceConverterDisplayFwk::Process(const std::shared_ptr<OHOS
{
auto ret = Init();
CHECK_AND_RETURN_RET_LOG(ret == VPE_ALGO_ERR_OK, VPE_ALGO_ERR_INIT_FAILED, "Init failed");
VPE_LOGD("size of impl %{public}lu", impl_.size());
VPE_LOGD("size of impl %{public}zu", impl_.size());
CHECK_AND_RETURN_RET_LOG(!impl_.empty(), VPE_ALGO_ERR_NOT_IMPLEMENTED, "Extension is not found");
DeserializedDisplayParameter localParameter;
framework/algorithm/common/algorithm_utils.cpp
+1
View File
@@ -16,6 +16,7 @@
#include "algorithm_utils.h"
#include <unordered_map>
#include "securec.h"
#include "vpe_log.h"
using namespace OHOS::Media::VideoProcessingEngine;
framework/algorithm/common/image_openclsetup.cpp
+1
View File
@@ -16,6 +16,7 @@
#include "image_opencl_wrapper.h"
#include <cstdio>
#include <cstring>
#include "securec.h"
#include "vpe_log.h"
// OpenCL Init
framework/algorithm/common/vpe_parse_metadata.cpp
+1
View File
@@ -14,6 +14,7 @@
#include "vpe_parse_metadata.h"
#include <cstdint>
#include <vector>
#include "securec.h"
#include "vpe_log.h"
namespace OHOS {
framework/algorithm/common/vpe_utils_common.cpp
+1 -1
View File
@@ -16,7 +16,7 @@
#include "vpe_utils_common.h"
#include <unordered_map>
#include "securec.h"
#include "algorithm_utils.h"
#include "surface_buffer_impl.h"
#include "surface_type.h"
framework/algorithm/detail_enhancer/detail_enhancer_image_fwk.cpp
+1
View File
@@ -22,6 +22,7 @@
#include "native_buffer.h"
#include "surface_buffer.h"
#include "video_processing_client.h"
#include "securec.h"
#include "vpe_log.h"
#include "vpe_trace.h"
services/BUILD.gn
+1 -4
View File
@@ -73,10 +73,7 @@ ohos_shared_library("videoprocessingservice") {
include_dirs = [
"include",
"${target_gen_dir}",
"//foundation/multimedia/video_processing_engine/framework/dfx/include",
"//foundation/systemabilitymgr/safwk/services/safwk/include",
"//foundation/systemabilitymgr/samgr/interfaces/innerkits/samgr_proxy/include",
"//foundation/communication/ipc/interfaces/innerkits/ipc_core/include",
"//foundation/multimedia/video_processing_engine/framework/dfx/include"
]
deps = [
test/unittest/colorSpace_converter_video_ndk/BUILD.gn
-3
View File
@@ -41,9 +41,6 @@ ohos_unittest("colorSpace_converter_video_ndk_unit_test") {
"$FRAMEWORK_DIR/dfx/include/",
"$FRAMEWORK_DIR/capi/video_processing/include/",
"$COLORSPACE_CONVERTER_VIDEO_DIR/include/",
"//foundation/multimedia/media_foundation/interface/kits/c/",
"//foundation/graphic/graphic_2d/interfaces/inner_api/",
"//foundation/graphic/graphic_2d_ext/ohcore/graphic_compat_layer/include/utils/",
]
sources = [ "colorSpace_converter_video_ndk_unit_test.cpp" ]
test/unittest/detail_enhancer_video_ndk/BUILD.gn
-1
View File
@@ -33,7 +33,6 @@ ohos_unittest("detail_enhancer_video_ndk_unit_test") {
"$FRAMEWORK_DIR/capi/detail_enhancer/include",
"$INTERFACES_DIR/kits/c",
"$FRAMEWORK_DIR/capi/video_processing/include",
"$VIDEO_PROCESSING_ENGINE_ROOT_DIR/../media_foundation/interface/kits/c",
"$ALGORITHM_DIR/detail_enhancer_video/include",
"$VIDEO_PROCESSING_ENGINE_ROOT_DIR/services/include",
]
test/unittest/image_processing/BUILD.gn
+1 -3
View File
@@ -35,9 +35,7 @@ ohos_unittest("image_processing_unit_test") {
"$ALGORITHM_DIR/detail_enhancer/include",
"$FRAMEWORK_DIR/capi/image_processing/detail_enhancer/include",
"$INTERFACES_DIR/kits/c",
"$FRAMEWORK_DIR/capi/image_processing/include",
"//foundation/multimedia/media_foundation/interface/kits/c",
"//foundation/multimedia/image_framework/interfaces/kits/native/include/image"
"$FRAMEWORK_DIR/capi/image_processing/include"
]
sources = [ "image_processing_unit_test.cpp" ]
test/unittest/metadata_gen_video_ndk/BUILD.gn
-3
View File
@@ -38,9 +38,6 @@ ohos_unittest("metadata_gen_video_ndk_unit_test") {
"$ALGORITHM_DIR/colorspace_converter_video/include",
"$VIDEO_PROCESSING_ENGINE_ROOT_DIR/services/include",
"$TEST_UTILS_PATH/ColorSpaceConverter/sample/video",
"//foundation/multimedia/media_foundation/interface/kits/c/",
"//foundation/graphic/graphic_2d/interfaces/inner_api/",
"//foundation/graphic/graphic_2d_ext/ohcore/graphic_compat_layer/include/utils/",
]
sources = [ "metadata_gen_video_ndk_unit_test.cpp" ]