openharmony/distributed_camera
1
0
Fork 0
mirror of https://github.com/openharmony/distributed_camera.git synced 2026-07-20 00:54:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix codeHub codex 0325

Browse Source 
Signed-off-by: t00605578 <tongyuejiao@huawei.com>
This commit is contained in:
t00605578
2022-03-25 14:23:12 +08:00
parent c72b0e795c
commit 27e43a35c4
18 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
camera_hdf/hdi_impl/include/dstream_operator/dstream_operator.h
+1 -1
View File
@@ -33,7 +33,7 @@ using namespace std;
class DCameraProvider;
class DStreamOperator : public DStreamOperatorStub {
public:
DStreamOperator(std::shared_ptr<DMetadataProcessor> &dMetadataProcessor);
explicit DStreamOperator(std::shared_ptr<DMetadataProcessor> &dMetadataProcessor);
DStreamOperator() = default;
virtual ~DStreamOperator() = default;
DStreamOperator(const DStreamOperator &other) = delete;
camera_hdf/hdi_impl/src/dcamera_device/dmetadata_processor.cpp
+2 -2
View File
@@ -529,8 +529,8 @@ std::map<int, std::vector<DCResolution>> DMetadataProcessor::GetDCameraSupported
if (reso.size() != SIZE_FMT_LEN) {
continue;
}
uint32_t width = static_cast<uint32_t>(std::atoi(reso[0].c_str()));
uint32_t height = static_cast<uint32_t>(std::atoi(reso[1].c_str()));
uint32_t width = static_cast<uint32_t>(std::stoi(reso[0]));
uint32_t height = static_cast<uint32_t>(std::stoi(reso[1]));
if (height == 0 || width == 0 ||
(isPhotoFormat && (width > MAX_SUPPORT_PHOTO_WIDTH || height > MAX_SUPPORT_PHOTO_HEIGHT)) ||
(!isPhotoFormat &&
camera_hdf/hdi_impl/src/dstream_operator/dcamera_steam.cpp
+2 -2
View File
@@ -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;
camera_hdf/hdi_impl/src/dstream_operator/dstream_operator.cpp
+3 -3
View File
@@ -65,7 +65,7 @@ CamRetCode DStreamOperator::CreateStreams(const std::vector<std::shared_ptr<Stre
if (halStreamMap_.find(info->streamId_) != 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<DHBa
if (reso.size() != SIZE_FMT_LEN) {
continue;
}
uint32_t width = static_cast<uint32_t>(std::atoi(reso[0].c_str()));
uint32_t height = static_cast<uint32_t>(std::atoi(reso[1].c_str()));
uint32_t width = static_cast<uint32_t>(std::stoi(reso[0]));
uint32_t height = static_cast<uint32_t>(std::stoi(reso[1]));
if (height == 0 || width == 0 ||
(isPhotoFormat && (width > MAX_SUPPORT_PHOTO_WIDTH || height > MAX_SUPPORT_PHOTO_HEIGHT)) ||
(!isPhotoFormat &&
camera_hdf/hdi_impl/test/common.cpp
+2 -2
View File
@@ -354,7 +354,7 @@ OHOS::sptr<OHOS::IBufferProducer> Test::StreamConsumer::CreateProducer(std::func
int32_t flushFence = 0;
int64_t timestamp = 0;
OHOS::Rect damage;
while (running_ == true) {
while (running_) {
OHOS::sptr<OHOS::SurfaceBuffer> buffer = nullptr;
consumer_->AcquireBuffer(buffer, flushFence, timestamp, damage);
if (buffer != nullptr) {
@@ -380,7 +380,7 @@ OHOS::sptr<OHOS::IBufferProducer> Test::StreamConsumer::CreateProducer(std::func
cv_.notify_one();
}
}
if (running_ == false) {
if (!running_) {
break;
}
std::this_thread::sleep_for(1ms);
common/include/utils/data_buffer.h
+1 -1
View File
@@ -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;
services/cameraservice/base/include/dcamera_open_info_cmd.h
+1 -1
View File
@@ -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_;
};
services/cameraservice/sourceservice/include/distributedcamera/dcamera_service_state_listener.h
+1 -1
View File
@@ -23,7 +23,7 @@ namespace OHOS {
namespace DistributedHardware {
class DCameraServiceStateListener : public ICameraStateListener {
public:
DCameraServiceStateListener(sptr<IDCameraSourceCallback> callback);
explicit DCameraServiceStateListener(sptr<IDCameraSourceCallback> callback);
~DCameraServiceStateListener();
int32_t OnRegisterNotify(const std::string& devId, const std::string& dhId, const std::string& reqId,
services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_event.h
+1 -1
View File
@@ -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) {}
services/cameraservice/sourceservice/include/distributedcameramgr/dcameracontrol/dcamera_source_controller_channel_listener.h
+1 -1
View File
@@ -25,7 +25,7 @@ namespace DistributedHardware {
class DCameraSourceController;
class DCameraSourceControllerChannelListener : public ICameraChannelListener {
public:
DCameraSourceControllerChannelListener(std::shared_ptr<DCameraSourceController>& controller);
explicit DCameraSourceControllerChannelListener(std::shared_ptr<DCameraSourceController>& controller);
~DCameraSourceControllerChannelListener();
void OnSessionState(int32_t state) override;
void OnSessionError(int32_t eventType, int32_t eventReason, std::string detail) override;
services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_stream_data_process_pipeline_listener.h
+1 -1
View File
@@ -26,7 +26,7 @@ namespace DistributedHardware {
class DCameraStreamDataProcess;
class DCameraStreamDataProcessPipelineListener : public DataProcessListener {
public:
DCameraStreamDataProcessPipelineListener(std::shared_ptr<DCameraStreamDataProcess>& process);
explicit DCameraStreamDataProcessPipelineListener(std::shared_ptr<DCameraStreamDataProcess>& process);
~DCameraStreamDataProcessPipelineListener();
void OnProcessedVideoBuffer(const std::shared_ptr<DataBuffer>& videoResult) override;
services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_capture_state.h
+1 -1
View File
@@ -23,7 +23,7 @@ namespace OHOS {
namespace DistributedHardware {
class DCameraSourceCaptureState : public DCameraSourceState {
public:
DCameraSourceCaptureState(std::shared_ptr<DCameraSourceStateMachine>& stateMachine);
explicit DCameraSourceCaptureState(std::shared_ptr<DCameraSourceStateMachine>& stateMachine);
~DCameraSourceCaptureState() {}
int32_t Execute(std::shared_ptr<DCameraSourceDev>& camDev, DCAMERA_EVENT eventType,
services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_config_stream_state.h
+1 -1
View File
@@ -23,7 +23,7 @@ namespace OHOS {
namespace DistributedHardware {
class DCameraSourceConfigStreamState : public DCameraSourceState {
public:
DCameraSourceConfigStreamState(std::shared_ptr<DCameraSourceStateMachine>& stateMachine);
explicit DCameraSourceConfigStreamState(std::shared_ptr<DCameraSourceStateMachine>& stateMachine);
DCameraSourceConfigStreamState() {}
~DCameraSourceConfigStreamState() {}
services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_init_state.h
+1 -1
View File
@@ -23,7 +23,7 @@ namespace OHOS {
namespace DistributedHardware {
class DCameraSourceInitState : public DCameraSourceState {
public:
DCameraSourceInitState(std::shared_ptr<DCameraSourceStateMachine>& stateMachine);
explicit DCameraSourceInitState(std::shared_ptr<DCameraSourceStateMachine>& stateMachine);
~DCameraSourceInitState() {}
int32_t Execute(std::shared_ptr<DCameraSourceDev>& camDev, DCAMERA_EVENT eventType,
services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_opened_state.h
+1 -1
View File
@@ -23,7 +23,7 @@ namespace OHOS {
namespace DistributedHardware {
class DCameraSourceOpenedState : public DCameraSourceState {
public:
DCameraSourceOpenedState(std::shared_ptr<DCameraSourceStateMachine>& stateMachine);
explicit DCameraSourceOpenedState(std::shared_ptr<DCameraSourceStateMachine>& stateMachine);
~DCameraSourceOpenedState() {}
int32_t Execute(std::shared_ptr<DCameraSourceDev>& camDev, DCAMERA_EVENT eventType,
services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_regist_state.h
+1 -1
View File
@@ -23,7 +23,7 @@ namespace OHOS {
namespace DistributedHardware {
class DCameraSourceRegistState : public DCameraSourceState {
public:
DCameraSourceRegistState(std::shared_ptr<DCameraSourceStateMachine>& stateMachine);
explicit DCameraSourceRegistState(std::shared_ptr<DCameraSourceStateMachine>& stateMachine);
~DCameraSourceRegistState() {}
int32_t Execute(std::shared_ptr<DCameraSourceDev>& camDev, DCAMERA_EVENT eventType,
services/cameraservice/sourceservice/include/distributedcameramgr/dcamerastate/dcamera_source_state_machine.h
+1 -1
View File
@@ -23,7 +23,7 @@ namespace DistributedHardware {
class DCameraSourceDev;
class DCameraSourceStateMachine : public std::enable_shared_from_this<DCameraSourceStateMachine> {
public:
DCameraSourceStateMachine(std::shared_ptr<DCameraSourceDev>& camDev);
explicit DCameraSourceStateMachine(std::shared_ptr<DCameraSourceDev>& camDev);
~DCameraSourceStateMachine();
int32_t Execute(DCAMERA_EVENT eventType, DCameraSourceEvent& event);
void UpdateState(DCameraStateType stateType);
services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp
+4
View File
@@ -72,6 +72,10 @@ int32_t DCameraSourceDev::InitDCameraSourceDev()
controller_ = std::make_shared<DCameraSourceController>(devId_, dhId_, stateMachine_, eventBus_);
input_ = std::make_shared<DCameraSourceInput>(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;