From 99cca60342ac1416c2a5fed422d65f69f680fef9 Mon Sep 17 00:00:00 2001 From: zhuzhihui7 Date: Tue, 18 Mar 2025 17:05:46 +0800 Subject: [PATCH] perlaunch and parallelize distributed camera channel setup Signed-off-by: zhuzhihui7 --- .../client/include/dcamera_client.h | 1 + .../client/include/icamera_operator.h | 1 + .../client/src/dcamera_client.cpp | 14 +++++ .../dcamera_sink_controller.h | 2 + .../dcamera_sink_controller.cpp | 53 ++++++++++++------- .../dcamera_sink_output_test.cpp | 12 +++++ .../mock_camera_operator.h | 5 ++ .../dcameradata/dcamera_source_input.h | 5 ++ .../dcamera_source_controller.cpp | 14 ++--- .../dcameradata/dcamera_source_input.cpp | 29 +++++++--- .../dcamera_source_input_test.cpp | 4 +- .../src/dcamera_channel_source_impl.cpp | 2 +- .../encoder/encode_data_process.h | 3 ++ .../encoder/encode_data_process.cpp | 8 +-- .../encode_data_process_test.cpp | 2 +- 15 files changed, 116 insertions(+), 39 deletions(-) diff --git a/services/cameraservice/cameraoperator/client/include/dcamera_client.h b/services/cameraservice/cameraoperator/client/include/dcamera_client.h index 9fe39811..1df19c7b 100644 --- a/services/cameraservice/cameraoperator/client/include/dcamera_client.h +++ b/services/cameraservice/cameraoperator/client/include/dcamera_client.h @@ -49,6 +49,7 @@ public: int32_t SetResultCallback(std::shared_ptr& callback) override; int32_t PauseCapture() override; int32_t ResumeCapture() override; + int32_t PrelaunchCamera() override; private: int32_t ConfigCaptureSession(std::vector>& captureInfos, int32_t sceneMode); diff --git a/services/cameraservice/cameraoperator/client/include/icamera_operator.h b/services/cameraservice/cameraoperator/client/include/icamera_operator.h index 97309ff7..90daa089 100644 --- a/services/cameraservice/cameraoperator/client/include/icamera_operator.h +++ b/services/cameraservice/cameraoperator/client/include/icamera_operator.h @@ -64,6 +64,7 @@ public: virtual int32_t SetResultCallback(std::shared_ptr& callback) = 0; virtual int32_t PauseCapture() = 0; virtual int32_t ResumeCapture() = 0; + virtual int32_t PrelaunchCamera() = 0; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp b/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp index 78851383..099cf53a 100644 --- a/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp +++ b/services/cameraservice/cameraoperator/client/src/dcamera_client.cpp @@ -665,5 +665,19 @@ int32_t DCameraClient::ResumeCapture() } return ret; } + +int32_t DCameraClient::PrelaunchCamera() +{ + if (cameraManager_ == nullptr) { + DHLOGE("DCameraClient cameraManager_ is nullptr."); + return DCAMERA_BAD_VALUE; + } + int32_t ret = cameraManager_->PrelaunchCamera(); + if (ret != DCAMERA_OK) { + DHLOGE("DCameraClient PrelaunchCamera Start failed, cameraId: %{public}s, ret: %{public}d", + GetAnonyString(cameraId_).c_str(), ret); + } + return ret; +} } // namespace DistributedHardware } // namespace OHOS diff --git a/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_controller.h b/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_controller.h index 3fa5ac36..8ca1e347 100644 --- a/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_controller.h +++ b/services/cameraservice/sinkservice/include/distributedcameramgr/dcamera_sink_controller.h @@ -85,6 +85,8 @@ private: void ProcessPostAuthorization(const AppExecFwk::InnerEvent::Pointer &event); int32_t CreateCtrlSession(); int32_t CheckSensitive(); + void HandleConnecting(); + void HandleConnected(const std::string &networkId); void HandleDisconnected(); bool isInit_; diff --git a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp index 4431c08d..bea0964d 100644 --- a/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp +++ b/services/cameraservice/sinkservice/src/distributedcameramgr/dcamera_sink_controller.cpp @@ -548,29 +548,13 @@ void DCameraSinkController::OnSessionState(int32_t state, std::string networkId) sessionState_ = state; switch (state) { case DCAMERA_CHANNEL_STATE_CONNECTING: - DHLOGI("channel is connecting"); + HandleConnecting(); break; case DCAMERA_CHANNEL_STATE_CONNECTED: { - DHLOGI("channel is connected"); - if (!ManageSelectChannel::GetInstance().GetSinkConnect()) { - break; - } - srcDevId_ = networkId; - int32_t ret = CheckSensitive(); - if (ret != DCAMERA_OK) { - DHLOGE("Check sensitive error. ret %{public}d.", ret); - return; - } - ret = PullUpPage(); - CHECK_AND_RETURN_LOG(ret != DCAMERA_OK, "PullUpPage failed"); + HandleConnected(networkId); break; } case DCAMERA_CHANNEL_STATE_DISCONNECTED: { - DHLOGI("channel is disconnected"); - std::shared_ptr events = std::make_shared(); - events->eventType_ = DCAMERA_SINK_STOP; - events->eventResult_ = DCAMERA_EVENT_SINK_STOP; - DCameraNotify(events); HandleDisconnected(); break; } @@ -580,8 +564,41 @@ void DCameraSinkController::OnSessionState(int32_t state, std::string networkId) } } +void DCameraSinkController::HandleConnecting() +{ + DHLOGI("channel is connecting"); +} + +void DCameraSinkController::HandleConnected(const std::string &networkId) +{ + if (!ManageSelectChannel::GetInstance().GetSinkConnect()) { + return; + } + srcDevId_ = networkId; + int32_t ret = CheckSensitive(); + if (ret != DCAMERA_OK) { + DHLOGE("Check sensitive error. ret %{public}d.", ret); + return; + } + ret = PullUpPage(); + CHECK_AND_RETURN_LOG(ret != DCAMERA_OK, "PullUpPage failed"); + if (operator_ == nullptr) { + DHLOGE("operator_ is nullptr"); + return; + } + ret = operator_->PrelaunchCamera(); + if (ret != DCAMERA_OK) { + DHLOGE("operator_ PrelaunchCamera error. ret %{public}d.", ret); + } +} + void DCameraSinkController::HandleDisconnected() { + DHLOGI("channel is disconnected"); + std::shared_ptr events = std::make_shared(); + events->eventType_ = DCAMERA_SINK_STOP; + events->eventResult_ = DCAMERA_EVENT_SINK_STOP; + DCameraNotify(events); ffrt::submit([this]() { DHLOGI("DCameraSinkController::OnSessionState %{public}s new thread session state: %{public}d", GetAnonyString(dhId_).c_str(), sessionState_); diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_output_test.cpp b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_output_test.cpp index 82a001b0..1adafec1 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_output_test.cpp +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/dcamera_sink_output_test.cpp @@ -289,5 +289,17 @@ HWTEST_F(DCameraSinkOutputTest, dcamera_sink_output_test_008, TestSize.Level1) ret = output_->GetProperty(name, propertyCarrier); EXPECT_NE(DCAMERA_OK, ret); } + +/** + * @tc.name: dcamera_sink_output_test_009 + * @tc.desc: Verify the PrelaunchCamera function. + * @tc.type: FUNC + * @tc.require: I5N1JI + */ +HWTEST_F(DCameraSinkOutputTest, dcamera_sink_output_test_009, TestSize.Level1) +{ + int32_t ret = operator_->PrelaunchCamera(); + EXPECT_EQ(DCAMERA_OK, ret); +} } // namespace DistributedHardware } // namespace OHOS diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_camera_operator.h b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_camera_operator.h index 67fc84e9..2a712d6a 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_camera_operator.h +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcameramgr/mock_camera_operator.h @@ -110,6 +110,11 @@ public: } return DCAMERA_OK; } + + int32_t PrelaunchCamera() + { + return DCAMERA_OK; + } }; } // namespace DistributedHardware } // namespace OHOS 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 6fa3b270..f3d3edf4 100644 --- a/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_input.h +++ b/services/cameraservice/sourceservice/include/distributedcameramgr/dcameradata/dcamera_source_input.h @@ -68,6 +68,11 @@ private: std::atomic isChannelConnected_ = false; std::mutex channelMtx_; std::condition_variable channelCond_; + + static constexpr std::chrono::seconds TIMEOUT_1_SEC = std::chrono::seconds(1); + std::atomic isOpenChannel_ = false; + std::mutex isOpenChannelMtx_; + std::condition_variable isOpenChannelCond_; }; } // namespace DistributedHardware } // namespace OHOS 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 f482d766..03a47786 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameracontrol/dcamera_source_controller.cpp @@ -65,7 +65,7 @@ DCameraSourceController::~DCameraSourceController() int32_t DCameraSourceController::StartCapture(std::vector>& captureInfos, int32_t sceneMode) { - if (indexs_.size() > DCAMERA_MAX_NUM) { + if (indexs_.empty() || indexs_.size() > DCAMERA_MAX_NUM) { DHLOGE("StartCapture not support operate %{public}zu camera", indexs_.size()); return DCAMERA_BAD_OPERATE; } @@ -111,7 +111,7 @@ int32_t DCameraSourceController::StartCapture(std::vector DCAMERA_MAX_NUM) { + if (indexs_.empty() || indexs_.size() > DCAMERA_MAX_NUM) { DHLOGE("StopCapture not support operate %{public}zu camera", indexs_.size()); return DCAMERA_BAD_OPERATE; } @@ -163,7 +163,7 @@ int32_t DCameraSourceController::StopCapture() int32_t DCameraSourceController::ChannelNeg(std::shared_ptr& info) { if (!ManageSelectChannel::GetInstance().GetSrcConnect()) { - if (indexs_.size() > DCAMERA_MAX_NUM) { + if (indexs_.empty() || indexs_.size() > DCAMERA_MAX_NUM) { DHLOGE("ChannelNeg not support operate %{public}zu camera", indexs_.size()); return DCAMERA_BAD_OPERATE; } @@ -243,7 +243,7 @@ int32_t DCameraSourceController::DCameraNotify(std::shared_ptr& ev int32_t DCameraSourceController::UpdateSettings(std::vector>& settings) { - if (indexs_.size() > DCAMERA_MAX_NUM) { + if (indexs_.empty() || indexs_.size() > DCAMERA_MAX_NUM) { DHLOGE("UpdateSettings not support operate %{public}zu camera", indexs_.size()); return DCAMERA_BAD_OPERATE; } @@ -287,7 +287,7 @@ int32_t DCameraSourceController::UpdateSettings(std::vector& camInfo) { if (!ManageSelectChannel::GetInstance().GetSrcConnect()) { - if (indexs_.size() > DCAMERA_MAX_NUM) { + if (indexs_.empty() || indexs_.size() > DCAMERA_MAX_NUM) { DHLOGE("GetCameraInfo not support operate %{public}zu camera", indexs_.size()); return DCAMERA_BAD_OPERATE; } @@ -321,7 +321,7 @@ int32_t DCameraSourceController::GetCameraInfo(std::shared_ptr& cam int32_t DCameraSourceController::OpenChannel(std::shared_ptr& openInfo) { - if (indexs_.size() > DCAMERA_MAX_NUM) { + if (indexs_.empty() || indexs_.size() > DCAMERA_MAX_NUM) { DHLOGE("OpenChannel not support operate %{public}zu camera", indexs_.size()); return DCAMERA_BAD_OPERATE; } @@ -369,7 +369,7 @@ int32_t DCameraSourceController::OpenChannel(std::shared_ptr& o int32_t DCameraSourceController::CloseChannel() { - if (indexs_.size() > DCAMERA_MAX_NUM) { + if (indexs_.empty() || indexs_.size() > DCAMERA_MAX_NUM) { DHLOGE("CloseChannel not support operate %{public}zu camera", indexs_.size()); return DCAMERA_BAD_OPERATE; } 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 85a23569..45ad26c3 100644 --- a/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_input.cpp +++ b/services/cameraservice/sourceservice/src/distributedcameramgr/dcameradata/dcamera_source_input.cpp @@ -180,13 +180,21 @@ int32_t DCameraSourceInput::OpenChannel(std::vector& indexs) DHLOGI("DCameraSourceInput OpenChannel devId %{public}s dhId %{public}s continue state: %{public}d, snapshot " "state: %{public}d", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), channelState_[CONTINUOUS_FRAME], channelState_[SNAPSHOT_FRAME]); + std::shared_ptr runner = AppExecFwk::EventRunner::Create(true); + auto handler = std::make_shared(runner); + std::vector &localIndexs = indexs; if (channelState_[CONTINUOUS_FRAME] == DCAMERA_CHANNEL_STATE_DISCONNECTED) { - int32_t ret = EstablishContinuousFrameSession(indexs); - if (ret != DCAMERA_OK) { - DHLOGE("esdablish continuous frame failed ret: %{public}d, devId: %{public}s, dhId: %{public}s", ret, - GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); - return ret; - } + auto task = [&]() { + int32_t ret = EstablishContinuousFrameSession(localIndexs); + if (ret != DCAMERA_OK) { + DHLOGE("esdablish continuous frame failed ret: %{public}d, devId: %{public}s, dhId: %{public}s", ret, + GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); + } + std::unique_lock lock(isOpenChannelMtx_); + isOpenChannel_.store(true); + isOpenChannelCond_.notify_one(); + }; + handler->PostTask(task, "DCameraSourceInput:OpenChannel", 0, AppExecFwk::EventQueue::Priority::HIGH); } if (channelState_[SNAPSHOT_FRAME] == DCAMERA_CHANNEL_STATE_DISCONNECTED) { int32_t ret = EstablishSnapshotFrameSession(indexs); @@ -194,7 +202,14 @@ int32_t DCameraSourceInput::OpenChannel(std::vector& indexs) DHLOGE("esdablish snapshot frame failed ret: %{public}d," "devId: %{public}s, dhId: %{public}s", ret, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str()); - return ret; + } + } + { + bool isOpenChannelCond = channelState_[CONTINUOUS_FRAME] == DCAMERA_CHANNEL_STATE_DISCONNECTED && + channelState_[SNAPSHOT_FRAME] == DCAMERA_CHANNEL_STATE_DISCONNECTED; + std::unique_lock lock(isOpenChannelMtx_); + while (!isOpenChannel_.load() && isOpenChannelCond) { + isOpenChannelCond_.wait_for(lock, TIMEOUT_1_SEC, [this] { return isOpenChannel_.load(); }); } } return DCAMERA_OK; diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_input_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_input_test.cpp index 9b396a48..2998be00 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_input_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcameramgr/dcamera_source_input_test.cpp @@ -329,7 +329,7 @@ HWTEST_F(DCameraSourceInputTest, dcamera_source_input_test_009, TestSize.Level1) EXPECT_EQ(rc, DCAMERA_OK); rc = testInput_->OpenChannel(g_camIndexs); - EXPECT_NE(rc, DCAMERA_OK); + EXPECT_EQ(rc, DCAMERA_OK); rc = testInput_->UnInit(); EXPECT_EQ(rc, DCAMERA_OK); } @@ -351,7 +351,7 @@ HWTEST_F(DCameraSourceInputTest, dcamera_source_input_test_010, TestSize.Level1) EXPECT_EQ(rc, DCAMERA_OK); rc = testInput_->OpenChannel(g_camIndexs); - EXPECT_NE(rc, DCAMERA_OK); + EXPECT_EQ(rc, DCAMERA_OK); rc = testInput_->CloseChannel(); EXPECT_EQ(rc, DCAMERA_OK); diff --git a/services/channel/src/dcamera_channel_source_impl.cpp b/services/channel/src/dcamera_channel_source_impl.cpp index f190ad32..21fb4c38 100644 --- a/services/channel/src/dcamera_channel_source_impl.cpp +++ b/services/channel/src/dcamera_channel_source_impl.cpp @@ -78,7 +78,7 @@ int32_t DCameraChannelSourceImpl::CreateSession(std::vector& camIn mode_ = sessionMode; DHLOGI("DCameraChannelSourceImpl CreateSession Start, name: %{public}s devId: %{public}s", GetAnonyString(mySessionName_).c_str(), GetAnonyString(myDevId).c_str()); - for (auto iter = camIndexs.begin(); iter != camIndexs.end(); iter++) { + for (auto iter = camIndexs_.begin(); iter != camIndexs_.end(); iter++) { std::string peerDevId = (*iter).devId_; std::string peerSessionName = SESSION_HEAD + (*iter).dhId_ + std::string("_") + sessionFlag; // source_bind diff --git a/services/data_process/include/pipeline_node/multimedia_codec/encoder/encode_data_process.h b/services/data_process/include/pipeline_node/multimedia_codec/encoder/encode_data_process.h index bf90e19e..7adb87dc 100644 --- a/services/data_process/include/pipeline_node/multimedia_codec/encoder/encode_data_process.h +++ b/services/data_process/include/pipeline_node/multimedia_codec/encoder/encode_data_process.h @@ -120,6 +120,7 @@ private: const static std::map ENCODER_BITRATE_TABLE; constexpr static uint64_t S2NS = 1000000000; constexpr static uint32_t US2NS = 1000; + constexpr static std::chrono::seconds TIMEOUT_1_SEC = std::chrono::seconds(1); std::weak_ptr callbackPipelineSink_; std::mutex mtxEncoderState_; @@ -132,6 +133,8 @@ private: sptr encodeProducerSurface_ = nullptr; std::atomic isEncoderProcess_ = false; + std::mutex isEncoderProcessMtx_; + std::condition_variable isEncoderProcessCond_; int32_t waitEncoderOutputCount_ = 0; int64_t lastFeedEncoderInputBufferTimeUs_ = 0; diff --git a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp index 88428ece..7fbea8d1 100644 --- a/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp +++ b/services/data_process/src/pipeline_node/multimedia_codec/encoder/encode_data_process.cpp @@ -75,6 +75,7 @@ int32_t EncodeDataProcess::InitNode(const VideoConfigParams& sourceConfig, const processedConfig_ = sourceConfig; processedConfig = processedConfig_; isEncoderProcess_.store(true); + isEncoderProcessCond_.notify_one(); return DCAMERA_OK; } @@ -86,6 +87,7 @@ int32_t EncodeDataProcess::InitNode(const VideoConfigParams& sourceConfig, const } processedConfig = processedConfig_; isEncoderProcess_.store(true); + isEncoderProcessCond_.notify_one(); return DCAMERA_OK; } @@ -542,9 +544,9 @@ void EncodeDataProcess::OnOutputFormatChanged(const Media::Format &format) void EncodeDataProcess::OnOutputBufferAvailable(uint32_t index, MediaAVCodec::AVCodecBufferInfo info, MediaAVCodec::AVCodecBufferFlag flag, std::shared_ptr buffer) { - if (!isEncoderProcess_.load()) { - DHLOGE("EncodeNode occurred error or start release."); - return; + std::unique_lock lock(isEncoderProcessMtx_); + while (!isEncoderProcess_.load()) { + isEncoderProcessCond_.wait_for(lock, TIMEOUT_1_SEC, [this] { return isEncoderProcess_.load(); }); } DHLOGD("Video encode buffer info: presentation TimeUs %{public}" PRId64", size %{public}d, offset %{public}d, " "flag %{public}d", info.presentationTimeUs, info.size, info.offset, flag); diff --git a/services/data_process/test/unittest/common/pipeline_node/encode_data_process_test.cpp b/services/data_process/test/unittest/common/pipeline_node/encode_data_process_test.cpp index 161a4534..694c2159 100644 --- a/services/data_process/test/unittest/common/pipeline_node/encode_data_process_test.cpp +++ b/services/data_process/test/unittest/common/pipeline_node/encode_data_process_test.cpp @@ -465,11 +465,11 @@ HWTEST_F(EncodeDataProcessTest, encode_data_process_test_014, TestSize.Level1) MediaAVCodec::AVCodecBufferFlag flag = MediaAVCodec::AVCODEC_BUFFER_FLAG_CODEC_DATA; std::shared_ptr buffer = nullptr; testEncodeDataProcess_->OnOutputBufferAvailable(index, info, flag, buffer); - testEncodeDataProcess_->OnError(); testEncodeDataProcess_->OnInputBufferAvailable(index, buffer); Media::Format format; testEncodeDataProcess_->OnOutputFormatChanged(format); testEncodeDataProcess_->OnOutputBufferAvailable(index, info, flag, buffer); + testEncodeDataProcess_->OnError(); EXPECT_EQ(rc, DCAMERA_OK); } -- Gitee