diff --git a/camera_hdf/hdi_impl/test/BUILD.gn b/camera_hdf/hdi_impl/test/BUILD.gn index 5029a64966c01e3274518b5481d381e226e4c013..0a0bf5eeae38f894bedde263da01d0a280d1f6ce 100644 --- a/camera_hdf/hdi_impl/test/BUILD.gn +++ b/camera_hdf/hdi_impl/test/BUILD.gn @@ -94,4 +94,4 @@ ohos_executable("dcamera_hdi_sample") { cflags_cc = cflags part_name = "distributed_camera" subsystem_name = "distributedhardware" -} \ No newline at end of file +} diff --git a/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.h b/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.h index 4939a8c34f18d46f956b7acaa69f8f3401d0ac91..bae5d68b716ae7eba28103c8d0386d2fa6654ecd 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.h +++ b/camera_hdf/interfaces/hdi_ipc/server/host/dcamera_host_stub.h @@ -62,7 +62,7 @@ private: void* DCameraHostStubInstance(); -void DestroyDCameraHostStub(void* obj); +void DestroyDCameraHostStub(void* stubObj); int32_t DCHostServiceOnRemoteRequest(void* stub, int cmdId, struct HdfSBuf* data, struct HdfSBuf* reply); diff --git a/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_stub.h b/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_stub.h index e5170a167b733a11bf740467dab7c56736cac16f..33330adb376d3e08ff2495c211da93f3d9e32cf6 100644 --- a/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_stub.h +++ b/camera_hdf/interfaces/hdi_ipc/server/provider/dcamera_provider_stub.h @@ -53,7 +53,7 @@ private: void* DCameraProviderStubInstance(); -void DestroyDCameraProviderStub(void* obj); +void DestroyDCameraProviderStub(void* stubObj); int32_t DCProviderServiceOnRemoteRequest(void* stub, int cmdId, struct HdfSBuf* data, struct HdfSBuf* reply); diff --git a/services/cameraservice/base/test/unittest/common/dcameraprotocol/BUILD.gn b/services/cameraservice/base/test/unittest/common/dcameraprotocol/BUILD.gn index f54649e9b03a4db46552071df69e4729deca3b1b..e8be668c1974c1af74de52d4f797023c296aeb1c 100644 --- a/services/cameraservice/base/test/unittest/common/dcameraprotocol/BUILD.gn +++ b/services/cameraservice/base/test/unittest/common/dcameraprotocol/BUILD.gn @@ -14,6 +14,7 @@ import("//build/test.gni") import( "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + module_out_path = "distributed_camera/dcamera_protocol_test" config("module_private_config") { @@ -71,4 +72,4 @@ ohos_unittest("DCameraProtocolTest") { group("dcamera_protocol_test") { testonly = true deps = [ ":DCameraProtocolTest" ] -} \ No newline at end of file +} diff --git a/services/cameraservice/sinkservice/include/distributedcameramgr/interface/icamera_sink_output.h b/services/cameraservice/sinkservice/include/distributedcameramgr/interface/icamera_sink_output.h index 2355b70bc05b59862bdc7c2fa39168d792e5de2d..fe118349c906592a5c5d7373e270917f1bba1f07 100644 --- a/services/cameraservice/sinkservice/include/distributedcameramgr/interface/icamera_sink_output.h +++ b/services/cameraservice/sinkservice/include/distributedcameramgr/interface/icamera_sink_output.h @@ -18,7 +18,7 @@ #include #include -#include +#include #include "dcamera_capture_info_cmd.h" #include "dcamera_channel_info_cmd.h" diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn index a341a7c77c1def0814e9f109d3880be8a25d5aae..2e69ad446a099d88692622738040c63cad698eec 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/BUILD.gn @@ -14,6 +14,7 @@ import("//build/test.gni") import( "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + module_out_path = "distributed_camera/dcamera_sink_test" config("module_private_config") { @@ -55,4 +56,4 @@ ohos_unittest("DistributedCameraSinkServiceTest") { group("dcamera_sink_test") { testonly = true deps = [ ":DistributedCameraSinkServiceTest" ] -} \ No newline at end of file +} diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn index df32c80f66fb5afeb0957a30fd1b49af9d97ca2a..e3d10be35f66ef300e67d6c3fc41dc9820708e29 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/BUILD.gn @@ -14,6 +14,7 @@ import("//build/test.gni") import( "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + module_out_path = "distributed_camera/dcamera_sink_mgr_test" config("module_private_config") { @@ -83,4 +84,4 @@ ohos_unittest("DCameraSinkMgrTest") { group("dcamera_sink_mgr_test") { testonly = true deps = [ ":DCameraSinkMgrTest" ] -} \ No newline at end of file +} diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h index 9e864ac13dfbb8ebda0b69858b568518357e1f12..dbb203ee0d95ff0c29195b7cde646effa7f84d8e 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h @@ -36,7 +36,7 @@ public: virtual ~DCameraSourceDev(); int32_t InitDCameraSourceDev(); - int32_t RegisterDistributedHardware(const std::string& devId, const std::string& dhId, const std::string& reqId, + int32_t RegisterDistributedHardware(const std::string& devId, const std::string& dhId, const std::string& reqId, const std::string& ver, const std::string attrs); int32_t UnRegisterDistributedHardware(const std::string devId, const std::string dhId, const std::string reqId); int32_t DCameraNotify(std::string& eventStr); diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn index 86591b52faba467cab8db1987d35003cf7ae0abe..f341b973e472263a1f8d479a9cfd2153cfaaf682 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/BUILD.gn @@ -14,6 +14,7 @@ import("//build/test.gni") import( "//foundation/distributedhardware/distributedcamera/distributedcamera.gni") + module_out_path = "distributed_camera/dcamera_source_mgr_test" config("module_private_config") { @@ -88,4 +89,4 @@ ohos_unittest("DCameraSourceMgrTest") { group("dcamera_mgr_test") { testonly = true deps = [ ":DCameraSourceMgrTest" ] -} \ No newline at end of file +}