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/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/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);