From 02cc19714d952786fab4a83ea418e3280e014777 Mon Sep 17 00:00:00 2001 From: yangli <1220629463@qq.com> Date: Fri, 22 Dec 2023 10:36:16 +0800 Subject: [PATCH 1/5] 1 Signed-off-by: yangli <1220629463@qq.com> --- .../dscreenmgr/2.0/src/av_sender_engine_adapter.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/services/screenservice/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter.cpp b/services/screenservice/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter.cpp index 02ad243f..d708c421 100644 --- a/services/screenservice/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/2.0/src/av_sender_engine_adapter.cpp @@ -80,11 +80,6 @@ int32_t AVTransSenderAdapter::Start() DHLOGE("start av transport sender engine failed, ret:%" PRId32, ret); return ERR_DH_AV_TRANS_START_FAILED; } - ret = WaitForAVTransStarted(); - if (ret != DH_SUCCESS) { - DHLOGE("wait for start av transport sender engine failed, ret:%" PRId32, ret); - return ERR_DH_AV_TRANS_START_FAILED; - } DHLOGI("Start Success"); return DH_SUCCESS; } -- Gitee From 2271e05bbbe29faa302bf055129f2abd86c84ee9 Mon Sep 17 00:00:00 2001 From: yangli <1220629463@qq.com> Date: Sat, 23 Dec 2023 12:34:57 +0800 Subject: [PATCH 2/5] 1221 Signed-off-by: yangli <1220629463@qq.com> --- .../sourceservice/dscreenmgr/2.0/include/dscreen.h | 1 + .../sourceservice/dscreenmgr/2.0/src/dscreen.cpp | 12 ++++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/services/screenservice/sourceservice/dscreenmgr/2.0/include/dscreen.h b/services/screenservice/sourceservice/dscreenmgr/2.0/include/dscreen.h index eb09e2ba..00c439fa 100644 --- a/services/screenservice/sourceservice/dscreenmgr/2.0/include/dscreen.h +++ b/services/screenservice/sourceservice/dscreenmgr/2.0/include/dscreen.h @@ -139,6 +139,7 @@ private: DScreenState curState_; std::mutex stateMtx_; + std::mutex ableMtx_; std::thread taskQueueThread_; std::condition_variable taskQueueCond_; std::mutex taskQueueMtx_; diff --git a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp index c93f59dc..bfafccbc 100644 --- a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp @@ -129,11 +129,15 @@ void DScreen::HandleEnable(const std::string ¶m, const std::string &taskId) DHLOGE("DScreen::HandleEnable, dscreenCallback_ is nullptr"); return; } - if ((curState_ == ENABLED) || (curState_ == ENABLING) || (curState_ == CONNECTING) || (curState_ == CONNECTED)) { - dscreenCallback_->OnRegResult(shared_from_this(), taskId, DH_SUCCESS, "dscreen enable success."); - return; + { + std::lock_guard lock(ableMtx_); + if ((curState_ == ENABLED) || (curState_ == ENABLING) || (curState_ == CONNECTING) || (curState_ == CONNECTED)) { + dscreenCallback_->OnRegResult(shared_from_this(), taskId, DH_SUCCESS, "dscreen enable success."); + return; + } + SetState(ENABLING); } - SetState(ENABLING); + json attrJson = json::parse(param, nullptr, false); if (!CheckJsonData(attrJson)) { -- Gitee From 117b47faa20ce2de2d777b94b03ae06e0a88483f Mon Sep 17 00:00:00 2001 From: yangli <1220629463@qq.com> Date: Sat, 23 Dec 2023 12:37:00 +0800 Subject: [PATCH 3/5] 1221 Signed-off-by: yangli <1220629463@qq.com> --- .../screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp index bfafccbc..2b9e100b 100644 --- a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp @@ -137,7 +137,6 @@ void DScreen::HandleEnable(const std::string ¶m, const std::string &taskId) } SetState(ENABLING); } - json attrJson = json::parse(param, nullptr, false); if (!CheckJsonData(attrJson)) { -- Gitee From c0c579ad7d57bcf2373e9b0df4cb12a1a2854609 Mon Sep 17 00:00:00 2001 From: yangli <1220629463@qq.com> Date: Sat, 23 Dec 2023 14:51:09 +0800 Subject: [PATCH 4/5] 1221 Signed-off-by: yangli <1220629463@qq.com> --- .../sourceservice/dscreenmgr/2.0/src/dscreen.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp index 2b9e100b..4963fc52 100644 --- a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp @@ -129,14 +129,13 @@ void DScreen::HandleEnable(const std::string ¶m, const std::string &taskId) DHLOGE("DScreen::HandleEnable, dscreenCallback_ is nullptr"); return; } - { - std::lock_guard lock(ableMtx_); - if ((curState_ == ENABLED) || (curState_ == ENABLING) || (curState_ == CONNECTING) || (curState_ == CONNECTED)) { - dscreenCallback_->OnRegResult(shared_from_this(), taskId, DH_SUCCESS, "dscreen enable success."); - return; - } - SetState(ENABLING); + std::lock_guard lock(ableMtx_); + if ((curState_ == ENABLED) || (curState_ == ENABLING) || (curState_ == CONNECTING) || + (curState_ == CONNECTED)) { + dscreenCallback_->OnRegResult(shared_from_this(), taskId, DH_SUCCESS, "dscreen enable success."); + return; } + SetState(ENABLING); json attrJson = json::parse(param, nullptr, false); if (!CheckJsonData(attrJson)) { -- Gitee From e2bda976d650b05a1013972a27240c644c40577b Mon Sep 17 00:00:00 2001 From: yangli <1220629463@qq.com> Date: Sat, 23 Dec 2023 15:13:55 +0800 Subject: [PATCH 5/5] 1221 Signed-off-by: yangli <1220629463@qq.com> --- .../sourceservice/dscreenmgr/2.0/src/dscreen.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp index 4963fc52..7515f38a 100644 --- a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp @@ -130,8 +130,8 @@ void DScreen::HandleEnable(const std::string ¶m, const std::string &taskId) return; } std::lock_guard lock(ableMtx_); - if ((curState_ == ENABLED) || (curState_ == ENABLING) || (curState_ == CONNECTING) || - (curState_ == CONNECTED)) { + if ((curState_ == ENABLED) || (curState_ == ENABLING) || (curState_ == CONNECTING) || + (curState_ == CONNECTED)) { dscreenCallback_->OnRegResult(shared_from_this(), taskId, DH_SUCCESS, "dscreen enable success."); return; } -- Gitee