From 6eb74ec6564e0149f69ea4162e988e634126b62e Mon Sep 17 00:00:00 2001 From: chen0088 Date: Thu, 9 Jan 2025 20:52:51 +0800 Subject: [PATCH] modify select channel Signed-off-by: chen0088 --- .../src/distributedcameramgr/dcamera_sink_controller.cpp | 2 +- .../src/distributedcameramgr/dcamera_source_dev.cpp | 7 ++++--- .../dcameracontrol/dcamera_source_controller.cpp | 1 - 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp index 43db0530..8760e9e5 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp @@ -320,7 +320,6 @@ int32_t DCameraSinkController::CloseChannel() } } isPageStatus_.store(false); - ManageSelectChannel::GetInstance().SetSinkConnect(false); DHLOGI("DCameraSinkController CloseChannel %{public}s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } @@ -446,6 +445,7 @@ int32_t DCameraSinkController::UnInit() } isInit_ = false; + ManageSelectChannel::GetInstance().SetSinkConnect(false); DHLOGI("DCameraSinkController UnInit %{public}s success", GetAnonyString(dhId_).c_str()); return DCAMERA_OK; } diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp index cad2f59b..aafcbb92 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcamera_source_dev.cpp @@ -101,9 +101,6 @@ int32_t DCameraSourceDev::RegisterDistributedHardware(const std::string& devId, DHLOGI("DCameraSourceDev PostTask RegisterDistributedHardware devId %{public}s dhId %{public}s", GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str()); version_ = param.sinkVersion; - if (version_ >= SEPARATE_SINK_VERSION) { - ManageSelectChannel::GetInstance().SetSrcConnect(true); - } DCameraIndex index(devId, dhId); actualDevInfo_.insert(index); @@ -381,6 +378,9 @@ int32_t DCameraSourceDev::Register(std::shared_ptr& param) input_->UnInit(); return DCAMERA_REGIST_HAL_FAILED; } + if (version_ >= SEPARATE_SINK_VERSION) { + ManageSelectChannel::GetInstance().SetSrcConnect(true); + } return DCAMERA_OK; } @@ -453,6 +453,7 @@ int32_t DCameraSourceDev::UnRegister(std::shared_ptr& param) if (retHdi != SUCCESS) { return DCAMERA_UNREGIST_HAL_FAILED; } + ManageSelectChannel::GetInstance().SetSrcConnect(false); return DCAMERA_OK; } diff --git a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller.cpp b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller.cpp index a4010c2b..f6b615c5 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller.cpp @@ -394,7 +394,6 @@ int32_t DCameraSourceController::CloseChannel() DCameraSourceServiceIpc::GetInstance().DeleteSinkRemoteCamSrv(devId); } } - ManageSelectChannel::GetInstance().SetSrcConnect(false); return ret; } -- Gitee