From 9f29c7f79a2b217b51644b18c169a0480de4a843 Mon Sep 17 00:00:00 2001 From: qinlong0101 Date: Mon, 6 Jun 2022 11:59:25 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9codex=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qinlong0101 --- services/screendemo/decoder_demo.cpp | 3 +-- services/screendemo/test.cpp | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/services/screendemo/decoder_demo.cpp b/services/screendemo/decoder_demo.cpp index 90242d3..a760b6a 100644 --- a/services/screendemo/decoder_demo.cpp +++ b/services/screendemo/decoder_demo.cpp @@ -217,11 +217,10 @@ const int32_t* VDecDemo::GetFrameLen() const int32_t* frameLen = nullptr; if (isW) { frameLen = ES_W; - return frameLen; } else { frameLen = ES_R; - return frameLen; } + return frameLen; } void VDecDemo::InputFunc() diff --git a/services/screendemo/test.cpp b/services/screendemo/test.cpp index 522aaec..232b64f 100644 --- a/services/screendemo/test.cpp +++ b/services/screendemo/test.cpp @@ -19,6 +19,7 @@ #include "display_manager.h" #include "dscreen_source_handler.h" #include "dscreen_sink_handler.h" +#include "dscreen_util.h" #include "idistributed_hardware_sink.h" #include "idistributed_hardware_source.h" #include "screen.h" @@ -226,14 +227,14 @@ static void PrintNodeProperty(NodeBasicInfo *nodeInfo) if (GetNodeKeyInfo(g_pkgName, nodeInfo->networkId, key, udid, UDID_BUF_LEN) != 0) { printf("GetNodeKeyInfo Fail!\n"); } else { - printf("Udid = %s\n", udid); + printf("Udid = %s\n", GetAnonyString((char *)udid).c_str()); } key = NODE_KEY_UUID; unsigned char uuid[UUID_BUF_LEN] = {0}; if (GetNodeKeyInfo(g_pkgName, nodeInfo->networkId, key, uuid, UUID_BUF_LEN) != 0) { printf("GetNodeKeyInfo Fail!\n"); } else { - printf("Uuid = %s\n", uuid); + printf("Uuid = %s\n", GetAnonyString((char *)uuid).c_str()); } } From 770edb04f7f4c2f1a700378ca048944125929680 Mon Sep 17 00:00:00 2001 From: qinlong0101 Date: Mon, 6 Jun 2022 15:10:14 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9codex=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qinlong0101 --- services/screendemo/decoder_demo.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/services/screendemo/decoder_demo.cpp b/services/screendemo/decoder_demo.cpp index a760b6a..1264577 100644 --- a/services/screendemo/decoder_demo.cpp +++ b/services/screendemo/decoder_demo.cpp @@ -62,8 +62,6 @@ using namespace OHOS; using namespace OHOS::Media; using namespace std; namespace { - constexpr uint32_t DEFAULT_WIDTH = 480; - constexpr uint32_t DEFAULT_HEIGHT = 360; constexpr uint32_t DEFAULT_FRAME_RATE = 30; constexpr uint32_t MAX_INPUT_BUFFER_SIZE = 30000; constexpr uint32_t FRAME_DURATION_US = 33000; @@ -81,8 +79,8 @@ void VDecDemo::RunCase() CheckCodecType(); CreateVdec(); Format format; - format.PutIntValue("width", DEFAULT_WIDTH); - format.PutIntValue("height", DEFAULT_HEIGHT); + format.PutIntValue("width", width_); + format.PutIntValue("height", height_); if (isW) { format.PutIntValue("pixel_format", VIDEO_DATA_FORMAT_NV12); } else { From 05e4a594c29c929ffb8b00160284eaa41c828412 Mon Sep 17 00:00:00 2001 From: qinlong0101 Date: Mon, 6 Jun 2022 19:17:03 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9codex=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qinlong0101 --- services/screendemo/decoder_demo.cpp | 5 +++-- services/screendemo/decoder_demo.h | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/services/screendemo/decoder_demo.cpp b/services/screendemo/decoder_demo.cpp index 1264577..2d8cf60 100644 --- a/services/screendemo/decoder_demo.cpp +++ b/services/screendemo/decoder_demo.cpp @@ -65,7 +65,6 @@ namespace { constexpr uint32_t DEFAULT_FRAME_RATE = 30; constexpr uint32_t MAX_INPUT_BUFFER_SIZE = 30000; constexpr uint32_t FRAME_DURATION_US = 33000; - constexpr uint32_t DEFAULT_FRAME_COUNT = 1; constexpr uint32_t VIDEO_DATA_FORMAT_NV12 = 2; constexpr uint32_t VIDEO_DATA_FORMAT_RGBA = 5; constexpr uint32_t SLEEP_THREE_SECOND = 3; @@ -215,8 +214,10 @@ const int32_t* VDecDemo::GetFrameLen() const int32_t* frameLen = nullptr; if (isW) { frameLen = ES_W; + defaultFrameCount_ = sizeof(ES_W)/sizeof(ES_W[0]); } else { frameLen = ES_R; + defaultFrameCount_ = sizeof(ES_R)/sizeof(ES_R[0]); } return frameLen; } @@ -271,7 +272,7 @@ void VDecDemo::InputFunc() signal_->inQueue_.pop(); frameCount_++; - if (frameCount_ == DEFAULT_FRAME_COUNT) { + if (frameCount_ == defaultFrameCount_) { cout << "Finish decode, exit" << endl; break; } diff --git a/services/screendemo/decoder_demo.h b/services/screendemo/decoder_demo.h index a9ca47c..d78faac 100644 --- a/services/screendemo/decoder_demo.h +++ b/services/screendemo/decoder_demo.h @@ -88,6 +88,7 @@ private: bool isW = true; int64_t timeStamp_ = 0; uint32_t frameCount_ = 0; + uint32_t defaultFrameCount_ = 0 }; } // namespace Media } // namespace OHOS From cb6846432f8d10b3569e963beff4072906fcacb3 Mon Sep 17 00:00:00 2001 From: qinlong0101 Date: Tue, 7 Jun 2022 11:54:36 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9codex=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qinlong0101 --- services/screendemo/test.cpp | 4 ++-- .../sourceservice/dscreenmgr/src/screen_manager_adapter.cpp | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/services/screendemo/test.cpp b/services/screendemo/test.cpp index 232b64f..5d07cce 100644 --- a/services/screendemo/test.cpp +++ b/services/screendemo/test.cpp @@ -66,7 +66,7 @@ vector> QueryRemoteScreenInfo() } cout << endl; cout << "--------screen id " << screen->GetId() << "---------" << endl; - cout << "screen name: " << screen->GetName() << endl; + cout << "screen name: " << GetAnonyString(screen->GetName()).c_str() << endl; cout << "width: " << screen->GetWidth() << endl; cout << "height: " << screen->GetHeight() << endl; cout << "-------------------------------------------" << endl; @@ -221,7 +221,7 @@ static void PrintNodeProperty(NodeBasicInfo *nodeInfo) } printf("DeviceName = %s\n", nodeInfo->deviceName); - printf("NetworkId = %s\n", nodeInfo->networkId); + printf("NetworkId = %s\n", GetAnonyString(nodeInfo->networkId).c_str()); NodeDeviceInfoKey key = NODE_KEY_UDID; unsigned char udid[UDID_BUF_LEN] = {0}; if (GetNodeKeyInfo(g_pkgName, nodeInfo->networkId, key, udid, UDID_BUF_LEN) != 0) { diff --git a/services/screenservice/sourceservice/dscreenmgr/src/screen_manager_adapter.cpp b/services/screenservice/sourceservice/dscreenmgr/src/screen_manager_adapter.cpp index b3f4c0a..6f23faa 100644 --- a/services/screenservice/sourceservice/dscreenmgr/src/screen_manager_adapter.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/src/screen_manager_adapter.cpp @@ -25,6 +25,7 @@ #include "dscreen_constants.h" #include "dscreen_errcode.h" #include "dscreen_log.h" +#include "dscreen_util.h" namespace OHOS { namespace DistributedHardware { @@ -40,7 +41,7 @@ uint64_t ScreenMgrAdapter::CreateVirtualScreen(const std::string &devId, const s { DHLOGI("CreateVirtualScreen, width: %u, height: %u", videoParam->GetScreenWidth(), videoParam->GetScreenHeight()); - std::string screenName = DSCREEN_PREFIX + SEPERATOR + devId + SEPERATOR + dhId; + std::string screenName = DSCREEN_PREFIX + SEPERATOR + GetAnonyString(devId) + SEPERATOR + GetAnonyString(dhId); auto iter = screenIdMap_.find(screenName); if (iter != screenIdMap_.end()) { DHLOGI("remove an exist virtual screen."); From 1abf91c85f88fd0902fc70fa032feef9cbe2297c Mon Sep 17 00:00:00 2001 From: qinlong0101 Date: Tue, 7 Jun 2022 14:05:01 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9codex=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qinlong0101 --- services/screendemo/decoder_demo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/screendemo/decoder_demo.h b/services/screendemo/decoder_demo.h index d78faac..01f83f5 100644 --- a/services/screendemo/decoder_demo.h +++ b/services/screendemo/decoder_demo.h @@ -88,7 +88,7 @@ private: bool isW = true; int64_t timeStamp_ = 0; uint32_t frameCount_ = 0; - uint32_t defaultFrameCount_ = 0 + uint32_t defaultFrameCount_ = 0; }; } // namespace Media } // namespace OHOS From ebb8fcc0caa515a330a7f2b3e5661f3e5cba0b54 Mon Sep 17 00:00:00 2001 From: qinlong0101 Date: Tue, 7 Jun 2022 20:54:14 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=B8=85=E7=90=86codex=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qinlong0101 --- .../sourceservice/dscreenmgr/src/screen_manager_adapter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/screenservice/sourceservice/dscreenmgr/src/screen_manager_adapter.cpp b/services/screenservice/sourceservice/dscreenmgr/src/screen_manager_adapter.cpp index 6f23faa..b71d737 100644 --- a/services/screenservice/sourceservice/dscreenmgr/src/screen_manager_adapter.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/src/screen_manager_adapter.cpp @@ -41,7 +41,7 @@ uint64_t ScreenMgrAdapter::CreateVirtualScreen(const std::string &devId, const s { DHLOGI("CreateVirtualScreen, width: %u, height: %u", videoParam->GetScreenWidth(), videoParam->GetScreenHeight()); - std::string screenName = DSCREEN_PREFIX + SEPERATOR + GetAnonyString(devId) + SEPERATOR + GetAnonyString(dhId); + std::string screenName = DSCREEN_PREFIX + SEPERATOR + devId.substr(0, 8) + SEPERATOR + dhId.substr(0, 8); auto iter = screenIdMap_.find(screenName); if (iter != screenIdMap_.end()) { DHLOGI("remove an exist virtual screen."); From 9ab2b2ff9f18cc4cf984efb93448d4d1e070efea Mon Sep 17 00:00:00 2001 From: qinlong0101 Date: Wed, 8 Jun 2022 14:42:18 +0800 Subject: [PATCH 7/9] =?UTF-8?q?codex=E5=91=8A=E8=AD=A6=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qinlong0101 --- .../sourceservice/dscreenmgr/src/screen_manager_adapter.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/screenservice/sourceservice/dscreenmgr/src/screen_manager_adapter.cpp b/services/screenservice/sourceservice/dscreenmgr/src/screen_manager_adapter.cpp index b71d737..17429d6 100644 --- a/services/screenservice/sourceservice/dscreenmgr/src/screen_manager_adapter.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/src/screen_manager_adapter.cpp @@ -41,7 +41,10 @@ uint64_t ScreenMgrAdapter::CreateVirtualScreen(const std::string &devId, const s { DHLOGI("CreateVirtualScreen, width: %u, height: %u", videoParam->GetScreenWidth(), videoParam->GetScreenHeight()); - std::string screenName = DSCREEN_PREFIX + SEPERATOR + devId.substr(0, 8) + SEPERATOR + dhId.substr(0, 8); + int32_t devIdsize = devId.size() / 2; + int32_t dhIdsize = dhId.size() / 2; + std::string screenName = DSCREEN_PREFIX + SEPERATOR + devId.substr(0, devIdsize) + + SEPERATOR + dhId.substr(0, dhIdsize); auto iter = screenIdMap_.find(screenName); if (iter != screenIdMap_.end()) { DHLOGI("remove an exist virtual screen."); From 58bd9232f68e9031a0a3f07230d2ad7b11b7c76e Mon Sep 17 00:00:00 2001 From: qinlong0101 Date: Wed, 8 Jun 2022 15:34:10 +0800 Subject: [PATCH 8/9] =?UTF-8?q?codex=E5=91=8A=E8=AD=A6=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qinlong0101 --- common/src/dscreen_util.cpp | 14 ++++++++++++++ .../dscreenmgr/src/screen_manager_adapter.cpp | 6 ++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/common/src/dscreen_util.cpp b/common/src/dscreen_util.cpp index 974e92b..129902f 100644 --- a/common/src/dscreen_util.cpp +++ b/common/src/dscreen_util.cpp @@ -94,5 +94,19 @@ std::string GetAnonyString(const std::string &value) return res; } + +std::string GetInterruptString(const std::string &value) +{ + constexpr size_t INT32_MIN_ID_LENGTH = 3; + std::string res; + size_t strlen = value.length(); + if(strlen <= INT32_MIN_ID_LENGTH) { + res = value; + } else { + res = value.substr(0, strlen / 2); + } + + return res; +} } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/services/screenservice/sourceservice/dscreenmgr/src/screen_manager_adapter.cpp b/services/screenservice/sourceservice/dscreenmgr/src/screen_manager_adapter.cpp index 17429d6..e61d3be 100644 --- a/services/screenservice/sourceservice/dscreenmgr/src/screen_manager_adapter.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/src/screen_manager_adapter.cpp @@ -41,10 +41,8 @@ uint64_t ScreenMgrAdapter::CreateVirtualScreen(const std::string &devId, const s { DHLOGI("CreateVirtualScreen, width: %u, height: %u", videoParam->GetScreenWidth(), videoParam->GetScreenHeight()); - int32_t devIdsize = devId.size() / 2; - int32_t dhIdsize = dhId.size() / 2; - std::string screenName = DSCREEN_PREFIX + SEPERATOR + devId.substr(0, devIdsize) + - SEPERATOR + dhId.substr(0, dhIdsize); + std::string screenName = DSCREEN_PREFIX + SEPERATOR + GetInterruptString(devId) + + SEPERATOR + GetInterruptString(dhId); auto iter = screenIdMap_.find(screenName); if (iter != screenIdMap_.end()) { DHLOGI("remove an exist virtual screen."); From 619ff2bb8a3e1d5ef3c3009dc7e9d0dabc8fda79 Mon Sep 17 00:00:00 2001 From: qinlong0101 Date: Wed, 8 Jun 2022 15:43:18 +0800 Subject: [PATCH 9/9] =?UTF-8?q?codex=E5=91=8A=E8=AD=A6=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: qinlong0101 --- common/include/dscreen_util.h | 1 + common/src/dscreen_util.cpp | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/common/include/dscreen_util.h b/common/include/dscreen_util.h index 8b113e5..aea2439 100644 --- a/common/include/dscreen_util.h +++ b/common/include/dscreen_util.h @@ -23,6 +23,7 @@ namespace DistributedHardware { int32_t GetLocalDeviceNetworkId(std::string &networkId); std::string GetRandomID(); std::string GetAnonyString(const std::string &value); +std::string GetInterruptString(const std::string &value); } // namespace DistributedHardware } // namespace OHOS #endif \ No newline at end of file diff --git a/common/src/dscreen_util.cpp b/common/src/dscreen_util.cpp index 129902f..bd38019 100644 --- a/common/src/dscreen_util.cpp +++ b/common/src/dscreen_util.cpp @@ -98,12 +98,13 @@ std::string GetAnonyString(const std::string &value) std::string GetInterruptString(const std::string &value) { constexpr size_t INT32_MIN_ID_LENGTH = 3; + constexpr size_t STRING_HALF_LENGTH = 2; std::string res; size_t strlen = value.length(); - if(strlen <= INT32_MIN_ID_LENGTH) { + if (strlen <= INT32_MIN_ID_LENGTH) { res = value; } else { - res = value.substr(0, strlen / 2); + res = value.substr(0, strlen / STRING_HALF_LENGTH); } return res;