From ecc27157c44ce120c178f7db8b8465fe0b798954 Mon Sep 17 00:00:00 2001 From: yangwei_814916 Date: Fri, 3 Mar 2023 17:50:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8C=89=E9=9C=80=E5=90=AF=E5=81=9C?= =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yangwei_814916 --- .../sinkservice/dscreenservice/src/dscreen_sink_service.cpp | 4 ++-- .../screenservice/sourceservice/dscreenmgr/src/dscreen.cpp | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp index 830e1553..df842e63 100644 --- a/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp +++ b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp @@ -81,8 +81,8 @@ int32_t DScreenSinkService::ReleaseSink() DHLOGI("exit sink sa process"); auto systemAbilityMgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager(); if (systemAbilityMgr == nullptr) { - DHLOGE("systemAbilityMgr is null"); - return DSCREEN_INIT_ERR; + DHLOGE("systemAbilityMgr is null"); + return DSCREEN_INIT_ERR; } int32_t ret = systemAbilityMgr->UnloadSystemAbility(DISTRIBUTED_HARDWARE_SCREEN_SINK_SA_ID); if (ret != DH_SUCCESS) { diff --git a/services/screenservice/sourceservice/dscreenmgr/src/dscreen.cpp b/services/screenservice/sourceservice/dscreenmgr/src/dscreen.cpp index 421c4aed..357fa52c 100644 --- a/services/screenservice/sourceservice/dscreenmgr/src/dscreen.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/src/dscreen.cpp @@ -192,12 +192,10 @@ void DScreen::HandleEnable(const std::string ¶m, const std::string &taskId) dscreenCallback_->OnRegResult(shared_from_this(), taskId, DH_SUCCESS, "dscreen enable success."); return; } - SetState(ENABLING); if (videoParam_ == nullptr) { videoParam_ = std::make_shared(); } - json attrJson = json::parse(param, nullptr, false); if (attrJson.is_discarded()) { DHLOGE("HandleEnable attrJson is invalid"); @@ -212,11 +210,8 @@ void DScreen::HandleEnable(const std::string ¶m, const std::string &taskId) GetAnonyString(dhId_).c_str(), "check json data failed."); return; } - videoParam_->SetScreenWidth(attrJson[KEY_SCREEN_WIDTH].get()); videoParam_->SetScreenHeight(attrJson[KEY_SCREEN_HEIGHT].get()); - - // negotiate codecType ret = NegotiateCodecType(attrJson[KEY_CODECTYPE]); if (ret != DH_SUCCESS) { DHLOGE("negotiate codec type failed."); -- Gitee From 19a5c6f1838c7d379beb35277da4ed1fa3125897 Mon Sep 17 00:00:00 2001 From: yangwei_814916 Date: Sat, 4 Mar 2023 10:29:04 +0800 Subject: [PATCH 2/2] modify format error Signed-off-by: yangwei_814916 --- .../sourceservice/dscreenmgr/src/dscreen.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/services/screenservice/sourceservice/dscreenmgr/src/dscreen.cpp b/services/screenservice/sourceservice/dscreenmgr/src/dscreen.cpp index 357fa52c..926ccae1 100644 --- a/services/screenservice/sourceservice/dscreenmgr/src/dscreen.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/src/dscreen.cpp @@ -192,10 +192,12 @@ void DScreen::HandleEnable(const std::string ¶m, const std::string &taskId) dscreenCallback_->OnRegResult(shared_from_this(), taskId, DH_SUCCESS, "dscreen enable success."); return; } + SetState(ENABLING); if (videoParam_ == nullptr) { videoParam_ = std::make_shared(); } + json attrJson = json::parse(param, nullptr, false); if (attrJson.is_discarded()) { DHLOGE("HandleEnable attrJson is invalid"); @@ -203,18 +205,19 @@ void DScreen::HandleEnable(const std::string ¶m, const std::string &taskId) } int32_t ret = CheckJsonData(attrJson); if (ret != DH_SUCCESS) { - DHLOGE("check json data failed."); dscreenCallback_->OnRegResult(shared_from_this(), taskId, ERR_DH_SCREEN_SA_ENABLE_FAILED, "enable param json is invalid."); ReportRegisterFail(DSCREEN_REGISTER_FAIL, ERR_DH_SCREEN_SA_ENABLE_FAILED, GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str(), "check json data failed."); return; } + videoParam_->SetScreenWidth(attrJson[KEY_SCREEN_WIDTH].get()); videoParam_->SetScreenHeight(attrJson[KEY_SCREEN_HEIGHT].get()); + + // negotiate codecType ret = NegotiateCodecType(attrJson[KEY_CODECTYPE]); if (ret != DH_SUCCESS) { - DHLOGE("negotiate codec type failed."); dscreenCallback_->OnRegResult(shared_from_this(), taskId, ERR_DH_SCREEN_SA_ENABLE_FAILED, "negotiate codec type failed."); ReportRegisterFail(DSCREEN_REGISTER_FAIL, ERR_DH_SCREEN_SA_ENABLE_FAILED, GetAnonyString(devId_).c_str(), @@ -224,7 +227,6 @@ void DScreen::HandleEnable(const std::string ¶m, const std::string &taskId) uint64_t screenId = ScreenMgrAdapter::GetInstance().CreateVirtualScreen(devId_, dhId_, videoParam_); if (screenId == SCREEN_ID_INVALID) { - DHLOGE("create virtual screen failed."); dscreenCallback_->OnRegResult(shared_from_this(), taskId, ERR_DH_SCREEN_SA_ENABLE_FAILED, "create virtual screen failed."); ReportRegisterFail(DSCREEN_REGISTER_FAIL, ERR_DH_SCREEN_SA_ENABLE_FAILED, GetAnonyString(devId_).c_str(), -- Gitee