From 7e87115db005e5cca9c571df3f1ece037db428b3 Mon Sep 17 00:00:00 2001 From: w30042960 Date: Thu, 28 Mar 2024 12:04:35 +0800 Subject: [PATCH] modify externalT Signed-off-by: w30042960 --- bundle.json | 1 + services/data_process/BUILD.gn | 5 ++--- services/data_process/test/unittest/common/pipeline/BUILD.gn | 2 +- .../data_process/test/unittest/common/pipeline_node/BUILD.gn | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/bundle.json b/bundle.json index e47f5143..f8695282 100644 --- a/bundle.json +++ b/bundle.json @@ -42,6 +42,7 @@ "c_utils", "cJSON", "dsoftbus", + "ffmpeg", "hicollie", "media_foundation", "hisysevent", diff --git a/services/data_process/BUILD.gn b/services/data_process/BUILD.gn index a9ee0792..f95b6036 100644 --- a/services/data_process/BUILD.gn +++ b/services/data_process/BUILD.gn @@ -68,12 +68,11 @@ ohos_shared_library("distributed_camera_data_process") { "src/pipeline_node/scale_conversion/scale_convert_process.cpp", ] } else { - include_dirs += [ "//third_party/ffmpeg/" ] sources += [ "src/pipeline_node/multimedia_codec/decoder/decode_data_process_common.cpp", "src/pipeline_node/scale_conversion/scale_convert_process_common.cpp", ] - deps += [ "//third_party/ffmpeg:libohosffmpeg" ] + external_deps = [ "ffmpeg:libohosffmpeg" ] } cflags = [ @@ -97,7 +96,7 @@ ohos_shared_library("distributed_camera_data_process") { defines += [ "DUMP_DCAMERA_FILE" ] } - external_deps = [ + external_deps += [ "av_codec:av_codec_client", "cJSON:cjson", "c_utils:utils", diff --git a/services/data_process/test/unittest/common/pipeline/BUILD.gn b/services/data_process/test/unittest/common/pipeline/BUILD.gn index 581aa8d5..4edee2ee 100644 --- a/services/data_process/test/unittest/common/pipeline/BUILD.gn +++ b/services/data_process/test/unittest/common/pipeline/BUILD.gn @@ -52,7 +52,6 @@ ohos_unittest("DCameraDataProcessPipelineTest") { deps = [ "${common_path}:distributed_camera_utils", "${services_path}/data_process:distributed_camera_data_process", - "//third_party/ffmpeg:libohosffmpeg", ] external_deps = [ @@ -60,6 +59,7 @@ ohos_unittest("DCameraDataProcessPipelineTest") { "c_utils:utils", "distributed_hardware_fwk:distributedhardwareutils", "eventhandler:libeventhandler", + "ffmpeg:libohosffmpeg", "graphic_surface:surface", "hilog:libhilog", "hitrace:hitrace_meter", diff --git a/services/data_process/test/unittest/common/pipeline_node/BUILD.gn b/services/data_process/test/unittest/common/pipeline_node/BUILD.gn index efe157d8..91053f6f 100644 --- a/services/data_process/test/unittest/common/pipeline_node/BUILD.gn +++ b/services/data_process/test/unittest/common/pipeline_node/BUILD.gn @@ -34,7 +34,6 @@ config("module_private_config") { "${innerkits_path}/native_cpp/camera_source/include", "${fwk_common_path}/utils/include", "${fwk_utils_path}/include/eventbus", - "//third_party/ffmpeg/", "${feeding_smoother_path}/base", "${services_path}/cameraservice/base/include", ] @@ -64,7 +63,6 @@ ohos_unittest("DCameraDataProcessPipelineNodeTest") { deps = [ "${common_path}:distributed_camera_utils", "${services_path}/data_process:distributed_camera_data_process", - "//third_party/ffmpeg:libohosffmpeg", ] external_deps = [ @@ -73,6 +71,7 @@ ohos_unittest("DCameraDataProcessPipelineNodeTest") { "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_display:libdisplay_composer_proxy_1.0", "eventhandler:libeventhandler", + "ffmpeg:libohosffmpeg", "graphic_surface:surface", "hilog:libhilog", "hitrace:hitrace_meter", -- Gitee