diff --git a/README_zh.md b/README_zh.md index 39f17d5bfa6f9c26d43bac715514e299b1f19798..b867add84be6604ff1007429ea716ad69580a45a 100644 --- a/README_zh.md +++ b/README_zh.md @@ -54,7 +54,10 @@ ### **接口说明** 分布式相机组件实现分布式硬件管理框架提供的接口，分布式硬件管理框架统一调用接口实现虚拟硬件驱动注册等功能。 -### **业务流程说明** +### **场景说明** +被控端设备上线之后，主控端可以使能该设备相机并像使用本地相机一样使用被控端相机，直到被控端设备下线。 + +### **流程说明** #### **1. 设备开机启动** 系统拉起分布式相机的SA服务，Source侧被初始化，相关模块被初始化。 diff --git a/bundle.json b/bundle.json index dfcb1b63a2162bcc8776a523bd4084b53896abd4..302bb55f2a5d25839d57669459e862ee65d46402 100644 --- a/bundle.json +++ b/bundle.json @@ -85,9 +85,6 @@ } ], "test":[ - "//foundation/distributedhardware/distributedcamera/services/cameraservice/cameraoperator/client/test/unittest:camera_client_test", - "//foundation/distributedhardware/distributedcamera/services/cameraservice/cameraoperator/handler/test/unittest:camera_handler_test", - "//foundation/distributedhardware/distributedcamera/services/cameraservice/sinkservice/test/unittest:sink_service_test", "//foundation/distributedhardware/distributedcamera/services/cameraservice/sourceservice/test/unittest:source_service_test", "//foundation/distributedhardware/distributedcamera/services/cameraservice/base/test/unittest:services_base_test" ] diff --git a/camera_hdf/hdi_impl/BUILD.gn b/camera_hdf/hdi_impl/BUILD.gn index fbb5c864716833438adc7f34cb13de4c81138358..0be318069e8e0bb95d4909fe67b6b82026e35a0f 100644 --- a/camera_hdf/hdi_impl/BUILD.gn +++ b/camera_hdf/hdi_impl/BUILD.gn @@ -13,7 +13,8 @@ import("//build/ohos.gni") import("//drivers/adapter/uhdf2/uhdf.gni") -import("//foundation/distributedhardware/distributedcamera/distributedcamera.gni") +import( + "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") ohos_shared_library("distributed_camera_hdf") { include_dirs = [ @@ -51,7 +52,6 @@ ohos_shared_library("distributed_camera_hdf") { "//foundation/graphic/standard/interfaces/kits/surface", "//foundation/graphic/standard/utils/buffer_handle/export", "//foundation/communication/ipc/ipc/native/src/core/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//foundation/multimedia/camera_standard/frameworks/native/metadata/include", ] @@ -69,12 +69,12 @@ ohos_shared_library("distributed_camera_hdf") { "src/dcamera_device/dmetadata_processor.cpp", "src/dcamera_host/dcamera_host.cpp", "src/dcamera_provider/dcamera_provider.cpp", - "src/dstream_operator/doffline_stream_operator.cpp", - "src/dstream_operator/dstream_operator.cpp", "src/dstream_operator/dbuffer_manager.cpp", - "src/dstream_operator/dimage_buffer.cpp", "src/dstream_operator/dcamera_steam.cpp", - "src/utils/dcamera.cpp" + "src/dstream_operator/dimage_buffer.cpp", + "src/dstream_operator/doffline_stream_operator.cpp", + "src/dstream_operator/dstream_operator.cpp", + "src/utils/dcamera.cpp", ] cflags = [ @@ -84,9 +84,7 @@ ohos_shared_library("distributed_camera_hdf") { if (device_name == "baltimore") { cflags += [ "-DBALTIMORE_CAMERA" ] - include_dirs += [ - "${camera_hdf_path_baltimore}/camera/interfaces/include", - ] + include_dirs += [ "${camera_hdf_path_baltimore}/camera/interfaces/include" ] } else { include_dirs += [ "${camera_hdf_path}/camera/interfaces/include", @@ -95,15 +93,14 @@ ohos_shared_library("distributed_camera_hdf") { } deps = [ - "//utils/native/base:utils", "${common_path}:distributed_camera_utils", "${fwk_utils_path}:distributedhardwareutils", "//drivers/adapter/uhdf2/ipc:libhdf_ipc_adapter", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", - "//foundation/graphic/standard/frameworks/surface:surface", "//drivers/peripheral/display/hal:hdi_display_gralloc", + "//foundation/graphic/standard/frameworks/surface:surface", "//foundation/multimedia/camera_standard/frameworks/native/metadata:metadata", "//third_party/jsoncpp:jsoncpp", + "//utils/native/base:utils", ] defines = [ @@ -114,6 +111,7 @@ ohos_shared_library("distributed_camera_hdf") { external_deps = [ "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_single", ] cflags_cc = cflags diff --git a/camera_hdf/hdi_impl/test/BUILD.gn b/camera_hdf/hdi_impl/test/BUILD.gn index e00a47e70bf14291d59d14b34e8869372e09cee2..5029a64966c01e3274518b5481d381e226e4c013 100644 --- a/camera_hdf/hdi_impl/test/BUILD.gn +++ b/camera_hdf/hdi_impl/test/BUILD.gn @@ -13,13 +13,14 @@ import("//build/ohos.gni") import("//drivers/adapter/uhdf2/uhdf.gni") -import("//foundation/distributedhardware/distributedcamera/distributedcamera.gni") +import( + "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") ohos_executable("dcamera_hdi_sample") { install_enable = false - sources = [ + sources = [ + "common.cpp", "dcamera_hdi_sample.cpp", - "common.cpp" ] include_dirs = [ @@ -51,7 +52,6 @@ ohos_executable("dcamera_hdi_sample") { "//foundation/graphic/standard/interfaces/kits/surface", "//foundation/graphic/standard/utils/include", "//foundation/communication/ipc/ipc/native/src/core/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//foundation/multimedia/camera_standard/frameworks/native/metadata/include", "${innerkits_path}/native_cpp/camera_source/include", @@ -66,9 +66,7 @@ ohos_executable("dcamera_hdi_sample") { if (device_name == "baltimore") { cflags += [ "-DBALTIMORE_CAMERA" ] - include_dirs += [ - "${camera_hdf_path_baltimore}/camera/interfaces/include", - ] + include_dirs += [ "${camera_hdf_path_baltimore}/camera/interfaces/include" ] } else { include_dirs += [ "${camera_hdf_path}/camera/interfaces/include", @@ -77,19 +75,19 @@ ohos_executable("dcamera_hdi_sample") { } deps = [ - "${fwk_utils_path}:distributedhardwareutils", "${distributedcamera_hdf_path}/interfaces/hdi_ipc/client:distributed_camera_hdf_client", - "${hdf_uhdf_path}/hdi:libhdi", "${fwk_utils_path}:distributedhardwareutils", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", - "//foundation/graphic/standard/frameworks/surface:surface", + "${fwk_utils_path}:distributedhardwareutils", + "${hdf_uhdf_path}/hdi:libhdi", + "${innerkits_path}/native_cpp/camera_source:distributed_camera_source_sdk", "//drivers/peripheral/display/hal:hdi_display_gralloc", + "//foundation/graphic/standard/frameworks/surface:surface", "//foundation/multimedia/camera_standard/frameworks/native/metadata:metadata", - "${innerkits_path}/native_cpp/camera_source:distributed_camera_source_sdk", ] external_deps = [ "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_single", "samgr_standard:samgr_proxy", ] diff --git a/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn b/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn index 571dd1e627217e1c477d5c9ec58b0c2fb6f7461f..71944d5d759091260bf3c2294d98db813e869f52 100644 --- a/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn +++ b/camera_hdf/interfaces/hdi_ipc/client/BUILD.gn @@ -13,7 +13,8 @@ import("//build/ohos.gni") import("//drivers/adapter/uhdf2/uhdf.gni") -import("//foundation/distributedhardware/distributedcamera/distributedcamera.gni") +import( + "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") ohos_shared_library("distributed_camera_hdf_client") { include_dirs = [ @@ -35,7 +36,6 @@ ohos_shared_library("distributed_camera_hdf_client") { "//foundation/graphic/standard/interfaces/kits/surface", "//foundation/graphic/standard/utils/include", "//foundation/communication/ipc/ipc/native/src/core/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//foundation/multimedia/camera_standard/frameworks/native/metadata/include", ] @@ -46,9 +46,7 @@ ohos_shared_library("distributed_camera_hdf_client") { if (device_name == "baltimore") { cflags += [ "-DBALTIMORE_CAMERA" ] - include_dirs += [ - "${camera_hdf_path_baltimore}/camera/interfaces/include", - ] + include_dirs += [ "${camera_hdf_path_baltimore}/camera/interfaces/include" ] } else { include_dirs += [ "${camera_hdf_path}/camera/interfaces/include", @@ -57,29 +55,28 @@ ohos_shared_library("distributed_camera_hdf_client") { } sources = [ - "device/dcamera_device_callback_stub.cpp", "device/dcamera_device_callback.cpp", + "device/dcamera_device_callback_stub.cpp", "device/dcamera_device_proxy.cpp", - "host/dcamera_host_callback_stub.cpp", "host/dcamera_host_callback.cpp", + "host/dcamera_host_callback_stub.cpp", "host/dcamera_host_proxy.cpp", "operator/doffline_stream_operator_proxy.cpp", - "operator/dstream_operator_callback_stub.cpp", "operator/dstream_operator_callback.cpp", + "operator/dstream_operator_callback_stub.cpp", "operator/dstream_operator_proxy.cpp", - "provider/dcamera_provider_callback_stub.cpp", "provider/dcamera_provider_callback.cpp", + "provider/dcamera_provider_callback_stub.cpp", "provider/dcamera_provider_proxy.cpp", ] deps = [ - "//utils/native/base:utils", - "${hdf_uhdf_path}/hdi:libhdi", "${fwk_utils_path}:distributedhardwareutils", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", - "//foundation/graphic/standard/frameworks/surface:surface", + "${hdf_uhdf_path}/hdi:libhdi", "//drivers/peripheral/display/hal:hdi_display_gralloc", + "//foundation/graphic/standard/frameworks/surface:surface", "//foundation/multimedia/camera_standard/frameworks/native/metadata:metadata", + "//utils/native/base:utils", ] defines = [ @@ -90,6 +87,7 @@ ohos_shared_library("distributed_camera_hdf_client") { external_deps = [ "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_single", ] cflags_cc = cflags diff --git a/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn b/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn index 1db284c892d499fb93288e9b53679f76fd8f7e9a..d3ec5b0d6783509ae862e4392953df9385a0234a 100644 --- a/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn +++ b/camera_hdf/interfaces/hdi_ipc/config/host/BUILD.gn @@ -13,7 +13,8 @@ import("//build/ohos.gni") import("//drivers/adapter/uhdf2/uhdf.gni") -import("//foundation/distributedhardware/distributedcamera/distributedcamera.gni") +import( + "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") ohos_shared_library("distributed_camera_host_config") { include_dirs = [ @@ -41,7 +42,6 @@ ohos_shared_library("distributed_camera_host_config") { "//foundation/graphic/standard/interfaces/kits/surface", "//foundation/graphic/standard/utils/include", "//foundation/communication/ipc/ipc/native/src/core/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//foundation/multimedia/camera_standard/frameworks/native/metadata/include", ] @@ -52,9 +52,7 @@ ohos_shared_library("distributed_camera_host_config") { if (device_name == "baltimore") { cflags += [ "-DBALTIMORE_CAMERA" ] - include_dirs += [ - "${camera_hdf_path_baltimore}/camera/interfaces/include", - ] + include_dirs += [ "${camera_hdf_path_baltimore}/camera/interfaces/include" ] } else { include_dirs += [ "${camera_hdf_path}/camera/interfaces/include", @@ -62,15 +60,12 @@ ohos_shared_library("distributed_camera_host_config") { ] } - sources = [ - "dcamera_host_config.cpp" - ] + sources = [ "dcamera_host_config.cpp" ] deps = [ - "//utils/native/base:utils", "${distributedcamera_hdf_path}/hdi_impl:distributed_camera_hdf", "//foundation/graphic/standard/frameworks/surface:surface", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", + "//utils/native/base:utils", ] defines = [ @@ -81,6 +76,7 @@ ohos_shared_library("distributed_camera_host_config") { external_deps = [ "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_single", ] install_images = [ chipset_base_dir ] diff --git a/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn b/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn index d514dc709a9156edde0040ff0defdfa52b27227d..053ddc2b1ffe48eaf26cc63429827d5584bfb409 100644 --- a/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn +++ b/camera_hdf/interfaces/hdi_ipc/config/provider/BUILD.gn @@ -13,7 +13,8 @@ import("//build/ohos.gni") import("//drivers/adapter/uhdf2/uhdf.gni") -import("//foundation/distributedhardware/distributedcamera/distributedcamera.gni") +import( + "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") ohos_shared_library("distributed_camera_provider_config") { include_dirs = [ @@ -36,7 +37,6 @@ ohos_shared_library("distributed_camera_provider_config") { "//foundation/graphic/standard/interfaces/kits/surface", "//foundation/graphic/standard/utils/include", "//foundation/communication/ipc/ipc/native/src/core/include", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core/include", "//foundation/multimedia/camera_standard/frameworks/native/metadata/include", ] @@ -47,9 +47,7 @@ ohos_shared_library("distributed_camera_provider_config") { if (device_name == "baltimore") { cflags += [ "-DBALTIMORE_CAMERA" ] - include_dirs += [ - "${camera_hdf_path_baltimore}/camera/interfaces/include", - ] + include_dirs += [ "${camera_hdf_path_baltimore}/camera/interfaces/include" ] } else { include_dirs += [ "${camera_hdf_path}/camera/interfaces/include", @@ -57,15 +55,12 @@ ohos_shared_library("distributed_camera_provider_config") { ] } - sources = [ - "dcamera_provider_config.cpp" - ] + sources = [ "dcamera_provider_config.cpp" ] deps = [ - "//utils/native/base:utils", "${distributedcamera_hdf_path}/hdi_impl:distributed_camera_hdf", "//foundation/graphic/standard/frameworks/surface:surface", - "//foundation/communication/ipc/interfaces/innerkits/ipc_core:ipc_core", + "//utils/native/base:utils", ] defines = [ @@ -76,6 +71,7 @@ ohos_shared_library("distributed_camera_provider_config") { external_deps = [ "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_single", ] install_images = [ chipset_base_dir ] cflags_cc = cflags diff --git a/services/cameraservice/base/test/unittest/common/dcameraprotocol/BUILD.gn b/services/cameraservice/base/test/unittest/common/dcameraprotocol/BUILD.gn index f6e7b2ea642fe79e3e4d63cb47c8d24ebbeec511..f54649e9b03a4db46552071df69e4729deca3b1b 100644 --- a/services/cameraservice/base/test/unittest/common/dcameraprotocol/BUILD.gn +++ b/services/cameraservice/base/test/unittest/common/dcameraprotocol/BUILD.gn @@ -12,8 +12,9 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/distributedhardware/distributedcamera/distributedcamera.gni") -module_out_path = "distributedcamera/dcamera_protocol_test" +import( + "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") +module_out_path = "distributed_camera/dcamera_protocol_test" config("module_private_config") { visibility = [ ":*" ] @@ -41,19 +42,17 @@ config("module_private_config") { ohos_unittest("DCameraProtocolTest") { module_out_path = module_out_path - sources = [ - "dcamera_protocol_test.cpp" - ] + sources = [ "dcamera_protocol_test.cpp" ] configs = [ ":module_private_config" ] deps = [ + "${common_path}:distributed_camera_utils", + "${fwk_utils_path}:distributedhardwareutils", + "${services_path}/cameraservice/sourceservice:distributed_camera_source", "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", - "${fwk_utils_path}:distributedhardwareutils", - "${common_path}:distributed_camera_utils", "//utils/native/base:utils", - "${services_path}/cameraservice/sourceservice:distributed_camera_source" ] external_deps = [ diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn index 07221ccd8f76db98b99384931a6f66ae6ce5f9b0..a341a7c77c1def0814e9f109d3880be8a25d5aae 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn @@ -12,30 +12,29 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/distributedhardware/distributedcamera/distributedcamera.gni") -module_out_path = "distributedcamera/dcamera_sink_test" +import( + "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") +module_out_path = "distributed_camera/dcamera_sink_test" config("module_private_config") { visibility = [ ":*" ] include_dirs = [ - "${services_path}/cameraservice/sinkservice/include/distributedcamera", - "${services_path}/cameraservice/sinkservice/include/distributedcameramgr", - "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/interface", - "${services_path}/cameraservice/base/include", - "${common_path}/include/constants", - "${common_path}/include/utils", - "${distributedcamera_hdf_path}/interfaces/include", - "${innerkits_path}/native_cpp/camera_sink/include", - "//drivers/peripheral/base", - ] + "${services_path}/cameraservice/sinkservice/include/distributedcamera", + "${services_path}/cameraservice/sinkservice/include/distributedcameramgr", + "${services_path}/cameraservice/sinkservice/include/distributedcameramgr/interface", + "${services_path}/cameraservice/base/include", + "${common_path}/include/constants", + "${common_path}/include/utils", + "${distributedcamera_hdf_path}/interfaces/include", + "${innerkits_path}/native_cpp/camera_sink/include", + "//drivers/peripheral/base", + ] } ohos_unittest("DistributedCameraSinkServiceTest") { module_out_path = module_out_path - sources = [ - "distributed_camera_sink_service_test.cpp" - ] + sources = [ "distributed_camera_sink_service_test.cpp" ] configs = [ ":module_private_config" ] @@ -45,13 +44,11 @@ ohos_unittest("DistributedCameraSinkServiceTest") { "//utils/native/base:utils", ] - defines = [ - "HI_LOG_ENABLE", - ] + defines = [ "HI_LOG_ENABLE" ] external_deps = [ + "eventhandler:libeventhandler", "ipc:ipc_core", "safwk:system_ability_fwk", - "eventhandler:libeventhandler", ] } diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn index 5308312dd889096d5fb080e197bba54aa4a3befc..df32c80f66fb5afeb0957a30fd1b49af9d97ca2a 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn @@ -12,8 +12,9 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/distributedhardware/distributedcamera/distributedcamera.gni") -module_out_path = "distributedcamera/dcamera_sink_mgr_test" +import( + "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") +module_out_path = "distributed_camera/dcamera_sink_mgr_test" config("module_private_config") { visibility = [ ":*" ] @@ -49,28 +50,27 @@ ohos_unittest("DCameraSinkMgrTest") { module_out_path = module_out_path sources = [ - "dcamera_sink_dev_test.cpp", "dcamera_sink_access_control_test.cpp", "dcamera_sink_controller_test.cpp", - "dcamera_sink_output_test.cpp", "dcamera_sink_data_process_test.cpp", + "dcamera_sink_dev_test.cpp", + "dcamera_sink_output_test.cpp", ] configs = [ ":module_private_config" ] deps = [ + "${common_path}:distributed_camera_utils", + "${fwk_utils_path}:distributedhardwareutils", "${services_path}/cameraservice/sinkservice:distributed_camera_sink", "${services_path}/channel:distributed_camera_channel", - "${common_path}:distributed_camera_utils", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", - - "${fwk_utils_path}:distributedhardwareutils", ] external_deps = [ - "ipc:ipc_core", "eventhandler:libeventhandler", + "ipc:ipc_core", ] defines = [ diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn index 5401e17c8f2263aaac187aa083d885ca1fc85882..86591b52faba467cab8db1987d35003cf7ae0abe 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn @@ -12,8 +12,9 @@ # limitations under the License. import("//build/test.gni") -import("//foundation/distributedhardware/distributedcamera/distributedcamera.gni") -module_out_path = "distributedcamera/dcamera_source_mgr_test" +import( + "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") +module_out_path = "distributed_camera/dcamera_source_mgr_test" config("module_private_config") { visibility = [ ":*" ] @@ -56,28 +57,25 @@ config("module_private_config") { ohos_unittest("DCameraSourceMgrTest") { module_out_path = module_out_path - sources = [ - "dcamera_source_state_machine_test.cpp", - ] + sources = [ "dcamera_source_state_machine_test.cpp" ] configs = [ ":module_private_config" ] deps = [ + "${common_path}:distributed_camera_utils", + "${fwk_utils_path}:distributedhardwareutils", "${services_path}/cameraservice/sourceservice:distributed_camera_source", "${services_path}/channel:distributed_camera_channel", - "${common_path}:distributed_camera_utils", + "//third_party/googletest:gtest_main", "//third_party/jsoncpp:jsoncpp", "//utils/native/base:utils", - "${fwk_utils_path}:distributedhardwareutils", - "//third_party/googletest:gtest_main", ] external_deps = [ - "ipc:ipc_core", - "eventhandler:libeventhandler", - "dsoftbus_standard:softbus_client", + "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", + "ipc:ipc_core", ] defines = [