From 07d84eec2b83c049b6e3df097bd619c479500e63 Mon Sep 17 00:00:00 2001 From: wangchaole Date: Tue, 8 Nov 2022 17:15:49 +0800 Subject: [PATCH] fix: handling reviewbot alarms Signed-off-by: wangchaole --- .../native_cpp/camera_sink/include/dcamera_sink_handler.h | 2 +- .../native_cpp/camera_sink/src/dcamera_sink_handler.cpp | 2 +- .../camera_source/include/callback/dcamera_source_callback.h | 2 +- .../native_cpp/camera_source/include/dcamera_source_handler.h | 2 +- .../camera_source/include/idistributed_camera_source.h | 2 +- services/cameraservice/base/src/dcamera_capture_info_cmd.cpp | 2 +- services/cameraservice/base/src/dcamera_channel_info_cmd.cpp | 2 +- .../client/include/callback/dcamera_photo_callback.h | 2 +- .../cameraoperator/client/include/dcamera_client.h | 2 +- .../distributedcamera/distributed_camera_sink_service.h | 2 +- .../callback/dcamera_sink_controller_state_callback.h | 2 +- .../callback/dcamera_sink_output_result_callback.h | 2 +- .../distributedcameramgr/dcamera_sink_access_control.h | 2 +- .../include/distributedcameramgr/dcamera_sink_controller.h | 2 +- .../include/distributedcameramgr/dcamera_sink_data_process.h | 2 +- .../listener/dcamera_sink_data_process_listener.h | 2 +- .../listener/dcamera_sink_output_channel_listener.h | 2 +- .../distributedcamera/dcamera_service_state_listener.h | 2 +- .../distributedcamera/distributed_camera_source_service.h | 2 +- .../dcameracontrol/dcamera_source_controller.h | 2 +- .../dcamera_source_controller_channel_listener.h | 2 +- .../distributedcameramgr/dcameradata/dcamera_source_input.h | 2 +- .../dcamera_stream_data_process_pipeline_listener.h | 2 +- .../distributedcameramgr/dcamerahdf/dcamera_hdf_operate.h | 2 +- .../dcamerahdf/dcamera_provider_callback_impl.h | 2 +- .../dcamerastate/dcamera_source_capture_state.h | 2 +- .../dcamerastate/dcamera_source_config_stream_state.h | 2 +- .../dcamerastate/dcamera_source_opened_state.h | 2 +- .../dcamerastate/dcamera_source_regist_state.h | 2 +- .../distributedcameramgr/dcameradata/dcamera_source_input.cpp | 2 +- .../dcamerastate/dcamera_source_regist_state.cpp | 2 ++ services/channel/include/dcamera_channel_sink_impl.h | 2 +- services/channel/include/dcamera_channel_source_impl.h | 2 +- services/channel/src/dcamera_softbus_adapter.cpp | 4 ++-- .../colorspace_conversion/color_format_process.h | 2 +- .../pipeline_node/fpscontroller/fps_controller_process.h | 2 +- .../multimedia_codec/decoder/decode_data_process.h | 2 +- .../multimedia_codec/decoder/decode_surface_listener.h | 2 +- .../multimedia_codec/decoder/decode_video_callback.h | 2 +- .../multimedia_codec/encoder/encode_video_callback.h | 2 +- .../pipeline_node/scale_conversion/scale_convert_process.h | 2 +- 41 files changed, 43 insertions(+), 41 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/camera_sink/include/dcamera_sink_handler.h b/interfaces/inner_kits/native_cpp/camera_sink/include/dcamera_sink_handler.h index dc9be398..782c3cf2 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/include/dcamera_sink_handler.h +++ b/interfaces/inner_kits/native_cpp/camera_sink/include/dcamera_sink_handler.h @@ -40,7 +40,7 @@ private: DCameraSinkHandler() = default; ~DCameraSinkHandler(); void FinishStartSA(const std::string ¶ms); - void FinishStartSAFailed(int32_t systemAbilityId); + void FinishStartSAFailed(const int32_t systemAbilityId); private: std::condition_variable producerCon_; std::mutex producerMutex_; diff --git a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp index 84dcc5ce..b5d16fa1 100644 --- a/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp +++ b/interfaces/inner_kits/native_cpp/camera_sink/src/dcamera_sink_handler.cpp @@ -92,7 +92,7 @@ void DCameraSinkHandler::FinishStartSA(const std::string& params) producerCon_.notify_one(); } -void DCameraSinkHandler::FinishStartSAFailed(int32_t systemAbilityId) +void DCameraSinkHandler::FinishStartSAFailed(const int32_t systemAbilityId) { DHLOGI("SinkSA Start failed, systemAbilityId: %d.", systemAbilityId); std::unique_lock lock(producerMutex_); diff --git a/interfaces/inner_kits/native_cpp/camera_source/include/callback/dcamera_source_callback.h b/interfaces/inner_kits/native_cpp/camera_source/include/callback/dcamera_source_callback.h index 644c00c3..b58b3b13 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/include/callback/dcamera_source_callback.h +++ b/interfaces/inner_kits/native_cpp/camera_source/include/callback/dcamera_source_callback.h @@ -26,7 +26,7 @@ namespace DistributedHardware { class DCameraSourceCallback : public DCameraSourceCallbackStub { public: DCameraSourceCallback() = default; - ~DCameraSourceCallback(); + ~DCameraSourceCallback() override; int32_t OnNotifyRegResult(const std::string& devId, const std::string& dhId, const std::string& reqId, int32_t status, std::string& data) override; diff --git a/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler.h b/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler.h index c5f85e5f..7675c899 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler.h +++ b/interfaces/inner_kits/native_cpp/camera_source/include/dcamera_source_handler.h @@ -48,7 +48,7 @@ private: DCameraSourceHandler(); ~DCameraSourceHandler(); void FinishStartSA(const std::string ¶ms); - void FinishStartSAFailed(int32_t systemAbilityId); + void FinishStartSAFailed(const int32_t systemAbilityId); private: std::mutex optLock_; sptr callback_; diff --git a/interfaces/inner_kits/native_cpp/camera_source/include/idistributed_camera_source.h b/interfaces/inner_kits/native_cpp/camera_source/include/idistributed_camera_source.h index 13cf1467..24452856 100644 --- a/interfaces/inner_kits/native_cpp/camera_source/include/idistributed_camera_source.h +++ b/interfaces/inner_kits/native_cpp/camera_source/include/idistributed_camera_source.h @@ -34,7 +34,7 @@ public: CAMERA_NOTIFY = 4, }; - virtual ~IDistributedCameraSource() {} + ~IDistributedCameraSource() override {} virtual int32_t InitSource(const std::string& params, const sptr& callback) = 0; virtual int32_t ReleaseSource() = 0; virtual int32_t RegisterDistributedHardware(const std::string& devId, const std::string& dhId, diff --git a/services/cameraservice/base/src/dcamera_capture_info_cmd.cpp b/services/cameraservice/base/src/dcamera_capture_info_cmd.cpp index 104de856..a85ff75f 100644 --- a/services/cameraservice/base/src/dcamera_capture_info_cmd.cpp +++ b/services/cameraservice/base/src/dcamera_capture_info_cmd.cpp @@ -160,7 +160,7 @@ int32_t DCameraCaptureInfoCmd::UmarshalSettings(Json::Value& valueJson, return DCAMERA_BAD_VALUE; } std::shared_ptr setting = std::make_shared(); - setting->type_ = (DCSettingsType)settingJson["SettingType"].asInt(); + setting->type_ = static_cast(settingJson["SettingType"].asInt()); setting->value_ = settingJson["SettingValue"].asString(); captureInfo->captureSettings_.push_back(setting); } diff --git a/services/cameraservice/base/src/dcamera_channel_info_cmd.cpp b/services/cameraservice/base/src/dcamera_channel_info_cmd.cpp index 71d63c97..d44d7c50 100644 --- a/services/cameraservice/base/src/dcamera_channel_info_cmd.cpp +++ b/services/cameraservice/base/src/dcamera_channel_info_cmd.cpp @@ -98,7 +98,7 @@ int32_t DCameraChannelInfoCmd::Unmarshal(const std::string& jsonStr) return DCAMERA_BAD_VALUE; } channelDetail.dataSessionFlag_ = detailJson["DataSessionFlag"].asString(); - channelDetail.streamType_ = (DCStreamType)detailJson["StreamType"].asInt(); + channelDetail.streamType_ = static_cast(detailJson["StreamType"].asInt()); channelInfo->detail_.push_back(channelDetail); } value_ = channelInfo; diff --git a/services/cameraservice/cameraoperator/client/include/callback/dcamera_photo_callback.h b/services/cameraservice/cameraoperator/client/include/callback/dcamera_photo_callback.h index 1268ab0d..d21be488 100644 --- a/services/cameraservice/cameraoperator/client/include/callback/dcamera_photo_callback.h +++ b/services/cameraservice/cameraoperator/client/include/callback/dcamera_photo_callback.h @@ -26,7 +26,7 @@ class DCameraPhotoCallback : public CameraStandard::PhotoStateCallback { public: explicit DCameraPhotoCallback(const std::shared_ptr& callback); void OnCaptureStarted(const int32_t captureID) const override; - void OnCaptureEnded(const int32_t captureID, int32_t frameCount) const override; + void OnCaptureEnded(const int32_t captureID, const int32_t frameCount) const override; void OnFrameShutter(const int32_t captureId, const uint64_t timestamp) const override; void OnCaptureError(const int32_t captureId, const int32_t errorCode) const override; diff --git a/services/cameraservice/cameraoperator/client/include/dcamera_client.h b/services/cameraservice/cameraoperator/client/include/dcamera_client.h index d17ffc23..59781c41 100644 --- a/services/cameraservice/cameraoperator/client/include/dcamera_client.h +++ b/services/cameraservice/cameraoperator/client/include/dcamera_client.h @@ -39,7 +39,7 @@ namespace DistributedHardware { class DCameraClient : public ICameraOperator { public: explicit DCameraClient(const std::string& dhId); - ~DCameraClient(); + ~DCameraClient() override; int32_t Init() override; int32_t UnInit() override; diff --git a/services/cameraservice/sinkservice/include/distributedcamera/distributed_camera_sink_service.h b/services/cameraservice/sinkservice/include/distributedcamera/distributed_camera_sink_service.h index 2222c4fc..11500b77 100644 --- a/services/cameraservice/sinkservice/include/distributedcamera/distributed_camera_sink_service.h +++ b/services/cameraservice/sinkservice/include/distributedcamera/distributed_camera_sink_service.h @@ -31,7 +31,7 @@ DECLARE_SYSTEM_ABILITY(DistributedCameraSinkService); public: DistributedCameraSinkService(int32_t saId, bool runOnCreate); - ~DistributedCameraSinkService() = default; + ~DistributedCameraSinkService() override = default; int32_t InitSink(const std::string& params) override; int32_t ReleaseSink() override; diff --git a/services/cameraservice/sinkservice/include/distributedcameramgr/callback/dcamera_sink_controller_state_callback.h b/services/cameraservice/sinkservice/include/distributedcameramgr/callback/dcamera_sink_controller_state_callback.h index f1602672..ce64de0b 100644 --- a/services/cameraservice/sinkservice/include/distributedcameramgr/callback/dcamera_sink_controller_state_callback.h +++ b/services/cameraservice/sinkservice/include/distributedcameramgr/callback/dcamera_sink_controller_state_callback.h @@ -25,7 +25,7 @@ namespace DistributedHardware { class DCameraSinkControllerStateCallback : public StateCallback { public: explicit DCameraSinkControllerStateCallback(std::shared_ptr& controller); - ~DCameraSinkControllerStateCallback() = default; + ~DCameraSinkControllerStateCallback() override = default; void OnStateChanged(std::shared_ptr& event) override; void OnMetadataResult(std::vector>& settings) override; diff --git a/services/cameraservice/sinkservice/include/distributedcameramgr/callback/dcamera_sink_output_result_callback.h b/services/cameraservice/sinkservice/include/distributedcameramgr/callback/dcamera_sink_output_result_callback.h index d2c62906..3a2f4297 100644 --- a/services/cameraservice/sinkservice/include/distributedcameramgr/callback/dcamera_sink_output_result_callback.h +++ b/services/cameraservice/sinkservice/include/distributedcameramgr/callback/dcamera_sink_output_result_callback.h @@ -25,7 +25,7 @@ namespace DistributedHardware { class DCameraSinkOutputResultCallback : public ResultCallback { public: explicit DCameraSinkOutputResultCallback(std::shared_ptr& output); - ~DCameraSinkOutputResultCallback() = default; + ~DCameraSinkOutputResultCallback() override = default; void OnPhotoResult(std::shared_ptr& buffer) override; void OnVideoResult(std::shared_ptr& buffer) override; diff --git a/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_access_control.h b/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_access_control.h index 7fac01cd..07ec51ca 100644 --- a/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_access_control.h +++ b/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_access_control.h @@ -23,7 +23,7 @@ namespace DistributedHardware { class DCameraSinkAccessControl : public ICameraSinkAccessControl { public: DCameraSinkAccessControl() = default; - ~DCameraSinkAccessControl() = default; + ~DCameraSinkAccessControl() override = default; bool IsSensitiveSrcAccess(const std::string& srcType) override; bool NotifySensitiveSrc(const std::string& srcType) override; diff --git a/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_controller.h b/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_controller.h index 2fc69739..870f53a2 100644 --- a/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_controller.h +++ b/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_controller.h @@ -37,7 +37,7 @@ class DCameraSinkController : public ICameraController, public EventSender, public std::enable_shared_from_this { public: explicit DCameraSinkController(std::shared_ptr& accessControl); - ~DCameraSinkController(); + ~DCameraSinkController() override; int32_t StartCapture(std::vector>& captureInfos) override; int32_t StopCapture() override; diff --git a/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_data_process.h b/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_data_process.h index 1872fdcc..313ade9a 100644 --- a/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_data_process.h +++ b/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_data_process.h @@ -33,7 +33,7 @@ class DCameraSinkDataProcess : public ICameraSinkDataProcess, public EventSender public std::enable_shared_from_this { public: DCameraSinkDataProcess(const std::string& dhId, std::shared_ptr& channel); - ~DCameraSinkDataProcess() = default; + ~DCameraSinkDataProcess() override = default; int32_t StartCapture(std::shared_ptr& captureInfo) override; int32_t StopCapture() override; diff --git a/services/cameraservice/sinkservice/include/distributedcameramgr/listener/dcamera_sink_data_process_listener.h b/services/cameraservice/sinkservice/include/distributedcameramgr/listener/dcamera_sink_data_process_listener.h index ec6376d3..ced730e7 100644 --- a/services/cameraservice/sinkservice/include/distributedcameramgr/listener/dcamera_sink_data_process_listener.h +++ b/services/cameraservice/sinkservice/include/distributedcameramgr/listener/dcamera_sink_data_process_listener.h @@ -25,7 +25,7 @@ namespace DistributedHardware { class DCameraSinkDataProcessListener : public DataProcessListener { public: explicit DCameraSinkDataProcessListener(std::shared_ptr& dataProcess); - ~DCameraSinkDataProcessListener() = default; + ~DCameraSinkDataProcessListener() override = default; void OnProcessedVideoBuffer(const std::shared_ptr& videoResult) override; void OnError(DataProcessErrorType errorType) override; diff --git a/services/cameraservice/sinkservice/include/distributedcameramgr/listener/dcamera_sink_output_channel_listener.h b/services/cameraservice/sinkservice/include/distributedcameramgr/listener/dcamera_sink_output_channel_listener.h index 65e72912..c390a457 100644 --- a/services/cameraservice/sinkservice/include/distributedcameramgr/listener/dcamera_sink_output_channel_listener.h +++ b/services/cameraservice/sinkservice/include/distributedcameramgr/listener/dcamera_sink_output_channel_listener.h @@ -25,7 +25,7 @@ namespace DistributedHardware { class DCameraSinkOutputChannelListener : public ICameraChannelListener { public: DCameraSinkOutputChannelListener(DCStreamType type, std::shared_ptr& output); - ~DCameraSinkOutputChannelListener() = default; + ~DCameraSinkOutputChannelListener() override = default; void OnSessionState(int32_t state) override; void OnSessionError(int32_t eventType, int32_t eventReason, std::string detail) override; diff --git a/services/cameraservice/sourceservice/include/distributedcamera/dcamera_service_state_listener.h b/services/cameraservice/sourceservice/include/distributedcamera/dcamera_service_state_listener.h index be75ad86..88c23786 100644 --- a/services/cameraservice/sourceservice/include/distributedcamera/dcamera_service_state_listener.h +++ b/services/cameraservice/sourceservice/include/distributedcamera/dcamera_service_state_listener.h @@ -26,7 +26,7 @@ namespace DistributedHardware { class DCameraServiceStateListener : public ICameraStateListener { public: explicit DCameraServiceStateListener(); - ~DCameraServiceStateListener(); + ~DCameraServiceStateListener() override; int32_t OnRegisterNotify(const std::string& devId, const std::string& dhId, const std::string& reqId, int32_t status, std::string& data) override; diff --git a/services/cameraservice/sourceservice/include/distributedcamera/distributed_camera_source_service.h b/services/cameraservice/sourceservice/include/distributedcamera/distributed_camera_source_service.h index 57e8d4be..4b29786b 100644 --- a/services/cameraservice/sourceservice/include/distributedcamera/distributed_camera_source_service.h +++ b/services/cameraservice/sourceservice/include/distributedcamera/distributed_camera_source_service.h @@ -38,7 +38,7 @@ DECLARE_SYSTEM_ABILITY(DistributedCameraSourceService); public: DistributedCameraSourceService(int32_t saId, bool runOnCreate); - ~DistributedCameraSourceService() = default; + ~DistributedCameraSourceService() override = default; int32_t InitSource(const std::string& params, const sptr& callback) override; int32_t ReleaseSource() override; 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 7598457f..5cd822d4 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameracontrol/dcamera_source_controller.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameracontrol/dcamera_source_controller.h @@ -33,7 +33,7 @@ class DCameraSourceController : public ICameraController, public EventSender, public: DCameraSourceController(std::string devId, std::string dhId, std::shared_ptr& stateMachine, std::shared_ptr& eventBus); - ~DCameraSourceController(); + ~DCameraSourceController() override; int32_t StartCapture(std::vector>& captureInfos) override; int32_t StopCapture() override; int32_t ChannelNeg(std::shared_ptr& info) override; diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameracontrol/dcamera_source_controller_channel_listener.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameracontrol/dcamera_source_controller_channel_listener.h index 8a7e7ace..bf865e14 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameracontrol/dcamera_source_controller_channel_listener.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameracontrol/dcamera_source_controller_channel_listener.h @@ -26,7 +26,7 @@ class DCameraSourceController; class DCameraSourceControllerChannelListener : public ICameraChannelListener { public: explicit DCameraSourceControllerChannelListener(std::shared_ptr& controller); - ~DCameraSourceControllerChannelListener(); + ~DCameraSourceControllerChannelListener() override; void OnSessionState(int32_t state) override; void OnSessionError(int32_t eventType, int32_t eventReason, std::string detail) override; void OnDataReceived(std::vector>& buffers) override; 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 33c59689..eb36b2a8 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_input.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_input.h @@ -30,7 +30,7 @@ class DCameraSourceInput : public ICameraInput, public EventSender, public std::enable_shared_from_this { public: DCameraSourceInput(std::string devId, std::string dhId, std::shared_ptr& eventBus); - ~DCameraSourceInput(); + ~DCameraSourceInput() override; int32_t ConfigStreams(std::vector>& streamInfos) override; int32_t ReleaseStreams(std::vector& streamIds, bool& isAllRelease) override; diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process_pipeline_listener.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process_pipeline_listener.h index c1832c08..4f527a5d 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process_pipeline_listener.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process_pipeline_listener.h @@ -27,7 +27,7 @@ class DCameraStreamDataProcess; class DCameraStreamDataProcessPipelineListener : public DataProcessListener { public: explicit DCameraStreamDataProcessPipelineListener(std::shared_ptr& process); - ~DCameraStreamDataProcessPipelineListener(); + ~DCameraStreamDataProcessPipelineListener() override; void OnProcessedVideoBuffer(const std::shared_ptr& videoResult) override; void OnError(DataProcessErrorType errorType) override; diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerahdf/dcamera_hdf_operate.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerahdf/dcamera_hdf_operate.h index 198aca17..679d437f 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerahdf/dcamera_hdf_operate.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerahdf/dcamera_hdf_operate.h @@ -62,7 +62,7 @@ public: explicit DCameraHdfServStatListener(StatusCallback callback) : callback_(std::move(callback)) { } - ~DCameraHdfServStatListener() = default; + ~DCameraHdfServStatListener() override = default; void OnReceive(const ServiceStatus& status) override; private: diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.h index 9a62703d..6cdc6535 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.h @@ -25,7 +25,7 @@ class DCameraSourceDev; class DCameraProviderCallbackImpl : public IDCameraProviderCallback { public: DCameraProviderCallbackImpl(std::string devId, std::string dhId, std::shared_ptr& sourceDev); - ~DCameraProviderCallbackImpl(); + ~DCameraProviderCallbackImpl() override; int32_t OpenSession(const DHBase& dhBase) override; int32_t CloseSession(const DHBase& dhBase) override; diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_capture_state.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_capture_state.h index f9a35cb0..c50c1d35 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_capture_state.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_capture_state.h @@ -24,7 +24,7 @@ namespace DistributedHardware { class DCameraSourceCaptureState : public DCameraSourceState { public: explicit DCameraSourceCaptureState(std::shared_ptr& stateMachine); - ~DCameraSourceCaptureState() {} + ~DCameraSourceCaptureState() override {} int32_t Execute(std::shared_ptr& camDev, DCAMERA_EVENT eventType, DCameraSourceEvent& event) override; diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_config_stream_state.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_config_stream_state.h index 5d9186c4..89de200c 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_config_stream_state.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_config_stream_state.h @@ -25,7 +25,7 @@ class DCameraSourceConfigStreamState : public DCameraSourceState { public: explicit DCameraSourceConfigStreamState(std::shared_ptr& stateMachine); DCameraSourceConfigStreamState() {} - ~DCameraSourceConfigStreamState() {} + ~DCameraSourceConfigStreamState() override {} int32_t Execute(std::shared_ptr& camDev, DCAMERA_EVENT eventType, DCameraSourceEvent& event) override; diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_opened_state.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_opened_state.h index 339e497b..f3af6446 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_opened_state.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_opened_state.h @@ -24,7 +24,7 @@ namespace DistributedHardware { class DCameraSourceOpenedState : public DCameraSourceState { public: explicit DCameraSourceOpenedState(std::shared_ptr& stateMachine); - ~DCameraSourceOpenedState() {} + ~DCameraSourceOpenedState() override {} int32_t Execute(std::shared_ptr& camDev, DCAMERA_EVENT eventType, DCameraSourceEvent& event) override; diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_regist_state.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_regist_state.h index 6b01d437..7b5b8568 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_regist_state.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_regist_state.h @@ -24,7 +24,7 @@ namespace DistributedHardware { class DCameraSourceRegistState : public DCameraSourceState { public: explicit DCameraSourceRegistState(std::shared_ptr& stateMachine); - ~DCameraSourceRegistState() {} + ~DCameraSourceRegistState() override {} int32_t Execute(std::shared_ptr& camDev, DCAMERA_EVENT eventType, DCameraSourceEvent& event) override; diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_input.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_input.cpp index c74aa04a..993acbed 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_input.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_input.cpp @@ -330,7 +330,7 @@ void DCameraSourceInput::OnSessionError(DCStreamType streamType, int32_t eventTy { DHLOGI("DCameraSourceInput OnSessionError devId: %s, dhId: %s, eventType: %d, eventReason: %d, detail %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), eventType, eventReason, detail.c_str()); - (void)streamType; + (void)streamType; } void DCameraSourceInput::OnDataReceived(DCStreamType streamType, std::vector>& buffers) diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_regist_state.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_regist_state.cpp index 588552cb..779c4172 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_regist_state.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_regist_state.cpp @@ -57,6 +57,8 @@ DCameraStateType DCameraSourceRegistState::GetStateType() int32_t DCameraSourceRegistState::DoRegisterTask(std::shared_ptr& camDev, DCameraSourceEvent& event) { DHLOGI("DCameraSourceRegistState DoRegisterTask Idempotent"); + (void)camDev; + (void)event; return DCAMERA_OK; } diff --git a/services/channel/include/dcamera_channel_sink_impl.h b/services/channel/include/dcamera_channel_sink_impl.h index b60ff77b..7307191e 100644 --- a/services/channel/include/dcamera_channel_sink_impl.h +++ b/services/channel/include/dcamera_channel_sink_impl.h @@ -25,7 +25,7 @@ namespace DistributedHardware { class DCameraChannelSinkImpl : public ICameraChannel { public: DCameraChannelSinkImpl(); - ~DCameraChannelSinkImpl(); + ~DCameraChannelSinkImpl() override; int32_t OpenSession() override; int32_t CloseSession() override; int32_t CreateSession(std::vector& camIndexs, std::string sessionFlag, DCameraSessionMode sessionMode, diff --git a/services/channel/include/dcamera_channel_source_impl.h b/services/channel/include/dcamera_channel_source_impl.h index 75818238..cbe05031 100644 --- a/services/channel/include/dcamera_channel_source_impl.h +++ b/services/channel/include/dcamera_channel_source_impl.h @@ -25,7 +25,7 @@ namespace DistributedHardware { class DCameraChannelSourceImpl : public ICameraChannel { public: DCameraChannelSourceImpl(); - ~DCameraChannelSourceImpl(); + ~DCameraChannelSourceImpl() override; int32_t OpenSession() override; int32_t CloseSession() override; int32_t CreateSession(std::vector& camIndexs, std::string sessionFlag, DCameraSessionMode sessionMode, diff --git a/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index 4a336642..5b818ebc 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -196,7 +196,7 @@ int32_t DCameraSoftbusAdapter::OpenSoftbusSession(std::string mySessName, std::s DHLOGE("DCameraSoftbusAdapter OpenSoftbusSession memcpy_s failed %d", ret); return DCAMERA_BAD_VALUE; } - attr.attr.streamAttr.streamType = (StreamType)streamType; + attr.attr.streamAttr.streamType = static_cast(streamType); int32_t sessionId = OpenSession(mySessName.c_str(), peerSessName.c_str(), peerDevId.c_str(), "0", &attr); if (sessionId < 0) { DHLOGE("DCameraSoftbusAdapter OpenSoftbusSession failed %d", sessionId); @@ -353,7 +353,7 @@ void DCameraSoftbusAdapter::OnSourceStreamReceived(int32_t sessionId, const Stre return; } int32_t dataLen = data->bufLen; - if (dataLen <= 0 || dataLen > (int32_t)DCAMERA_MAX_RECV_DATA_LEN) { + if (dataLen <= 0 || dataLen > static_cast(DCAMERA_MAX_RECV_DATA_LEN)) { DHLOGE("DCameraSoftbusAdapter OnSourceStreamReceived dataLen: %d, sessionId: %d", dataLen, sessionId); return; } diff --git a/services/data_process/include/pipeline_node/colorspace_conversion/color_format_process.h b/services/data_process/include/pipeline_node/colorspace_conversion/color_format_process.h index 7f3f8ede..df0bbc69 100644 --- a/services/data_process/include/pipeline_node/colorspace_conversion/color_format_process.h +++ b/services/data_process/include/pipeline_node/colorspace_conversion/color_format_process.h @@ -29,7 +29,7 @@ class ColorFormatProcess : public AbstractDataProcess { public: explicit ColorFormatProcess(const std::weak_ptr& callbackPipSource) : callbackPipelineSource_(callbackPipSource) {} - ~ColorFormatProcess(); + ~ColorFormatProcess() override; int32_t InitNode(const VideoConfigParams& sourceConfig, const VideoConfigParams& targetConfig, VideoConfigParams& processedConfig) override; diff --git a/services/data_process/include/pipeline_node/fpscontroller/fps_controller_process.h b/services/data_process/include/pipeline_node/fpscontroller/fps_controller_process.h index eaa715aa..500e11a0 100644 --- a/services/data_process/include/pipeline_node/fpscontroller/fps_controller_process.h +++ b/services/data_process/include/pipeline_node/fpscontroller/fps_controller_process.h @@ -29,7 +29,7 @@ class FpsControllerProcess : public AbstractDataProcess { public: explicit FpsControllerProcess(const std::weak_ptr& callbackPipSource) : callbackPipelineSource_(callbackPipSource) {} - ~FpsControllerProcess(); + ~FpsControllerProcess() override; int32_t InitNode(const VideoConfigParams& sourceConfig, const VideoConfigParams& targetConfig, VideoConfigParams& processedConfig) override; 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 155ba9be..830fe626 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 @@ -54,7 +54,7 @@ public: DecodeDataProcess(const std::shared_ptr& eventBusPipeline, const std::weak_ptr& callbackPipSource) : eventBusPipeline_(eventBusPipeline), callbackPipelineSource_(callbackPipSource) {} - ~DecodeDataProcess(); + ~DecodeDataProcess() override; int32_t InitNode(const VideoConfigParams& sourceConfig, const VideoConfigParams& targetConfig, VideoConfigParams& processedConfig) override; diff --git a/services/data_process/include/pipeline_node/multimedia_codec/decoder/decode_surface_listener.h b/services/data_process/include/pipeline_node/multimedia_codec/decoder/decode_surface_listener.h index ef0e6bd7..a08ca093 100644 --- a/services/data_process/include/pipeline_node/multimedia_codec/decoder/decode_surface_listener.h +++ b/services/data_process/include/pipeline_node/multimedia_codec/decoder/decode_surface_listener.h @@ -29,7 +29,7 @@ class DecodeSurfaceListener : public IBufferConsumerListener { public: DecodeSurfaceListener(sptr surface, std::weak_ptr decodeVideoNode) : surface_(surface), decodeVideoNode_(decodeVideoNode) {} - ~DecodeSurfaceListener(); + ~DecodeSurfaceListener() override; void OnBufferAvailable() override; void SetSurface(const sptr& surface); diff --git a/services/data_process/include/pipeline_node/multimedia_codec/decoder/decode_video_callback.h b/services/data_process/include/pipeline_node/multimedia_codec/decoder/decode_video_callback.h index 0a35ee51..b1b3a179 100644 --- a/services/data_process/include/pipeline_node/multimedia_codec/decoder/decode_video_callback.h +++ b/services/data_process/include/pipeline_node/multimedia_codec/decoder/decode_video_callback.h @@ -30,7 +30,7 @@ class DecodeVideoCallback : public Media::AVCodecCallback { public: explicit DecodeVideoCallback(const std::weak_ptr& decodeVideoNode) : decodeVideoNode_(decodeVideoNode) {} - ~DecodeVideoCallback() = default; + ~DecodeVideoCallback() override = default; void OnError(Media::AVCodecErrorType errorType, int32_t errorCode) override; void OnInputBufferAvailable(uint32_t index) override; diff --git a/services/data_process/include/pipeline_node/multimedia_codec/encoder/encode_video_callback.h b/services/data_process/include/pipeline_node/multimedia_codec/encoder/encode_video_callback.h index 0cffb62a..37051c9c 100644 --- a/services/data_process/include/pipeline_node/multimedia_codec/encoder/encode_video_callback.h +++ b/services/data_process/include/pipeline_node/multimedia_codec/encoder/encode_video_callback.h @@ -30,7 +30,7 @@ class EncodeVideoCallback : public Media::AVCodecCallback { public: explicit EncodeVideoCallback(const std::weak_ptr& encodeVideoNode) : encodeVideoNode_(encodeVideoNode) {} - ~EncodeVideoCallback() = default; + ~EncodeVideoCallback() override = default; void OnError(Media::AVCodecErrorType errorType, int32_t errorCode) override; void OnInputBufferAvailable(uint32_t index) override; diff --git a/services/data_process/include/pipeline_node/scale_conversion/scale_convert_process.h b/services/data_process/include/pipeline_node/scale_conversion/scale_convert_process.h index 34891a7c..7171fb70 100644 --- a/services/data_process/include/pipeline_node/scale_conversion/scale_convert_process.h +++ b/services/data_process/include/pipeline_node/scale_conversion/scale_convert_process.h @@ -41,7 +41,7 @@ class ScaleConvertProcess : public AbstractDataProcess { public: explicit ScaleConvertProcess(const std::weak_ptr& callbackPipeSource) : callbackPipelineSource_(callbackPipeSource) {} - ~ScaleConvertProcess(); + ~ScaleConvertProcess() override; int32_t InitNode(const VideoConfigParams& sourceConfig, const VideoConfigParams& targetConfig, VideoConfigParams& processedConfig) override; -- Gitee