From f705a679a121ca734e8e8c2690d1db358c5435b4 Mon Sep 17 00:00:00 2001 From: t00605578 Date: Fri, 25 Mar 2022 14:23:12 +0800 Subject: [PATCH] fix codeHub codex 0325 Signed-off-by: t00605578 --- .../hdi_impl/include/dstream_operator/dstream_operator.h | 2 +- .../hdi_impl/src/dcamera_device/dmetadata_processor.cpp | 4 ++-- camera_hdf/hdi_impl/src/dstream_operator/dcamera_steam.cpp | 4 ++-- .../hdi_impl/src/dstream_operator/dstream_operator.cpp | 6 +++--- camera_hdf/hdi_impl/test/common.cpp | 4 ++-- common/include/utils/data_buffer.h | 2 +- services/cameraservice/base/include/dcamera_open_info_cmd.h | 2 +- .../distributedcamera/dcamera_service_state_listener.h | 2 +- .../include/distributedcameramgr/dcamera_source_event.h | 2 +- .../dcamera_source_controller_channel_listener.h | 2 +- .../dcamera_stream_data_process_pipeline_listener.h | 2 +- .../dcamerastate/dcamera_source_capture_state.h | 2 +- .../dcamerastate/dcamera_source_config_stream_state.h | 2 +- .../dcamerastate/dcamera_source_init_state.h | 2 +- .../dcamerastate/dcamera_source_opened_state.h | 2 +- .../dcamerastate/dcamera_source_regist_state.h | 2 +- .../dcamerastate/dcamera_source_state_machine.h | 2 +- .../src/distributedcameramgr/dcamera_source_dev.cpp | 4 ++++ 18 files changed, 26 insertions(+), 22 deletions(-) diff --git a/camera_hdf/hdi_impl/include/dstream_operator/dstream_operator.h b/camera_hdf/hdi_impl/include/dstream_operator/dstream_operator.h index 174958d8..8e012fa6 100644 --- a/camera_hdf/hdi_impl/include/dstream_operator/dstream_operator.h +++ b/camera_hdf/hdi_impl/include/dstream_operator/dstream_operator.h @@ -33,7 +33,7 @@ using namespace std; class DCameraProvider; class DStreamOperator : public DStreamOperatorStub { public: - DStreamOperator(std::shared_ptr &dMetadataProcessor); + explicit DStreamOperator(std::shared_ptr &dMetadataProcessor); DStreamOperator() = default; virtual ~DStreamOperator() = default; DStreamOperator(const DStreamOperator &other) = delete; diff --git a/camera_hdf/hdi_impl/src/dcamera_device/dmetadata_processor.cpp b/camera_hdf/hdi_impl/src/dcamera_device/dmetadata_processor.cpp index 154d47fd..20bfaf9e 100644 --- a/camera_hdf/hdi_impl/src/dcamera_device/dmetadata_processor.cpp +++ b/camera_hdf/hdi_impl/src/dcamera_device/dmetadata_processor.cpp @@ -529,8 +529,8 @@ std::map> DMetadataProcessor::GetDCameraSupported if (reso.size() != SIZE_FMT_LEN) { continue; } - uint32_t width = static_cast(std::atoi(reso[0].c_str())); - uint32_t height = static_cast(std::atoi(reso[1].c_str())); + uint32_t width = static_cast(std::stoi(reso[0])); + uint32_t height = static_cast(std::stoi(reso[1])); if (height == 0 || width == 0 || (isPhotoFormat && (width > MAX_SUPPORT_PHOTO_WIDTH || height > MAX_SUPPORT_PHOTO_HEIGHT)) || (!isPhotoFormat && diff --git a/camera_hdf/hdi_impl/src/dstream_operator/dcamera_steam.cpp b/camera_hdf/hdi_impl/src/dstream_operator/dcamera_steam.cpp index 112e8535..b28b740c 100644 --- a/camera_hdf/hdi_impl/src/dstream_operator/dcamera_steam.cpp +++ b/camera_hdf/hdi_impl/src/dstream_operator/dcamera_steam.cpp @@ -160,7 +160,7 @@ DCamRetCode DCameraStream::FinishCommitStream() DCamRetCode DCameraStream::GetNextRequest() { - if (isBufferMgrInited_ == false) { + if (!isBufferMgrInited_) { DHLOGE("BufferManager not be init."); return DCamRetCode::INVALID_ARGUMENT; } @@ -353,7 +353,7 @@ DCamRetCode DCameraStream::FlushDCameraBuffer() bool DCameraStream::HasBufferQueue() { - if (dcStreamProducer_ == nullptr || isBufferMgrInited_ == false) { + if (dcStreamProducer_ == nullptr || !isBufferMgrInited_) { return false; } return true; diff --git a/camera_hdf/hdi_impl/src/dstream_operator/dstream_operator.cpp b/camera_hdf/hdi_impl/src/dstream_operator/dstream_operator.cpp index 4655598b..ff6b8783 100644 --- a/camera_hdf/hdi_impl/src/dstream_operator/dstream_operator.cpp +++ b/camera_hdf/hdi_impl/src/dstream_operator/dstream_operator.cpp @@ -65,7 +65,7 @@ CamRetCode DStreamOperator::CreateStreams(const std::vectorstreamId_) != halStreamMap_.end()) { return CamRetCode::INVALID_ARGUMENT; } - if (info->tunneledMode_ != true) { + if (!info->tunneledMode_) { return CamRetCode::METHOD_NOT_SUPPORTED; } @@ -418,8 +418,8 @@ DCamRetCode DStreamOperator::InitOutputConfigurations(const std::shared_ptr(std::atoi(reso[0].c_str())); - uint32_t height = static_cast(std::atoi(reso[1].c_str())); + uint32_t width = static_cast(std::stoi(reso[0])); + uint32_t height = static_cast(std::stoi(reso[1])); if (height == 0 || width == 0 || (isPhotoFormat && (width > MAX_SUPPORT_PHOTO_WIDTH || height > MAX_SUPPORT_PHOTO_HEIGHT)) || (!isPhotoFormat && diff --git a/camera_hdf/hdi_impl/test/common.cpp b/camera_hdf/hdi_impl/test/common.cpp index a0b805e7..ec92151a 100644 --- a/camera_hdf/hdi_impl/test/common.cpp +++ b/camera_hdf/hdi_impl/test/common.cpp @@ -354,7 +354,7 @@ OHOS::sptr Test::StreamConsumer::CreateProducer(std::func int32_t flushFence = 0; int64_t timestamp = 0; OHOS::Rect damage; - while (running_ == true) { + while (running_) { OHOS::sptr buffer = nullptr; consumer_->AcquireBuffer(buffer, flushFence, timestamp, damage); if (buffer != nullptr) { @@ -380,7 +380,7 @@ OHOS::sptr Test::StreamConsumer::CreateProducer(std::func cv_.notify_one(); } } - if (running_ == false) { + if (!running_) { break; } std::this_thread::sleep_for(1ms); diff --git a/common/include/utils/data_buffer.h b/common/include/utils/data_buffer.h index fa94f3d1..c884ff05 100644 --- a/common/include/utils/data_buffer.h +++ b/common/include/utils/data_buffer.h @@ -26,7 +26,7 @@ namespace OHOS { namespace DistributedHardware { class DataBuffer { public: - DataBuffer(size_t capacity); + explicit DataBuffer(size_t capacity); size_t Size() const; size_t Offset() const; diff --git a/services/cameraservice/base/include/dcamera_open_info_cmd.h b/services/cameraservice/base/include/dcamera_open_info_cmd.h index d40a414e..1f22e22d 100644 --- a/services/cameraservice/base/include/dcamera_open_info_cmd.h +++ b/services/cameraservice/base/include/dcamera_open_info_cmd.h @@ -25,7 +25,7 @@ namespace DistributedHardware { class DCameraOpenInfo { public: DCameraOpenInfo() {} - DCameraOpenInfo(std::string sourceDevId) : sourceDevId_(sourceDevId) {} + explicit DCameraOpenInfo(std::string sourceDevId) : sourceDevId_(sourceDevId) {} ~DCameraOpenInfo() = default; std::string sourceDevId_; }; 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 92e7530a..967bd17a 100644 --- a/services/cameraservice/sourceservice/include/distributedcamera/dcamera_service_state_listener.h +++ b/services/cameraservice/sourceservice/include/distributedcamera/dcamera_service_state_listener.h @@ -23,7 +23,7 @@ namespace OHOS { namespace DistributedHardware { class DCameraServiceStateListener : public ICameraStateListener { public: - DCameraServiceStateListener(sptr callback); + explicit DCameraServiceStateListener(sptr callback); ~DCameraServiceStateListener(); int32_t OnRegisterNotify(const std::string& devId, const std::string& dhId, const std::string& reqId, diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_event.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_event.h index d28efd3f..b9285416 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_event.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_event.h @@ -56,7 +56,7 @@ class DCameraSourceEvent : public Event { TYPEINDENT(DCameraSourceEvent) public: - DCameraSourceEvent(EventSender& sender) : Event(sender) {} + explicit DCameraSourceEvent(EventSender& sender) : Event(sender) {} ~DCameraSourceEvent() = default; explicit DCameraSourceEvent(EventSender& sender, DCAMERA_EVENT eventType) : Event(sender), eventType_(eventType) {} 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 0a4e1fe1..8a7e7ace 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 @@ -25,7 +25,7 @@ namespace DistributedHardware { class DCameraSourceController; class DCameraSourceControllerChannelListener : public ICameraChannelListener { public: - DCameraSourceControllerChannelListener(std::shared_ptr& controller); + explicit DCameraSourceControllerChannelListener(std::shared_ptr& controller); ~DCameraSourceControllerChannelListener(); 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/distributedcameramgr/dcameradata/dcamera_stream_data_process_pipeline_listener.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process_pipeline_listener.h index 2c6cf8a4..c1832c08 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 @@ -26,7 +26,7 @@ namespace DistributedHardware { class DCameraStreamDataProcess; class DCameraStreamDataProcessPipelineListener : public DataProcessListener { public: - DCameraStreamDataProcessPipelineListener(std::shared_ptr& process); + explicit DCameraStreamDataProcessPipelineListener(std::shared_ptr& process); ~DCameraStreamDataProcessPipelineListener(); void OnProcessedVideoBuffer(const std::shared_ptr& videoResult) 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 9614f132..f9a35cb0 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 @@ -23,7 +23,7 @@ namespace OHOS { namespace DistributedHardware { class DCameraSourceCaptureState : public DCameraSourceState { public: - DCameraSourceCaptureState(std::shared_ptr& stateMachine); + explicit DCameraSourceCaptureState(std::shared_ptr& stateMachine); ~DCameraSourceCaptureState() {} int32_t Execute(std::shared_ptr& camDev, DCAMERA_EVENT eventType, 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 ab7a1f30..5d9186c4 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 @@ -23,7 +23,7 @@ namespace OHOS { namespace DistributedHardware { class DCameraSourceConfigStreamState : public DCameraSourceState { public: - DCameraSourceConfigStreamState(std::shared_ptr& stateMachine); + explicit DCameraSourceConfigStreamState(std::shared_ptr& stateMachine); DCameraSourceConfigStreamState() {} ~DCameraSourceConfigStreamState() {} diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_init_state.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_init_state.h index 1fd04593..5ecbb096 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_init_state.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_init_state.h @@ -23,7 +23,7 @@ namespace OHOS { namespace DistributedHardware { class DCameraSourceInitState : public DCameraSourceState { public: - DCameraSourceInitState(std::shared_ptr& stateMachine); + explicit DCameraSourceInitState(std::shared_ptr& stateMachine); ~DCameraSourceInitState() {} int32_t Execute(std::shared_ptr& camDev, DCAMERA_EVENT eventType, 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 51d68b27..339e497b 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 @@ -23,7 +23,7 @@ namespace OHOS { namespace DistributedHardware { class DCameraSourceOpenedState : public DCameraSourceState { public: - DCameraSourceOpenedState(std::shared_ptr& stateMachine); + explicit DCameraSourceOpenedState(std::shared_ptr& stateMachine); ~DCameraSourceOpenedState() {} int32_t Execute(std::shared_ptr& camDev, DCAMERA_EVENT eventType, 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 01053d33..6b01d437 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 @@ -23,7 +23,7 @@ namespace OHOS { namespace DistributedHardware { class DCameraSourceRegistState : public DCameraSourceState { public: - DCameraSourceRegistState(std::shared_ptr& stateMachine); + explicit DCameraSourceRegistState(std::shared_ptr& stateMachine); ~DCameraSourceRegistState() {} int32_t Execute(std::shared_ptr& camDev, DCAMERA_EVENT eventType, diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_state_machine.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_state_machine.h index 5056a9e3..8d5d3034 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_state_machine.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_state_machine.h @@ -23,7 +23,7 @@ namespace DistributedHardware { class DCameraSourceDev; class DCameraSourceStateMachine : public std::enable_shared_from_this { public: - DCameraSourceStateMachine(std::shared_ptr& camDev); + explicit DCameraSourceStateMachine(std::shared_ptr& camDev); ~DCameraSourceStateMachine(); int32_t Execute(DCAMERA_EVENT eventType, DCameraSourceEvent& event); void UpdateState(DCameraStateType stateType); diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp index 994e488f..ff476e13 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp @@ -72,6 +72,10 @@ int32_t DCameraSourceDev::InitDCameraSourceDev() controller_ = std::make_shared(devId_, dhId_, stateMachine_, eventBus_); input_ = std::make_shared(devId_, dhId_, eventBus_); hdiCallback_ = new (std::nothrow) DCameraProviderCallbackImpl(devId_, dhId_, cameraSourceDev); + if (hdiCallback_ == nullptr) { + DHLOGE("DCameraSourceDev InitDCameraSourceDev failed, hdiCallback is null."); + return DCAMERA_BAD_VALUE; + } DHLOGI("DCameraSourceDev InitDCameraSourceDev end devId %s dhId %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return DCAMERA_OK; -- Gitee