From a118950522ab5e4cd949d9ac6b1dcc852cd8f71b Mon Sep 17 00:00:00 2001 From: yangli <1220629463@qq.com> Date: Wed, 3 Jan 2024 12:24:44 +0800 Subject: [PATCH 1/7] 0103 Signed-off-by: yangli <1220629463@qq.com> --- .../include/dscreen_source_service.h | 1 + .../src/dscreen_source_service.cpp | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h b/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h index 9cbd7e6f..cd684df0 100644 --- a/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h +++ b/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h @@ -50,6 +50,7 @@ protected: private: bool Init(); + void DeleteExistDScreens(); bool registerToService_ = false; }; diff --git a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp index a381a4f6..604845dd 100644 --- a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp +++ b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp @@ -41,9 +41,32 @@ DScreenSourceService::DScreenSourceService(int32_t saId, bool runOnCreate) : Sys void DScreenSourceService::OnStart() { DHLOGI("dscreen source service start."); + DeleteExistDScreens(); Init(); } +void DScreenSourceService::DeleteExistDScreens() +{ + std::vector> screens; + Rosen::ScreenManager::GetInstance().GetAllScreens(screens); + DHLOGI("screens size is: %" PRId32, screens.size()); + for (const auto &screen : screens) { + if (screen == nullptr) { + DHLOGE("screen is nullptr."); + continue; + } + std::string screenName = screen->GetName(); + DHLOGI("DeleteExistDScreens, screenName:%s", screenName.c_str()); + if (screenName.find(DSCREEN_PREFIX) != std::string::npos) { + DHLOGI("DestroyVirtualScreen"); + Rosen::DMError err = Rosen::ScreenManager::GetInstance().DestroyVirtualScreen(screen->GetId()); + if (err != Rosen::DMError::DM_OK) { + DHLOGE("remove virtual screen failed, screenId:%" PRIu64, screen->GetId()); + } + } + } +} + void DScreenSourceService::OnStop() { DHLOGI("dscreen source service stop."); -- Gitee From ecdb4aa4a4a47275866f720c28557fe18da02988 Mon Sep 17 00:00:00 2001 From: yangli <1220629463@qq.com> Date: Wed, 3 Jan 2024 12:26:28 +0800 Subject: [PATCH 2/7] 0103 Signed-off-by: yangli <1220629463@qq.com> --- .../src/dscreen_source_handler.cpp | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp index 0bc3a0ce..4b14d84d 100644 --- a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp +++ b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp @@ -34,7 +34,6 @@ #include "dscreen_log.h" #include "dscreen_source_load_callback.h" #include "dscreen_util.h" -#include "screen_manager.h" namespace OHOS { namespace DistributedHardware { @@ -138,32 +137,9 @@ int32_t DScreenSourceHandler::ReleaseSource() return ret; } -void DScreenSourceHandler::DeleteExistDScreens() -{ - std::vector> screens; - Rosen::ScreenManager::GetInstance().GetAllScreens(screens); - DHLOGI("screens size is: %" PRId32, screens.size()); - for (const auto &screen : screens) { - if (screen == nullptr) { - DHLOGE("screen is nullptr."); - continue; - } - std::string screenName = screen->GetName(); - DHLOGI("DeleteExistDScreens, screenName:%s", screenName.c_str()); - if (screenName.find(DSCREEN_PREFIX) != std::string::npos) { - DHLOGI("DestroyVirtualScreen"); - Rosen::DMError err = Rosen::ScreenManager::GetInstance().DestroyVirtualScreen(screen->GetId()); - if (err != Rosen::DMError::DM_OK) { - DHLOGE("remove virtual screen failed, screenId:%" PRIu64, screen->GetId()); - } - } - } -} - int32_t DScreenSourceHandler::RegisterDistributedHardware(const std::string &devId, const std::string &dhId, const EnableParam ¶m, std::shared_ptr callback) { - DeleteExistDScreens(); if (devId.empty() || dhId.empty()) { DHLOGE("device id or dh id empty."); return ERR_DH_SCREEN_STRING_PARAM_EMPTY; -- Gitee From 407711757e51b60f1545375467dc78b1b480f29e Mon Sep 17 00:00:00 2001 From: yangli <1220629463@qq.com> Date: Wed, 3 Jan 2024 12:31:47 +0800 Subject: [PATCH 3/7] 0103 Signed-off-by: yangli <1220629463@qq.com> --- .../native_cpp/screen_source/include/dscreen_source_handler.h | 1 - 1 file changed, 1 deletion(-) diff --git a/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_handler.h b/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_handler.h index 3f8322d7..f57835a3 100644 --- a/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_handler.h +++ b/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_handler.h @@ -52,7 +52,6 @@ private: DScreenSourceHandler(); ~DScreenSourceHandler() = default; - void DeleteExistDScreens(); std::mutex proxyMutex_; std::condition_variable proxyConVar_; sptr dScreenSourceProxy_ = nullptr; -- Gitee From 38bb63e7823fa18b0ce5826c443cff3dccb0d53b Mon Sep 17 00:00:00 2001 From: yangli <1220629463@qq.com> Date: Wed, 3 Jan 2024 12:32:50 +0800 Subject: [PATCH 4/7] 0103 Signed-off-by: yangli <1220629463@qq.com> --- interfaces/innerkits/native_cpp/screen_source/BUILD.gn | 4 ---- 1 file changed, 4 deletions(-) diff --git a/interfaces/innerkits/native_cpp/screen_source/BUILD.gn b/interfaces/innerkits/native_cpp/screen_source/BUILD.gn index 90fe89a4..0b5ecb74 100644 --- a/interfaces/innerkits/native_cpp/screen_source/BUILD.gn +++ b/interfaces/innerkits/native_cpp/screen_source/BUILD.gn @@ -52,13 +52,9 @@ ohos_shared_library("distributed_screen_source_sdk") { external_deps = [ "c_utils:utils", - "graphic_2d:libcomposer", - "graphic_2d:librender_service_client", - "graphic_2d:surface", "hitrace:hitrace_meter", "ipc:ipc_core", "samgr:samgr_proxy", - "window_manager:libdm", ] subsystem_name = "distributedhardware" -- Gitee From c8f56b8fbc97292ecafce51cf475bc4b5bd3a00d Mon Sep 17 00:00:00 2001 From: yangli <1220629463@qq.com> Date: Wed, 3 Jan 2024 17:02:02 +0800 Subject: [PATCH 5/7] 0103 Signed-off-by: yangli <1220629463@qq.com> --- screenhandler/src/dscreen_handler.cpp | 2 +- services/common/test/unittest/databuffer/data_buffer_test.h | 2 +- .../screensourceprocessor/encoder/src/image_source_encoder.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/screenhandler/src/dscreen_handler.cpp b/screenhandler/src/dscreen_handler.cpp index 8a2b00a3..63e5507a 100644 --- a/screenhandler/src/dscreen_handler.cpp +++ b/screenhandler/src/dscreen_handler.cpp @@ -171,7 +171,7 @@ std::vector DScreenHandler::Query() dhItem.subtype = "screen"; dhItem.attrs = attrJson.dump(); dhItemVec.push_back(dhItem); - DHLOGD("query result: dhId: %s, attrs: %s", GetAnonyString(dhId).c_str(), attrJson.dump().c_str()); + DHLOGD("query result: dhId: %s, attrs: %s", dhId.c_str(), attrJson.dump().c_str()); } return dhItemVec; } diff --git a/services/common/test/unittest/databuffer/data_buffer_test.h b/services/common/test/unittest/databuffer/data_buffer_test.h index 8e1d9e2b..acf1b754 100644 --- a/services/common/test/unittest/databuffer/data_buffer_test.h +++ b/services/common/test/unittest/databuffer/data_buffer_test.h @@ -18,7 +18,7 @@ #include #include -#include +#include #include "data_buffer.h" diff --git a/services/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp b/services/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp index 16206935..86529b2b 100644 --- a/services/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp +++ b/services/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include -- Gitee From e91e6983202e3b37a4c71b835e22b230869a0f6a Mon Sep 17 00:00:00 2001 From: yangli <1220629463@qq.com> Date: Wed, 3 Jan 2024 17:32:51 +0800 Subject: [PATCH 6/7] 0103 Signed-off-by: yangli <1220629463@qq.com> --- common/src/dscreen_util.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/src/dscreen_util.cpp b/common/src/dscreen_util.cpp index 939db173..afa69f76 100644 --- a/common/src/dscreen_util.cpp +++ b/common/src/dscreen_util.cpp @@ -53,7 +53,10 @@ std::string GetRandomID() static std::uniform_int_distribution dist(0ULL, 0xFFFFFFFFFFFFFFFFULL); uint64_t ab = dist(randomDevice); uint64_t cd = dist(randomDevice); - uint32_t a, b, c, d; + uint32_t a; + uint32_t b; + uint32_t c; + uint32_t d; std::stringstream stringStream; ab = (ab & 0xFFFFFFFFFFFF0FFFULL) | 0x0000000000004000ULL; cd = (cd & 0x3FFFFFFFFFFFFFFFULL) | 0x8000000000000000ULL; -- Gitee From 2c7abe7adb2ab8dd098c68c0d233f364debcdd9b Mon Sep 17 00:00:00 2001 From: yangli <1220629463@qq.com> Date: Wed, 3 Jan 2024 18:33:07 +0800 Subject: [PATCH 7/7] 0103 Signed-off-by: yangli <1220629463@qq.com> --- .../sourceservice/dscreenservice/src/dscreen_source_service.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp index 604845dd..3cab837e 100644 --- a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp +++ b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp @@ -41,8 +41,8 @@ DScreenSourceService::DScreenSourceService(int32_t saId, bool runOnCreate) : Sys void DScreenSourceService::OnStart() { DHLOGI("dscreen source service start."); - DeleteExistDScreens(); Init(); + DeleteExistDScreens(); } void DScreenSourceService::DeleteExistDScreens() -- Gitee