From fa8e33e34942d07f606426f4d7f013526423ae95 Mon Sep 17 00:00:00 2001 From: byndyx Date: Fri, 10 May 2024 17:11:55 +0800 Subject: [PATCH 1/3] v-d2 Signed-off-by: byndyx --- .../constants/distributed_camera_constants.h | 1 + .../distributedcameramgr/dcamera_source_dev.h | 10 +++++ .../dcamera_source_event.h | 1 + .../dcamera_provider_callback_impl.h | 1 + .../dcamera_source_regist_state.h | 1 + .../dcamera_source_dev.cpp | 45 +++++++++++++++++++ .../dcamera_provider_callback_impl.cpp | 22 +++++++++ .../dcamera_source_regist_state.cpp | 19 ++++++++ 8 files changed, 100 insertions(+) diff --git a/common/include/constants/distributed_camera_constants.h b/common/include/constants/distributed_camera_constants.h index 26a748d9..e105f0e7 100644 --- a/common/include/constants/distributed_camera_constants.h +++ b/common/include/constants/distributed_camera_constants.h @@ -44,6 +44,7 @@ typedef enum { DCAMERA_MESSAGE = 0, DCAMERA_OPERATION = 1, DCAMERA_SINK_STOP = 2, + DCAMERE_GETFULLCAP = 3, } DCameraEventType; typedef enum { diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h index 0f9a1d21..b3260a0f 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_dev.h @@ -32,8 +32,15 @@ namespace OHOS { namespace DistributedHardware { +enum DcameraBusinessState : int32_t { + UNKNOWN, + IDLE, + RUNNING, + PAUSING +}; const uint32_t EVENT_SOURCE_DEV_PROCESS = 0; const uint32_t EVENT_HICOLLIE = 1; +const uint32_t EVENT_PROCESS_HDF_NOTIFY = 2; class DCameraSourceDev : public std::enable_shared_from_this { public: explicit DCameraSourceDev(std::string devId, std::string dhId, std::shared_ptr& stateLisener); @@ -52,6 +59,7 @@ public: int32_t StartCameraCapture(const std::vector>& captureInfos); int32_t StopCameraCapture(const std::vector& streamIds); int32_t UpdateCameraSettings(const std::vector>& settings); + int32_t ProcessHDFEvent(const DCameraHDFEvent& event); int32_t GetStateInfo(); std::string GetVersion(); @@ -60,6 +68,7 @@ public: int32_t PostHicollieEvent(); void SetHicollieFlag(bool flag); bool GetHicollieFlag(); + int32_t GetFullCaps(); class DCameraSourceDevEventHandler : public AppExecFwk::EventHandler { public: @@ -95,6 +104,7 @@ private: void HitraceAndHisyseventImpl(std::vector>& captureInfos); int32_t ParseEnableParam(std::shared_ptr& param, std::string& ability); void DoProcessData(const AppExecFwk::InnerEvent::Pointer &event); + void DoProcesHDFEvent(const AppExecFwk::InnerEvent::Pointer &event); void DoHicollieProcess(); private: diff --git a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_event.h b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_event.h index 4664d7ca..32f0af16 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_event.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcamera_source_event.h @@ -38,6 +38,7 @@ typedef enum { DCAMERA_EVENT_UPDATE_SETTINGS = 8, DCAMERA_EVENT_NOFIFY = 9, DCAMERA_EVENT_HICOLLIE = 10, + DCAMERA_EVENT_GET_FULLCAPS = 11, } DCAMERA_EVENT; class DCameraRegistParam { 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 6cdc6535..9d5d3aa4 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 @@ -34,6 +34,7 @@ public: int32_t StartCapture(const DHBase& dhBase, const std::vector& captureInfos) override; int32_t StopCapture(const DHBase& dhBase, const std::vector& streamIds) override; int32_t UpdateSettings(const DHBase& dhBase, const std::vector& settings) override; + int32_t NotifyEvent(const DHBase& dhBase, const DCameraHDFEvent& event) override; private: bool CheckDHBase(const DHBase& dhBase); 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 7b5b8568..4a3fc79f 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 @@ -36,6 +36,7 @@ private: int32_t DoOpenTask(std::shared_ptr& camDev, DCameraSourceEvent& event); int32_t DoCloseTask(std::shared_ptr& camDev, DCameraSourceEvent& event); int32_t DoEventNofityTask(std::shared_ptr& camDev, DCameraSourceEvent& event); + int32_t DoGetFullCaps(std::shared_ptr& camDev, DCameraSourceEvent& event); using DCameraFunc = int32_t (DCameraSourceRegistState::*)(std::shared_ptr& camDev, DCameraSourceEvent& event); diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp index 4131d83e..d5101043 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp @@ -254,6 +254,35 @@ int32_t DCameraSourceDev::UpdateCameraSettings(const std::vector eventParam; + if (event.type_ == DCameraEventType::DCAMERE_GETFULLCAP) { + eventParam = std::make_shared(DCAMERA_EVENT_GET_FULLCAPS); + } else { + DHLOGE("DCameraSourceDev ProcessHDFEvent event type is Invaild."); + return DCAMERA_BAD_VALUE; + } + CHECK_AND_RETURN_RET_LOG(srcDevEventHandler_ == nullptr, DCAMERA_BAD_VALUE, "srcDevEventHandler_ is nullptr."); + AppExecFwk::InnerEvent::Pointer msgEvent = + AppExecFwk::InnerEvent::Get(EVENT_PROCESS_HDF_NOTIFY, eventParam, 0); + srcDevEventHandler_->SendEvent(msgEvent, 0, AppExecFwk::EventQueue::Priority::IMMEDIATE); + return DCAMERA_OK; +} + +int32_t DCameraSourceDev::GetFullCaps() +{ + DHLOGI("DCameraSourceDev GetFullCaps enter."); + if (stateListener_ == nullptr) { + DHLOGE("DCameraSourceDev DoSyncTrigger, stateListener_ is nullptr."); + return DCAMERA_BAD_VALUE; + } + stateListener_->OnDataSyncTrigger(devId_); + return DCAMERA_OK; +} + void DCameraSourceDev::DoHicollieProcess() { SetHicollieFlag(true); @@ -271,6 +300,17 @@ void DCameraSourceDev::DoProcessData(const AppExecFwk::InnerEvent::Pointer &even NotifyResult((*eventParam).GetEventType(), (*eventParam), ret); } +void DCameraSourceDev::DoProcesHDFEvent(const AppExecFwk::InnerEvent::Pointer &event) +{ + std::shared_ptr eventParam = event->GetSharedObject(); + CHECK_AND_RETURN_LOG(eventParam == nullptr, "eventParam is nullptr."); + int32_t ret = stateMachine_->Execute((*eventParam).GetEventType(), (*eventParam)); + if (ret != DCAMERA_OK) { + DHLOGE("DCameraSourceDev Execute failed, ret: %{public}d, devId: %{public}s dhId: %{public}s", ret, + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + } +} + DCameraSourceDev::DCameraSourceDevEventHandler::DCameraSourceDevEventHandler( const std::shared_ptr &runner, std::shared_ptr srcDevPtr) : AppExecFwk::EventHandler(runner), srcDevPtrWPtr_(srcDevPtr) @@ -294,6 +334,9 @@ void DCameraSourceDev::DCameraSourceDevEventHandler::ProcessEvent(const AppExecF case EVENT_SOURCE_DEV_PROCESS: srcDevPtr->DoProcessData(event); break; + case EVENT_PROCESS_HDF_NOTIFY: + srcDevPtr->DoProcesHDFEvent(event); + break; default: DHLOGE("event is undefined, id is %d", eventId); break; @@ -444,6 +487,7 @@ int32_t DCameraSourceDev::OpenCamera() DcameraFinishAsyncTrace(DCAMERA_OPEN_CHANNEL_CONTROL, DCAMERA_OPEN_CHANNEL_TASKID); return DCAMERA_OPEN_CONFLICT; } + stateListener_->OnHardwareStateChanged(devId_, dhId_, DcameraBusinessState::RUNNING); return DCAMERA_OK; } @@ -462,6 +506,7 @@ int32_t DCameraSourceDev::CloseCamera() DHLOGE("DCameraSourceDev Execute CloseCamera controller CloseChannel failed, ret: %{public}d, devId: " "%{public}s dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } + stateListener_->OnHardwareStateChanged(devId_, dhId_, DcameraBusinessState::IDLE); return DCAMERA_OK; } diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp index 045471f1..ba1608e9 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp @@ -298,5 +298,27 @@ int32_t DCameraProviderCallbackImpl::UpdateSettings(const DHBase& dhBase, const } return SUCCESS; } + +int32_t DCameraProviderCallbackImpl::NotifyEvent(const DHBase& dhBase, const DCameraHDFEvent& event) +{ + DHLOGI("DCameraProviderCallbackImpl NotifyEvent enter."); + if (!CheckDHBase(dhBase)) { + DHLOGE("input is invalid"); + return FAILED; + } + std::shared_ptr sourceDev = sourceDev_.lock(); + if (sourceDev == nullptr) { + DHLOGE("Process Event failed, can not get device, devId: %{public}s, dhId: %{public}s", + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + return FAILED; + } + int32_t ret = sourceDev->ProcessHDFEvent(event); + if (ret != DCAMERA_OK) { + DHLOGE("Process Event failed, ret: %{public}d, devId: %{public}s, dhId: %{public}s", ret, + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + return FAILED; + } + return SUCCESS; +} } // namespace DistributedHardware } // namespace OHOS 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 a4162ff9..18c184a1 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 @@ -30,6 +30,7 @@ DCameraSourceRegistState::DCameraSourceRegistState(std::shared_ptr& camDev, DCAMERA_EVENT eventType, @@ -115,5 +116,23 @@ int32_t DCameraSourceRegistState::DoEventNofityTask(std::shared_ptr& camDev, + DCameraSourceEvent& event) +{ + DHLOGI("DCameraSourceRegistState DoGetFullCaps enter."); + std::shared_ptr camEvent; + int32_t ret = event.GetCameraEvent(camEvent); + if (ret != DCAMERA_OK) { + return ret; + } + + ret = camDev->GetFullCaps(); + if (ret != DCAMERA_OK) { + DHLOGE("DCameraSourceRegistState DoEventNofityTask CameraEventNotify failed, ret: %{public}d", ret); + return ret; + } + return DCAMERA_OK; +} } // namespace DistributedHardware } // namespace OHOS -- Gitee From 037e674c85f397a0d650e054a57d81b319c9c6d0 Mon Sep 17 00:00:00 2001 From: byndyx Date: Fri, 17 May 2024 11:15:41 +0800 Subject: [PATCH 2/3] emnd Signed-off-by: byndyx --- .../dcamera_provider_callback_impl.cpp | 4 ---- .../dcamera_source_init_state.cpp | 1 + .../dcamera_source_regist_state.cpp | 23 ++++++++++--------- .../dcamera_provider_callback_impl_test.cpp | 18 +++++++++++++++ 4 files changed, 31 insertions(+), 15 deletions(-) diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp index ba1608e9..1c05042e 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp @@ -302,10 +302,6 @@ int32_t DCameraProviderCallbackImpl::UpdateSettings(const DHBase& dhBase, const int32_t DCameraProviderCallbackImpl::NotifyEvent(const DHBase& dhBase, const DCameraHDFEvent& event) { DHLOGI("DCameraProviderCallbackImpl NotifyEvent enter."); - if (!CheckDHBase(dhBase)) { - DHLOGE("input is invalid"); - return FAILED; - } std::shared_ptr sourceDev = sourceDev_.lock(); if (sourceDev == nullptr) { DHLOGE("Process Event failed, can not get device, devId: %{public}s, dhId: %{public}s", diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_init_state.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_init_state.cpp index df4a5d5d..3c71b0a6 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_init_state.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_init_state.cpp @@ -53,6 +53,7 @@ DCameraStateType DCameraSourceInitState::GetStateType() int32_t DCameraSourceInitState::DoRegisterTask(std::shared_ptr& camDev, DCameraSourceEvent& event) { + DHLOGI("DCameraSourceRegistState DoRegisterTask"); std::shared_ptr param; int32_t ret = event.GetDCameraRegistParam(param); if (ret != DCAMERA_OK) { 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 18c184a1..1161ed0e 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,9 +57,16 @@ DCameraStateType DCameraSourceRegistState::GetStateType() int32_t DCameraSourceRegistState::DoRegisterTask(std::shared_ptr& camDev, DCameraSourceEvent& event) { - DHLOGI("DCameraSourceRegistState DoRegisterTask Idempotent"); - (void)camDev; - (void)event; + DHLOGI("DCameraSourceRegistState DoRegisterTask"); + std::shared_ptr param; + int32_t ret = event.GetDCameraRegistParam(param); + if (ret != DCAMERA_OK) { + return ret; + } + ret = camDev->Register(param); + if (ret != DCAMERA_OK) { + return ret; + } return DCAMERA_OK; } @@ -121,15 +128,9 @@ int32_t DCameraSourceRegistState::DoGetFullCaps(std::shared_ptr camEvent; - int32_t ret = event.GetCameraEvent(camEvent); + int32_t ret = camDev->GetFullCaps(); if (ret != DCAMERA_OK) { - return ret; - } - - ret = camDev->GetFullCaps(); - if (ret != DCAMERA_OK) { - DHLOGE("DCameraSourceRegistState DoEventNofityTask CameraEventNotify failed, ret: %{public}d", ret); + DHLOGE("DCameraSourceRegistState DoGetFullCaps GetFullCaps failed, ret: %{public}d", ret); return ret; } return DCAMERA_OK; diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_provider_callback_impl_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_provider_callback_impl_test.cpp index 9262477b..78935806 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_provider_callback_impl_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_provider_callback_impl_test.cpp @@ -445,5 +445,23 @@ HWTEST_F(DCameraProviderCallbackImplTest, dcamera_provider_callback_impl_test_01 ret = testProviderCallback->StopCapture(dhBase, streamIds); EXPECT_EQ(FAILED, ret); } + +/** + * @tc.name: dcamera_provider_callback_impl_test_014 + * @tc.desc: Verify NotifyEvent func. + * @tc.type: FUNC + * @tc.require: issue + */ +HWTEST_F(DCameraProviderCallbackImplTest, dcamera_provider_callback_impl_test_014, TestSize.Level1) +{ + DHBase dhBase{TEST_DEVICE_ID, TEST_CAMERA_DH_ID_0}; + DCameraHDFEvent event; + event.type_ = DCameraEventType::DCAMERE_GETFULLCAP; + int32_t ret = testProviderCallback_->NotifyEvent(dhBase, event); + EXPECT_EQ(SUCCESS, ret); + event.type_ = DCameraEventType::DCAMERA_MESSAGE; + ret = testProviderCallback_->NotifyEvent(dhBase, event); + EXPECT_EQ(FAILED, ret); +} } // namespace DistributedHardware } // namespace OHOS -- Gitee From 643d5dc6a5844ec83ee593240eb4de2cd8bae4f7 Mon Sep 17 00:00:00 2001 From: byndyx Date: Fri, 17 May 2024 14:32:11 +0800 Subject: [PATCH 3/3] add signoff Signed-off-by: byndyx --- .../distributedcameramgr/dcamera_source_dev.cpp | 15 ++++++--------- .../dcamerahdf/dcamera_provider_callback_impl.cpp | 1 + .../dcamerastate/dcamera_source_init_state.cpp | 1 - .../dcamerastate/dcamera_source_regist_state.cpp | 6 ++++++ .../dcamera_provider_callback_impl_test.cpp | 2 +- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp index d5101043..1d7d4229 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp @@ -256,15 +256,9 @@ int32_t DCameraSourceDev::UpdateCameraSettings(const std::vector eventParam; - if (event.type_ == DCameraEventType::DCAMERE_GETFULLCAP) { - eventParam = std::make_shared(DCAMERA_EVENT_GET_FULLCAPS); - } else { - DHLOGE("DCameraSourceDev ProcessHDFEvent event type is Invaild."); - return DCAMERA_BAD_VALUE; - } + DHLOGI("DCameraSourceDev ProcessHDFEvent devId %{public}s dhId %{public}s event_type %{public}d", + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), event.type_); + std::shared_ptr eventParam = std::make_shared(DCAMERA_EVENT_GET_FULLCAPS); CHECK_AND_RETURN_RET_LOG(srcDevEventHandler_ == nullptr, DCAMERA_BAD_VALUE, "srcDevEventHandler_ is nullptr."); AppExecFwk::InnerEvent::Pointer msgEvent = AppExecFwk::InnerEvent::Get(EVENT_PROCESS_HDF_NOTIFY, eventParam, 0); @@ -304,6 +298,7 @@ void DCameraSourceDev::DoProcesHDFEvent(const AppExecFwk::InnerEvent::Pointer &e { std::shared_ptr eventParam = event->GetSharedObject(); CHECK_AND_RETURN_LOG(eventParam == nullptr, "eventParam is nullptr."); + CHECK_AND_RETURN_LOG(stateMachine_ == nullptr, "stateMachine_ is nullptr."); int32_t ret = stateMachine_->Execute((*eventParam).GetEventType(), (*eventParam)); if (ret != DCAMERA_OK) { DHLOGE("DCameraSourceDev Execute failed, ret: %{public}d, devId: %{public}s dhId: %{public}s", ret, @@ -487,6 +482,7 @@ int32_t DCameraSourceDev::OpenCamera() DcameraFinishAsyncTrace(DCAMERA_OPEN_CHANNEL_CONTROL, DCAMERA_OPEN_CHANNEL_TASKID); return DCAMERA_OPEN_CONFLICT; } + CHECK_AND_RETURN_RET_LOG(stateListener_ == nullptr, DCAMERA_BAD_VALUE, "stateListener_ is nullptr."); stateListener_->OnHardwareStateChanged(devId_, dhId_, DcameraBusinessState::RUNNING); return DCAMERA_OK; } @@ -506,6 +502,7 @@ int32_t DCameraSourceDev::CloseCamera() DHLOGE("DCameraSourceDev Execute CloseCamera controller CloseChannel failed, ret: %{public}d, devId: " "%{public}s dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); } + CHECK_AND_RETURN_RET_LOG(stateListener_ == nullptr, DCAMERA_BAD_VALUE, "stateListener_ is nullptr."); stateListener_->OnHardwareStateChanged(devId_, dhId_, DcameraBusinessState::IDLE); return DCAMERA_OK; } diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp index 1c05042e..c0204f2d 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerahdf/dcamera_provider_callback_impl.cpp @@ -314,6 +314,7 @@ int32_t DCameraProviderCallbackImpl::NotifyEvent(const DHBase& dhBase, const DCa GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); return FAILED; } + DHLOGI("DCameraProviderCallbackImpl NotifyEvent end."); return SUCCESS; } } // namespace DistributedHardware diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_init_state.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_init_state.cpp index 3c71b0a6..df4a5d5d 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_init_state.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamerastate/dcamera_source_init_state.cpp @@ -53,7 +53,6 @@ DCameraStateType DCameraSourceInitState::GetStateType() int32_t DCameraSourceInitState::DoRegisterTask(std::shared_ptr& camDev, DCameraSourceEvent& event) { - DHLOGI("DCameraSourceRegistState DoRegisterTask"); std::shared_ptr param; int32_t ret = event.GetDCameraRegistParam(param); if (ret != DCAMERA_OK) { 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 1161ed0e..45329404 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 @@ -61,10 +61,12 @@ int32_t DCameraSourceRegistState::DoRegisterTask(std::shared_ptr param; int32_t ret = event.GetDCameraRegistParam(param); if (ret != DCAMERA_OK) { + DHLOGE("DCameraSourceRegistState GetDCameraRegistParam failed"); return ret; } ret = camDev->Register(param); if (ret != DCAMERA_OK) { + DHLOGE("DCameraSourceRegistState Register failed"); return ret; } return DCAMERA_OK; @@ -128,6 +130,10 @@ int32_t DCameraSourceRegistState::DoGetFullCaps(std::shared_ptrGetFullCaps(); if (ret != DCAMERA_OK) { DHLOGE("DCameraSourceRegistState DoGetFullCaps GetFullCaps failed, ret: %{public}d", ret); diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_provider_callback_impl_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_provider_callback_impl_test.cpp index 78935806..e5b44d9c 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_provider_callback_impl_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_provider_callback_impl_test.cpp @@ -461,7 +461,7 @@ HWTEST_F(DCameraProviderCallbackImplTest, dcamera_provider_callback_impl_test_01 EXPECT_EQ(SUCCESS, ret); event.type_ = DCameraEventType::DCAMERA_MESSAGE; ret = testProviderCallback_->NotifyEvent(dhBase, event); - EXPECT_EQ(FAILED, ret); + EXPECT_EQ(SUCCESS, ret); } } // namespace DistributedHardware } // namespace OHOS -- Gitee