From 62b7f0faeb646c172ec801eb87b2e71fbbb19ce6 Mon Sep 17 00:00:00 2001 From: chen0088 Date: Fri, 23 Feb 2024 17:30:37 +0800 Subject: [PATCH] modify gn to support independent complilation Signed-off-by: chen0088 --- .../native_cpp/camera_sink/BUILD.gn | 4 +-- .../native_cpp/camera_source/BUILD.gn | 4 +-- .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../BUILD.gn | 1 + .../cameraoperator/client/BUILD.gn | 13 +--------- .../client/test/sample/BUILD.gn | 23 +++-------------- .../cameraoperator/handler/BUILD.gn | 12 +-------- services/cameraservice/sinkservice/BUILD.gn | 25 +++++-------------- .../dcamera_sink_controller.h | 4 +-- .../eventbus/dcamera_frame_trigger_event.h | 4 +-- .../eventbus/dcamera_photo_output_event.h | 4 +-- .../dcamera_post_authorization_event.h | 4 +-- .../eventbus/dcamera_video_output_event.h | 4 +-- .../common/distributedcameramgr/BUILD.gn | 1 + .../mock_dcamera_sink_data_process.h | 6 ++--- services/cameraservice/sourceservice/BUILD.gn | 16 +++++------- .../distributedcameramgr/dcamera_source_dev.h | 2 +- .../dcamera_source_event.h | 4 +-- .../dcamera_source_controller.h | 4 +-- .../dcameradata/dcamera_source_input.h | 6 ++--- services/channel/BUILD.gn | 12 +++------ .../channel/src/dcamera_softbus_adapter.cpp | 4 +-- services/data_process/BUILD.gn | 10 +++----- .../include/eventbus/dcamera_codec_event.h | 4 +-- .../include/eventbus/dcamera_pipeline_event.h | 4 +-- .../include/pipeline/dcamera_pipeline_sink.h | 10 ++++---- .../pipeline/dcamera_pipeline_source.h | 10 ++++---- .../decoder/decode_data_process.h | 10 ++++---- .../test/unittest/common/pipeline/BUILD.gn | 1 + .../unittest/common/pipeline_node/BUILD.gn | 1 + 32 files changed, 77 insertions(+), 133 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn b/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn index 06a3406f..98a722d5 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn @@ -26,9 +26,8 @@ ohos_shared_library("distributed_camera_sink_sdk") { ubsan = true } stack_protector_ret = true - include_dirs = [ "${fwk_common_path}/utils/include" ] - include_dirs += [ + include_dirs = [ "include", "include/callback", "${common_path}/include/constants", @@ -54,6 +53,7 @@ ohos_shared_library("distributed_camera_sink_sdk") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn b/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn index 13b7f0c4..dbb822a5 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/camera_source/BUILD.gn @@ -26,9 +26,8 @@ ohos_shared_library("distributed_camera_source_sdk") { ubsan = true } stack_protector_ret = true - include_dirs = [ "${fwk_common_path}/utils/include" ] - include_dirs += [ + include_dirs = [ "include", "include/callback", "${common_path}/include/constants", @@ -54,6 +53,7 @@ ohos_shared_library("distributed_camera_source_sdk") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "ipc:ipc_core", "samgr:samgr_proxy", ] diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeoninputbufferavailable_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeoninputbufferavailable_fuzzer/BUILD.gn index 2c6c50c0..267c4a99 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeoninputbufferavailable_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeoninputbufferavailable_fuzzer/BUILD.gn @@ -70,6 +70,7 @@ ohos_fuzztest("EncodeOnInputBufferAvailableFuzzTest") { external_deps = [ "av_codec:av_codec_client", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_display:libdisplay_composer_proxy_1.0", "eventhandler:libeventhandler", "graphic_surface:surface", diff --git a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeonoutputbufferavailable_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeonoutputbufferavailable_fuzzer/BUILD.gn index 5a2a0b54..09e260c5 100644 --- a/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeonoutputbufferavailable_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sinkfuzztest/encodeonoutputbufferavailable_fuzzer/BUILD.gn @@ -70,6 +70,7 @@ ohos_fuzztest("EncodeOnOutputBufferAvailableFuzzTest") { external_deps = [ "av_codec:av_codec_client", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_display:libdisplay_composer_proxy_1.0", "eventhandler:libeventhandler", "graphic_surface:surface", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeoninputbufferavailable_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeoninputbufferavailable_fuzzer/BUILD.gn index 49024af8..65eaf618 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeoninputbufferavailable_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeoninputbufferavailable_fuzzer/BUILD.gn @@ -70,6 +70,7 @@ ohos_fuzztest("DecodeOnInputBufferAvailableFuzzTest") { external_deps = [ "av_codec:av_codec_client", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "eventhandler:libeventhandler", "graphic_surface:surface", "hitrace:hitrace_meter", diff --git a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeonoutputbufferavailable_fuzzer/BUILD.gn b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeonoutputbufferavailable_fuzzer/BUILD.gn index 797bf608..bd841912 100644 --- a/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeonoutputbufferavailable_fuzzer/BUILD.gn +++ b/interfaces/inner_kits/native_cpp/test/sourcefuzztest/decodeonoutputbufferavailable_fuzzer/BUILD.gn @@ -70,6 +70,7 @@ ohos_fuzztest("DecodeOnOutputBufferAvailableFuzzTest") { external_deps = [ "av_codec:av_codec_client", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "eventhandler:libeventhandler", "graphic_surface:surface", "hitrace:hitrace_meter", diff --git a/services/cameraservice/cameraoperator/client/BUILD.gn b/services/cameraservice/cameraoperator/client/BUILD.gn index 6323675f..3792b18a 100644 --- a/services/cameraservice/cameraoperator/client/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/BUILD.gn @@ -27,19 +27,8 @@ ohos_shared_library("distributed_camera_client") { ubsan = true } stack_protector_ret = true - include_dirs = [ - "${graphicsurface_path}/surface/include", - "${camerastandard_path}/interfaces/inner_api/native/camera/include", - "${camerastandard_path}/interfaces/inner_api/native/camera/include/input", - "${camerastandard_path}/interfaces/inner_api/native/camera/include/output", - "${camerastandard_path}/interfaces/inner_api/native/camera/include/session", - "${camerastandard_path}/services/camera_service/binder/base/include", - "${camerastandard_path}/services/camera_service/binder/client/include", - "${camerastandard_path}/services/camera_service/binder/server/include", - "${camerastandard_path}/services/camera_service/include", - ] - include_dirs += [ + include_dirs = [ "include", "include/callback", "include/listener", diff --git a/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn b/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn index ee6dae1d..4438a5e9 100644 --- a/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn +++ b/services/cameraservice/cameraoperator/client/test/sample/BUILD.gn @@ -18,30 +18,14 @@ import( config("module_private_config") { include_dirs = [ - "//third_party/cJSON", - "//third_party/jsoncpp/include", - "${graphicsurface_path}/surface/include", - "${camerastandard_path}/interfaces/inner_api/native/camera/include", - "${camerastandard_path}/interfaces/inner_api/native/camera/include/input", - "${camerastandard_path}/interfaces/inner_api/native/camera/include/output", - "${camerastandard_path}/interfaces/inner_api/native/camera/include/session", - "${camerastandard_path}/services/camera_service/binder/base/include", - "${camerastandard_path}/services/camera_service/binder/client/include", - "${camerastandard_path}/services/camera_service/binder/server/include", - "${camerastandard_path}/services/camera_service/include", - "${fwk_common_path}/log/include", - "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/log", - "${fwk_utils_path}/include", - ] - - include_dirs += [ "${common_path}/include/constants", "${common_path}/include/utils", "${services_path}/cameraservice/base/include", "${services_path}/cameraservice/cameraoperator/client/include", "${services_path}/cameraservice/cameraoperator/client/include/callback", "${services_path}/cameraservice/cameraoperator/client/include/listener", + "//third_party/cJSON", + "//third_party/jsoncpp/include", ] } @@ -69,9 +53,7 @@ ohos_executable("dcamera_client_demo") { } deps = [ - "${camerastandard_path}/frameworks/native/camera:camera_framework", "${common_path}:distributed_camera_utils", - "${fwk_utils_path}:distributedhardwareutils", "${services_path}/cameraservice/cameraoperator/client:distributed_camera_client", "${services_path}/cameraservice/sinkservice:distributed_camera_sink", "//third_party/cJSON:cjson", @@ -86,6 +68,7 @@ ohos_executable("dcamera_client_demo") { "access_token:libtoken_setproc", "av_codec:av_codec_client", "c_utils:utils", + "camera_framework:camera_framework", "drivers_interface_camera:metadata", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", "drivers_peripheral_display:hdi_gralloc_client", diff --git a/services/cameraservice/cameraoperator/handler/BUILD.gn b/services/cameraservice/cameraoperator/handler/BUILD.gn index c7a95ebb..032bee17 100644 --- a/services/cameraservice/cameraoperator/handler/BUILD.gn +++ b/services/cameraservice/cameraoperator/handler/BUILD.gn @@ -31,17 +31,6 @@ ohos_shared_library("distributed_camera_handler") { "//third_party/cJSON", "//third_party/jsoncpp/include", "//third_party/json/include", - "${graphicsurface_path}/surface/include", - "${camerastandard_path}/interfaces/inner_api/native/camera/include", - "${camerastandard_path}/interfaces/inner_api/native/camera/include/input", - "${camerastandard_path}/interfaces/inner_api/native/camera/include/output", - "${camerastandard_path}/interfaces/inner_api/native/camera/include/session", - "${camerastandard_path}/services/camera_service/binder/base/include", - "${camerastandard_path}/services/camera_service/binder/client/include", - "${camerastandard_path}/services/camera_service/binder/server/include", - "${camerastandard_path}/services/camera_service/include", - "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include", ] include_dirs += [ @@ -72,6 +61,7 @@ ohos_shared_library("distributed_camera_handler") { "av_codec:av_codec_client", "c_utils:utils", "camera_framework:camera_framework", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_camera:metadata", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", "drivers_peripheral_display:hdi_gralloc_client", diff --git a/services/cameraservice/sinkservice/BUILD.gn b/services/cameraservice/sinkservice/BUILD.gn index af190f2d..970f72ea 100644 --- a/services/cameraservice/sinkservice/BUILD.gn +++ b/services/cameraservice/sinkservice/BUILD.gn @@ -27,24 +27,8 @@ ohos_shared_library("distributed_camera_sink") { ubsan = true } stack_protector_ret = true - include_dirs = [ - "${av_transport_path}/common/include", - "${graphicsurface_path}/surface/include", - "${camerastandard_path}/interfaces/inner_api/native/camera/include", - "${camerastandard_path}/interfaces/inner_api/native/camera/include/input", - "${camerastandard_path}/interfaces/inner_api/native/camera/include/output", - "${camerastandard_path}/interfaces/inner_api/native/camera/include/session", - "${camerastandard_path}/services/camera_service/binder/base/include", - "${camerastandard_path}/services/camera_service/binder/client/include", - "${camerastandard_path}/services/camera_service/binder/server/include", - "${camerastandard_path}/services/camera_service/include", - "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/eventbus", - "//third_party/cJSON", - "//third_party/jsoncpp/include", - ] - include_dirs += [ + include_dirs = [ "include/distributedcamera", "include/distributedcameramgr", "include/distributedcameramgr/callback", @@ -70,8 +54,8 @@ ohos_shared_library("distributed_camera_sink") { "${feeding_smoother_path}/base", "${feeding_smoother_path}/derived", "${feeding_smoother_path}/utils", - "${fwk_common_path}/utils/include", - "${fwk_innerkits_path}/include", + "//third_party/cJSON", + "//third_party/jsoncpp/include", ] sources = [ @@ -130,6 +114,9 @@ ohos_shared_library("distributed_camera_sink") { "camera_framework:camera_framework", "device_manager:devicemanagersdk", "device_security_level:dslm_sdk", + "distributed_hardware_fwk:distributed_av_receiver", + "distributed_hardware_fwk:distributedhardwareutils", + "distributed_hardware_fwk:libdhfwk_sdk", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", "drivers_peripheral_display:hdi_gralloc_client", "eventhandler:libeventhandler", diff --git a/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_controller.h b/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_controller.h index ea61983a..7e69dad6 100644 --- a/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_controller.h +++ b/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_controller.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef OHOS_DCAMERA_SINK_CONTROLLER_H #define OHOS_DCAMERA_SINK_CONTROLLER_H -#include "event_bus.h" +#include "eventbus/event_bus.h" #include "dcamera_frame_trigger_event.h" #include "dcamera_post_authorization_event.h" #include "icamera_controller.h" diff --git a/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_frame_trigger_event.h b/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_frame_trigger_event.h index 9b1e2176..54c2cb2e 100644 --- a/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_frame_trigger_event.h +++ b/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_frame_trigger_event.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -17,7 +17,7 @@ #define OHOS_DCAMERA_FRAME_TRIGER_EVENT_H #include -#include "event.h" +#include "eventbus/event.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_photo_output_event.h b/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_photo_output_event.h index 6d17dcf0..f13dc028 100644 --- a/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_photo_output_event.h +++ b/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_photo_output_event.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef OHOS_DCAMERA_PHOTO_OUTPUT_EVENT_H #define OHOS_DCAMERA_PHOTO_OUTPUT_EVENT_H -#include "event.h" +#include "eventbus/event.h" #include #include diff --git a/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_post_authorization_event.h b/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_post_authorization_event.h index 5c23084c..86dfc3da 100644 --- a/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_post_authorization_event.h +++ b/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_post_authorization_event.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -16,7 +16,7 @@ #ifndef OHOS_DCAMERA_POST_AUTHORIZATION_EVENT_H #define OHOS_DCAMERA_POST_AUTHORIZATION_EVENT_H -#include "event.h" +#include "eventbus/event.h" #include "dcamera_capture_info_cmd.h" diff --git a/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_video_output_event.h b/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_video_output_event.h index 262c22da..aea9b9ab 100644 --- a/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_video_output_event.h +++ b/services/cameraservice/sinkservice/include/distributedcameramgr/eventbus/dcamera_video_output_event.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -18,7 +18,7 @@ #include -#include "event.h" +#include "eventbus/event.h" #include "data_buffer.h" namespace OHOS { diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn index ca7711f2..b33996f0 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn @@ -96,6 +96,7 @@ ohos_unittest("DCameraSinkMgrTest") { "av_codec:av_codec_client", "c_utils:utils", "device_manager:devicemanagersdk", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_camera:metadata", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", "drivers_peripheral_display:hdi_gralloc_client", diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_dcamera_sink_data_process.h b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_dcamera_sink_data_process.h index 0083041f..a35612aa 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_dcamera_sink_data_process.h +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_dcamera_sink_data_process.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -19,8 +19,8 @@ #include #include -#include "event.h" -#include "event_bus.h" +#include "eventbus/event.h" +#include "eventbus/event_bus.h" #include "data_buffer.h" #include "data_process_listener.h" diff --git a/services/cameraservice/sourceservice/BUILD.gn b/services/cameraservice/sourceservice/BUILD.gn index d221ef14..183e77c6 100644 --- a/services/cameraservice/sourceservice/BUILD.gn +++ b/services/cameraservice/sourceservice/BUILD.gn @@ -27,15 +27,8 @@ ohos_shared_library("distributed_camera_source") { ubsan = true } stack_protector_ret = true - include_dirs = [ - "${av_transport_path}/common/include", - "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/eventbus", - "//third_party/cJSON", - "//third_party/jsoncpp/include", - ] - include_dirs += [ + include_dirs = [ "include/distributedcamera", "include/distributedcameramgr", "include/distributedcameramgr/dcamerainterface", @@ -60,8 +53,8 @@ ohos_shared_library("distributed_camera_source") { "${services_path}/data_process/include/pipeline", "${services_path}/data_process/include/utils", "${graphicsurface_path}/surface/include", - "${fwk_common_path}/utils/include", - "${fwk_innerkits_path}/include", + "//third_party/cJSON", + "//third_party/jsoncpp/include", ] sources = [ @@ -127,6 +120,9 @@ ohos_shared_library("distributed_camera_source") { "access_token:libaccesstoken_sdk", "access_token:libtokenid_sdk", "c_utils:utils", + "distributed_hardware_fwk:distributed_av_receiver", + "distributed_hardware_fwk:distributedhardwareutils", + "distributed_hardware_fwk:libdhfwk_sdk", "drivers_interface_distributed_camera:libdistributed_camera_provider_proxy_1.0", "eventhandler:libeventhandler", "graphic_surface:surface", diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h index ef54422f..2e3a81ce 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h @@ -19,7 +19,7 @@ #include "dcamera_index.h" #include "dcamera_source_event.h" #include "dcamera_source_state_machine.h" -#include "event_bus.h" +#include "eventbus/event_bus.h" #include "icamera_controller.h" #include "icamera_state_listener.h" #include "icamera_input.h" diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_event.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_event.h index 3a7ed351..f737f9ea 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_event.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_event.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -18,7 +18,7 @@ #include -#include "event.h" +#include "eventbus/event.h" #include "v1_0/dcamera_types.h" #include "dcamera_event_cmd.h" diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameracontrol/dcamera_source_controller.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameracontrol/dcamera_source_controller.h index dc9b0ad3..0c844b80 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameracontrol/dcamera_source_controller.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameracontrol/dcamera_source_controller.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -22,7 +22,7 @@ #include "icamera_channel_listener.h" #include "dcamera_source_dev.h" #include "dcamera_source_state_machine.h" -#include "event_bus.h" +#include "eventbus/event_bus.h" #include "icamera_channel.h" #include "iremote_object.h" diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_input.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_input.h index b84e730e..3b60547a 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_input.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_input.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -22,8 +22,8 @@ #include "icamera_source_data_process.h" #include "dcamera_source_dev.h" -#include "event_bus.h" -#include "event_sender.h" +#include "eventbus/event_bus.h" +#include "eventbus/event_sender.h" namespace OHOS { namespace DistributedHardware { diff --git a/services/channel/BUILD.gn b/services/channel/BUILD.gn index 3e232bc3..2756ba60 100644 --- a/services/channel/BUILD.gn +++ b/services/channel/BUILD.gn @@ -27,21 +27,15 @@ ohos_shared_library("distributed_camera_channel") { ubsan = true } stack_protector_ret = true - include_dirs = [ - "${av_transport_path}/common/include", - "${fwk_common_path}/utils/include", - "${services_path}/cameraservice/base/include", - ] - include_dirs += [ + include_dirs = [ "include", "${common_path}/include/constants", "${common_path}/include/utils", - "//foundation//communication//dsoftbus//core//common//include", - "${fwk_innerkits_path}/include", "${feeding_smoother_path}/base", "${feeding_smoother_path}/derived", "${feeding_smoother_path}/utils", + "${services_path}/cameraservice/base/include", ] sources = [ @@ -64,6 +58,8 @@ ohos_shared_library("distributed_camera_channel") { external_deps = [ "c_utils:utils", + "distributed_hardware_fwk:distributed_av_receiver", + "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", "dsoftbus:softbus_client", "eventhandler:libeventhandler", diff --git a/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index b8e32114..df69cfc5 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -23,7 +23,7 @@ #include #include "softbus_bus_center.h" #include "softbus_common.h" -#include "softbus_errcode.h" +#include "softbus_error_code.h" #include "dcamera_utils_tools.h" #include "dcamera_frame_info.h" diff --git a/services/data_process/BUILD.gn b/services/data_process/BUILD.gn index f34d4ed0..c0235874 100644 --- a/services/data_process/BUILD.gn +++ b/services/data_process/BUILD.gn @@ -27,14 +27,8 @@ ohos_shared_library("distributed_camera_data_process") { ubsan = true } stack_protector_ret = true - include_dirs = [ - "${fwk_common_path}/utils/include", - "${fwk_utils_path}/include/eventbus", - "${graphicsurface_path}/surface/include", - "${services_path}/cameraservice/base/include", - ] - include_dirs += [ + include_dirs = [ "include/interfaces", "include/eventbus", "include/pipeline", @@ -50,6 +44,7 @@ ohos_shared_library("distributed_camera_data_process") { "${feeding_smoother_path}/derived", "${feeding_smoother_path}/utils", "${innerkits_path}/native_cpp/camera_source/include", + "${services_path}/cameraservice/base/include", ] sources = [ @@ -104,6 +99,7 @@ ohos_shared_library("distributed_camera_data_process") { external_deps = [ "av_codec:av_codec_client", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_display:libdisplay_composer_proxy_1.0", "eventhandler:libeventhandler", "graphic_surface:surface", diff --git a/services/data_process/include/eventbus/dcamera_codec_event.h b/services/data_process/include/eventbus/dcamera_codec_event.h index 3e8bbc66..c34e679c 100644 --- a/services/data_process/include/eventbus/dcamera_codec_event.h +++ b/services/data_process/include/eventbus/dcamera_codec_event.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021-2023 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -18,7 +18,7 @@ #include -#include "event.h" +#include "eventbus/event.h" #include "data_buffer.h" #include "image_common_type.h" #include "surface.h" diff --git a/services/data_process/include/eventbus/dcamera_pipeline_event.h b/services/data_process/include/eventbus/dcamera_pipeline_event.h index 5c2534cb..a021436b 100644 --- a/services/data_process/include/eventbus/dcamera_pipeline_event.h +++ b/services/data_process/include/eventbus/dcamera_pipeline_event.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Huawei Device Co., Ltd. + * Copyright (c) 2021-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -18,7 +18,7 @@ #include -#include "event.h" +#include "eventbus/event.h" #include "data_buffer.h" #include "image_common_type.h" diff --git a/services/data_process/include/pipeline/dcamera_pipeline_sink.h b/services/data_process/include/pipeline/dcamera_pipeline_sink.h index f4807702..9ddee717 100644 --- a/services/data_process/include/pipeline/dcamera_pipeline_sink.h +++ b/services/data_process/include/pipeline/dcamera_pipeline_sink.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -19,10 +19,10 @@ #include #include -#include "event.h" -#include "event_bus.h" -#include "event_sender.h" -#include "eventbus_handler.h" +#include "eventbus/event.h" +#include "eventbus/event_bus.h" +#include "eventbus/event_sender.h" +#include "eventbus/eventbus_handler.h" #include "data_buffer.h" #include "image_common_type.h" diff --git a/services/data_process/include/pipeline/dcamera_pipeline_source.h b/services/data_process/include/pipeline/dcamera_pipeline_source.h index 5cd74bbd..380bad31 100644 --- a/services/data_process/include/pipeline/dcamera_pipeline_source.h +++ b/services/data_process/include/pipeline/dcamera_pipeline_source.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022 Huawei Device Co., Ltd. + * Copyright (c) 2022-2024 Huawei Device Co., Ltd. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -19,10 +19,10 @@ #include #include -#include "event.h" -#include "event_bus.h" -#include "event_sender.h" -#include "eventbus_handler.h" +#include "eventbus/event.h" +#include "eventbus/event_bus.h" +#include "eventbus/event_sender.h" +#include "eventbus/eventbus_handler.h" #include "data_buffer.h" #include "image_common_type.h" diff --git a/services/data_process/include/pipeline_node/multimedia_codec/decoder/decode_data_process.h b/services/data_process/include/pipeline_node/multimedia_codec/decoder/decode_data_process.h index 72bc8856..72d749b1 100644 --- a/services/data_process/include/pipeline_node/multimedia_codec/decoder/decode_data_process.h +++ b/services/data_process/include/pipeline_node/multimedia_codec/decoder/decode_data_process.h @@ -26,11 +26,11 @@ #include "avcodec_common.h" #include "avcodec_video_decoder.h" #include "buffer/avsharedmemory.h" -#include "event.h" -#include "event_bus.h" -#include "event_sender.h" -#include "event_registration.h" -#include "eventbus_handler.h" +#include "eventbus/event.h" +#include "eventbus/event_bus.h" +#include "eventbus/event_sender.h" +#include "eventbus/event_registration.h" +#include "eventbus/eventbus_handler.h" #include "meta/format.h" #include "ibuffer_consumer_listener.h" #include "iconsumer_surface.h" diff --git a/services/data_process/test/unittest/common/pipeline/BUILD.gn b/services/data_process/test/unittest/common/pipeline/BUILD.gn index 48c95360..512307c5 100644 --- a/services/data_process/test/unittest/common/pipeline/BUILD.gn +++ b/services/data_process/test/unittest/common/pipeline/BUILD.gn @@ -58,6 +58,7 @@ ohos_unittest("DCameraDataProcessPipelineTest") { external_deps = [ "av_codec:av_codec_client", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "eventhandler:libeventhandler", "graphic_surface:surface", "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 bdeb2ed5..68ce24c4 100644 --- a/services/data_process/test/unittest/common/pipeline_node/BUILD.gn +++ b/services/data_process/test/unittest/common/pipeline_node/BUILD.gn @@ -70,6 +70,7 @@ ohos_unittest("DCameraDataProcessPipelineNodeTest") { external_deps = [ "av_codec:av_codec_client", "c_utils:utils", + "distributed_hardware_fwk:distributedhardwareutils", "drivers_interface_display:libdisplay_composer_proxy_1.0", "eventhandler:libeventhandler", "graphic_surface:surface", -- Gitee