diff --git a/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn b/interfaces/inner_kits/native_cpp/camera_sink/BUILD.gn index 06a3406f130cd9e25ad3080cfa15ef2b5866f9e6..98a722d5d5bb5d9ec4363f05a43e57b04b8bd089 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 13b7f0c4b8cf8b100ae5385c594b0a607f2acccf..dbb822a5b0b6327d16e40600fce477f638678449 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 2c6c50c05e92e182a1bd30ed44e2e7352ba5d775..267c4a991e533c8be869c88f22a72f91cb9ca4ee 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 5a2a0b548fddcc6c91520be0dfc8c8ac47fb5621..09e260c529a5701b8770719c0009f3da5f49f1e5 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 49024af8cf9310bea13f3462a65f2ac70ff73f2f..65eaf6185a3bca7e5deb988f95c5e7ae05813345 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 797bf60820a6fdfc1a0b00200058a438374758c7..bd841912cea22faa080c0741f580d557c5639843 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 6323675fd968b59a90677d02fd712ea3f7636d7b..3792b18abf75d5a7d3ea01cdada5d03a7f321afd 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 ee6dae1dbee0ea3b53a016769a1074166e68b2de..4438a5e9ee460fcff595528206de675d1a6c68be 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 c7a95ebb4b02a39794582326869b009c54ac9222..032bee175a7b40d2ae6b06b0f25f48b85c878217 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 af190f2d9a9e8d67cda9a610ffd186429e87b8b3..970f72eaaf29ed723c40294a458b57810b2b69fe 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 ea61983adf51183d97246a85f3837be108af1e70..7e69dad63aca071f512bacb3565f808f951742ab 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 9b1e217654627e4f83c8a328ab3fb0700a764a5d..54c2cb2e9d4eb631eed30c2a427da1fe6f7eba20 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 6d17dcf04ba354e3cdfb1cf5cfa5eca8633a3f0c..f13dc0280c8aef9658d9bcfa97583853b37ab8c4 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 5c23084c07f2e7a4a585aa2f86925eafb5197fdd..86dfc3da8bffdc0d340b859f07bbc27df2d91f74 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 262c22da195579f189c5c7f444869dba7f7dc180..aea9b9ab12850ddbe2b3abbeb53827779ee43c06 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 ca7711f2e0c3711a81a806170075c2d3723d35ef..b33996f077ecf2c63ff441e66b1eedd4081cc249 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 0083041fe5a50ff97cee0f19f307810399d0fbd1..a35612aa6ffebe6a4f14b3c0e72170e0671bd962 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 d221ef1474e0036e403d1241b17e608f4373be76..183e77c6785117c231b9d672d591af23a0884dc0 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 ef54422f42c15fd3222fb98bce30ab47d582eebd..2e3a81ce4711116661940f8329543e09f7a773d7 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 3a7ed35115f5bdfe3a2bc11aff721a20c42a31c2..f737f9ea19557620dbe15a4de3c651679da3a0da 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 dc9b0ad3dab75998bed4256b0c50ae024021f88a..0c844b80ddd6e8c5d57ea83b2dd0e63550969361 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 b84e730e0184c7a46e92149768cdfab08175ce07..3b60547ab08778b200fd06aa50459d8295951535 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 3e232bc32f3652e59e3ae1e2bfb4b418b062da4f..2756ba60c10ceb43a747dfbc8c7fc84de815d94b 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 b8e32114b8a53517927d01695091e953d59a2022..df69cfc52e7b5314e00f7a867758f9bc11f0591f 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 f34d4ed08615f5f58b2e221804aa77852db53777..c02358749c823c8bc4e6eafd1062ebd8cb886920 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 3e8bbc66ad74144e90fa64abc3d27214839ee83b..c34e679cd9c5a36ede4b194c1eaabdacd2b6e942 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 5c2534cb995bae1edf0c2748849aa3eeb0b04694..a021436b9c90b4926a32cb78a73aeda7a65eee24 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 f4807702cc2d1e14a58370e67736f70912be4a15..9ddee71714403dbf1c096b4234128a385b4836fd 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 5cd74bbd48a66ca122ff5e72eead1d159b4bd42e..380bad31fa97c38135d3abb6a6d2b5d37a16655b 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 72bc88568ce07357c60cab4d2d1df715154eb050..72d749b1cec8e690b8690a9526070e2d77199969 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 48c953605d530bd26a4e9e10332b767ad2f2e5ff..512307c502b8438d8961beb19b000e4dd8c394de 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 bdeb2ed5e48bbc153683c349173ad3c17b7d939b..68ce24c4596938467ab37c08b3dc5b33e7782f22 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",