From af25224f4d9f201d1f0661d6b8aa6a01e513aa9e Mon Sep 17 00:00:00 2001 From: "yaoruozi1@huawei.com" Date: Thu, 4 Jan 2024 23:18:10 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yaoruozi1@huawei.com --- .../distributed_camera_sink_stub_test.cpp | 11 +- .../distributed_camera_source_stub_test.cpp | 11 +- .../channel/include/dcamera_softbus_adapter.h | 11 +- .../channel/include/dcamera_softbus_session.h | 4 +- .../src/dcamera_channel_source_impl.cpp | 7 +- .../channel/src/dcamera_softbus_adapter.cpp | 73 ++++++++---- .../channel/src/dcamera_softbus_session.cpp | 30 ++--- .../channel/dcamera_softbus_adapter_test.cpp | 105 +++++++++++++++--- .../channel/dcamera_softbus_session_test.cpp | 2 +- 9 files changed, 178 insertions(+), 76 deletions(-) diff --git a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_stub_test.cpp b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_stub_test.cpp index 550e4f5e..7a32020d 100644 --- a/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_stub_test.cpp +++ b/services/cameraservice/sinkservice/test/unittest/common/distributedcamera/distributed_camera_sink_stub_test.cpp @@ -29,6 +29,11 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { +namespace { +static int32_t OHOS_PERMISSION_ENABLE_DISTRIBUTED_HARDWARE_INDEX = 0; +static int32_t OHOS_PERMISSION_DISTRIBUTED_DATASYNC_INDEX = 1; +static int32_t OHOS_PERMISSION_ACCESS_DISTRIBUTED_HARDWARE_INDEX = 2; +} class DcameraSinkStubTest : public testing::Test { public: static void SetUpTestCase(void); @@ -53,9 +58,9 @@ void DcameraSinkStubTest::SetUp(void) uint64_t tokenId; int32_t numberOfPermissions = 3; const char *perms[numberOfPermissions]; - perms[0] = "ohos.permission.ENABLE_DISTRIBUTED_HARDWARE"; - perms[1] = OHOS_PERMISSION_DISTRIBUTED_DATASYNC; - perms[2] = "ohos.permission.ACCESS_DISTRIBUTED_HARDWARE"; + perms[OHOS_PERMISSION_ENABLE_DISTRIBUTED_HARDWARE_INDEX] = "ohos.permission.ENABLE_DISTRIBUTED_HARDWARE"; + perms[OHOS_PERMISSION_DISTRIBUTED_DATASYNC_INDEX] = OHOS_PERMISSION_DISTRIBUTED_DATASYNC; + perms[OHOS_PERMISSION_ACCESS_DISTRIBUTED_HARDWARE_INDEX] = "ohos.permission.ACCESS_DISTRIBUTED_HARDWARE"; NativeTokenInfoParams infoInstance = { .dcapsNum = 0, .permsNum = numberOfPermissions, diff --git a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/distributed_camera_source_stub_test.cpp b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/distributed_camera_source_stub_test.cpp index 9a257e6c..121f60bb 100644 --- a/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/distributed_camera_source_stub_test.cpp +++ b/services/cameraservice/sourceservice/test/unittest/common/distributedcamera/distributed_camera_source_stub_test.cpp @@ -31,6 +31,11 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { +namespace { +static int32_t OHOS_PERMISSION_ENABLE_DISTRIBUTED_HARDWARE_INDEX = 0; +static int32_t OHOS_PERMISSION_DISTRIBUTED_DATASYNC_INDEX = 1; +static int32_t OHOS_PERMISSION_ACCESS_DISTRIBUTED_HARDWARE_INDEX = 2; +} class DcameraSourceStubTest : public testing::Test { public: static void SetUpTestCase(void); @@ -55,9 +60,9 @@ void DcameraSourceStubTest::SetUp(void) uint64_t tokenId; int32_t numberOfPermissions = 3; const char *perms[numberOfPermissions]; - perms[0] = "ohos.permission.ENABLE_DISTRIBUTED_HARDWARE"; - perms[1] = OHOS_PERMISSION_DISTRIBUTED_DATASYNC; - perms[2] = "ohos.permission.ACCESS_DISTRIBUTED_HARDWARE"; + perms[OHOS_PERMISSION_ENABLE_DISTRIBUTED_HARDWARE_INDEX] = "ohos.permission.ENABLE_DISTRIBUTED_HARDWARE"; + perms[OHOS_PERMISSION_DISTRIBUTED_DATASYNC_INDEX] = OHOS_PERMISSION_DISTRIBUTED_DATASYNC; + perms[OHOS_PERMISSION_ACCESS_DISTRIBUTED_HARDWARE_INDEX] = "ohos.permission.ACCESS_DISTRIBUTED_HARDWARE"; NativeTokenInfoParams infoInstance = { .dcapsNum = 0, .permsNum = numberOfPermissions, diff --git a/services/channel/include/dcamera_softbus_adapter.h b/services/channel/include/dcamera_softbus_adapter.h index fced6d78..438cb88b 100644 --- a/services/channel/include/dcamera_softbus_adapter.h +++ b/services/channel/include/dcamera_softbus_adapter.h @@ -64,14 +64,13 @@ public: const StreamFrameInfo *param); int32_t HandleSourceStreamExt(std::shared_ptr& buffer, const StreamData *ext); - int32_t GetSinkSocketId(); int32_t GetSourceSocketId(); + std::map> GetSourceSocketSessionMap(); + void SetSourceSocketSessionMap(std::map> &map); public: std::map> sourceSessions_; std::map> sinkSessions_; - std::map> sinkSocketIdSessionMap_; - std::map> sourceSocketIdSessionMap_; private: DCameraSoftbusAdapter(); @@ -94,13 +93,17 @@ private: std::mutex idMapLock_; std::map> sessionIdMap_; - int32_t sinkSocketId_; int32_t sourceSocketId_; std::map sessionModeAndDataTypeMap_; std::mutex mySessionNamePeerDevIdLock_; std::map peerDevIdMySessionNameMap_; std::mutex mySessionNameLock_; std::set mySessionNameSet_; + + std::mutex sinkSocketLock_; + std::map> sinkSocketSessionMap_; + std::mutex sourceSocketLock_; + std::map> sourceSocketSessionMap_; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/channel/include/dcamera_softbus_session.h b/services/channel/include/dcamera_softbus_session.h index 3759c197..3b811226 100644 --- a/services/channel/include/dcamera_softbus_session.h +++ b/services/channel/include/dcamera_softbus_session.h @@ -37,14 +37,14 @@ public: std::string peerSessionName, std::shared_ptr listener, DCameraSessionMode mode); ~DCameraSoftbusSession(); int32_t CloseSession(); - int32_t OnSessionOpened(int32_t socket, PeerSocketInfo info); - int32_t RefreshSessionStatus(int32_t socket); + int32_t OnSessionOpened(int32_t socket); int32_t OnSessionClose(int32_t sessionId); int32_t OnDataReceived(std::shared_ptr& buffer); int32_t SendData(DCameraSessionMode mode, std::shared_ptr& buffer); std::string GetPeerDevId(); std::string GetPeerSessionName(); std::string GetMySessionName(); + int32_t GetSessionId(); private: struct SessionDataHeader { diff --git a/services/channel/src/dcamera_channel_source_impl.cpp b/services/channel/src/dcamera_channel_source_impl.cpp index 8e8bbbb2..5c2dd962 100644 --- a/services/channel/src/dcamera_channel_source_impl.cpp +++ b/services/channel/src/dcamera_channel_source_impl.cpp @@ -83,8 +83,11 @@ int32_t DCameraChannelSourceImpl::CreateSession(std::vector& camIn int32_t sourceSocket = DCameraSoftbusAdapter::GetInstance().GetSourceSocketId(); std::shared_ptr softbusSess = std::make_shared(myDevId, mySessionName_, peerDevId, peerSessionName, listener, sessionMode); - DCameraSoftbusAdapter::GetInstance().sourceSocketIdSessionMap_[sourceSocket] = softbusSess; - softbusSess->RefreshSessionStatus(sourceSocket); + softbusSess->OnSessionOpened(sourceSocket); + std::map> socketSessionMap = + DCameraSoftbusAdapter::GetInstance().GetSourceSocketSessionMap(); + socketSessionMap[sourceSocket] = softbusSess; + DCameraSoftbusAdapter::GetInstance().SetSourceSocketSessionMap(socketSessionMap); softbusSessions_.push_back(softbusSess); DCameraSoftbusAdapter::GetInstance().sourceSessions_[peerDevId + peerSessionName] = softbusSess; } diff --git a/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index ecc43630..256a2fb8 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -105,7 +105,7 @@ DCameraSoftbusAdapter::DCameraSoftbusAdapter() { sessionModeAndDataTypeMap_[DCAMERA_SESSION_MODE_CTRL] = TransDataType::DATA_TYPE_BYTES; sessionModeAndDataTypeMap_[DCAMERA_SESSION_MODE_VIDEO] = TransDataType::DATA_TYPE_VIDEO_STREAM; - sessionModeAndDataTypeMap_[DCAMERA_SESSION_MODE_JPEG] = TransDataType::DATA_TYPE_RAW_STREAM; + sessionModeAndDataTypeMap_[DCAMERA_SESSION_MODE_JPEG] = TransDataType::DATA_TYPE_BYTES; ISocketListener sourceListener; sourceListener.OnBind = DCameraSourceOnBind; @@ -160,8 +160,8 @@ int32_t DCameraSoftbusAdapter::CreatSoftBusSinkSocketServer(std::string mySessio return DCAMERA_BAD_VALUE; } { - std::string peerDevIdMySessionName = peerDevId + std::string("_") + mySessionName; std::lock_guard autoLock(mySessionNamePeerDevIdLock_); + std::string peerDevIdMySessionName = peerDevId + std::string("_") + mySessionName; peerDevIdMySessionNameMap_[peerDevIdMySessionName] = mySessionName; } DHLOGI("CreatSoftBusSinkSocketServer End, mySessionName: %s, peerSessionName: %s", @@ -225,8 +225,14 @@ int32_t DCameraSoftbusAdapter::CloseSoftbusSession(int32_t socket) std::lock_guard autoLock(idMapLock_); sessionIdMap_.erase(socket); } - sinkSocketIdSessionMap_.erase(socket); - sourceSocketIdSessionMap_.erase(socket); + { + std::lock_guard autoLock(sinkSocketLock_); + sinkSocketSessionMap_.erase(socket); + } + { + std::lock_guard autoLock(sourceSocketLock_); + sourceSocketSessionMap_.erase(socket); + } DHLOGI("Shutdown softbus socket: %d end", socket); return DCAMERA_OK; } @@ -295,8 +301,9 @@ int32_t DCameraSoftbusAdapter::DCameraSoftbusGetSessionById(int32_t sessionId, int32_t DCameraSoftbusAdapter::DCameraSoftbusSourceGetSession(int32_t socket, std::shared_ptr& session) { - auto iter = sourceSocketIdSessionMap_.find(socket); - if (iter == sourceSocketIdSessionMap_.end()) { + std::lock_guard autoLock(sourceSocketLock_); + auto iter = sourceSocketSessionMap_.find(socket); + if (iter == sourceSocketSessionMap_.end()) { DHLOGE("DCameraSoftbusAdapter DCameraSoftbusSourceGetSession can not find socket %d", socket); return DCAMERA_NOT_FOUND; } @@ -315,7 +322,7 @@ int32_t DCameraSoftbusAdapter::SourceOnBind(int32_t socket, PeerSocketInfo info) return DCAMERA_NOT_FOUND; } - ret = session->OnSessionOpened(socket, info); + ret = session->OnSessionOpened(socket); if (ret != DCAMERA_OK) { DHLOGE("DCameraSoftbusAdapter SourceOnBind failed %d socket: %d", ret, socket); } else { @@ -447,26 +454,34 @@ int32_t DCameraSoftbusAdapter::HandleSourceStreamExt(std::shared_ptr return DCAMERA_OK; } -int32_t DCameraSoftbusAdapter::GetSinkSocketId() +int32_t DCameraSoftbusAdapter::GetSourceSocketId() { - return sinkSocketId_; + return sourceSocketId_; } -int32_t DCameraSoftbusAdapter::GetSourceSocketId() +std::map> DCameraSoftbusAdapter::GetSourceSocketSessionMap() { - return sourceSocketId_; + return sourceSocketSessionMap_; +} + +void DCameraSoftbusAdapter::SetSourceSocketSessionMap(std::map> &map) +{ + sourceSocketSessionMap_ = map; } int32_t DCameraSoftbusAdapter::DCameraSoftbusSinkGetSession(int32_t socket, std::shared_ptr& session) { DHLOGI("DCameraSoftbusAdapter DCameraSoftbusSinkGetSession Start, socket: %d", socket); - auto iter = sinkSocketIdSessionMap_.find(socket); - if (iter == sinkSocketIdSessionMap_.end()) { - DHLOGE("DCameraSoftbusAdapter DCameraSoftbusSinkGetSession can not find socket %d", socket); - return DCAMERA_NOT_FOUND; + { + std::lock_guard autoLock(sinkSocketLock_); + auto iter = sinkSocketSessionMap_.find(socket); + if (iter == sinkSocketSessionMap_.end()) { + DHLOGE("DCameraSoftbusAdapter DCameraSoftbusSinkGetSession can not find socket %d", socket); + return DCAMERA_NOT_FOUND; + } + session = iter->second; } - session = iter->second; DHLOGI("DCameraSoftbusAdapter DCameraSoftbusSinkGetSession End, socket: %d", socket); return DCAMERA_OK; } @@ -476,20 +491,30 @@ int32_t DCameraSoftbusAdapter::DCameraSoftBusGetSessionByPeerSocket(int32_t sock { DHLOGI("DCameraSoftbusAdapter DCameraSoftBusGetSessionByPeerSocket Start, socket %d", socket); std::string mySessionName = ""; - auto sessionNameIter = peerDevIdMySessionNameMap_.find(info.name); - if (sessionNameIter == peerDevIdMySessionNameMap_.end()) { - DHLOGI("DCameraSoftbusAdapter DCameraSoftBusGetSessionByPeerSocket error, socket %d", socket); - return DCAMERA_NOT_FOUND; + { + std::lock_guard autoLock(mySessionNamePeerDevIdLock_); + auto sessionNameIter = peerDevIdMySessionNameMap_.find(info.name); + if (sessionNameIter == peerDevIdMySessionNameMap_.end()) { + DHLOGE("DCameraSoftbusAdapter DCameraSoftBusGetSessionByPeerSocket error, socket %d", socket); + return DCAMERA_NOT_FOUND; + mySessionName = sessionNameIter->second; + } } - mySessionName = sessionNameIter->second; auto iter = sinkSessions_.find(std::string(mySessionName)); if (iter == sinkSessions_.end()) { - DHLOGI("DCameraSoftbusAdapter DCameraSoftBusGetSessionByPeerSocket error, mySessionName %s", + DHLOGE("DCameraSoftbusAdapter DCameraSoftBusGetSessionByPeerSocket error, mySessionName %s", GetAnonyString(mySessionName).c_str()); return DCAMERA_NOT_FOUND; } session = iter->second; - sinkSocketIdSessionMap_[socket] = session; + if (session -> GetSessionId() < 0) { + DHLOGE("DCameraSoftBusGetSessionByPeerSocket error, current sessionId is invalid"); + return DCAMERA_BAD_VALUE; + } + { + std::lock_guard autoLock(sinkSocketLock_); + sinkSocketIdSessionMap_[socket] = session; + } DHLOGI("DCameraSoftbusAdapter DCameraSoftBusGetSessionByPeerSocket End, socket %d", socket); return DCAMERA_OK; } @@ -505,7 +530,7 @@ int32_t DCameraSoftbusAdapter::SinkOnBind(int32_t socket, PeerSocketInfo info) return DCAMERA_NOT_FOUND; } - ret = session->OnSessionOpened(socket, info); + ret = session->OnSessionOpened(socket); if (ret != DCAMERA_OK) { DHLOGE("DCameraSoftbusAdapter SinkOnBind not find socket %d", socket); } else { diff --git a/services/channel/src/dcamera_softbus_session.cpp b/services/channel/src/dcamera_softbus_session.cpp index 6bad3129..fa65a039 100644 --- a/services/channel/src/dcamera_softbus_session.cpp +++ b/services/channel/src/dcamera_softbus_session.cpp @@ -41,7 +41,7 @@ DCameraSoftbusSession::DCameraSoftbusSession(std::string myDevId, std::string my { sendFuncMap_[DCAMERA_SESSION_MODE_CTRL] = &DCameraSoftbusSession::SendBytes; sendFuncMap_[DCAMERA_SESSION_MODE_VIDEO] = &DCameraSoftbusSession::SendStream; - sendFuncMap_[DCAMERA_SESSION_MODE_JPEG] = &DCameraSoftbusSession::SendStream; + sendFuncMap_[DCAMERA_SESSION_MODE_JPEG] = &DCameraSoftbusSession::SendBytes; auto runner = AppExecFwk::EventRunner::Create(mySessionName); eventHandler_ = std::make_shared(runner); ResetAssembleFrag(); @@ -81,18 +81,9 @@ int32_t DCameraSoftbusSession::CloseSession() return DCAMERA_OK; } -int32_t DCameraSoftbusSession::OnSessionOpened(int32_t socket, PeerSocketInfo info) +int32_t DCameraSoftbusSession::OnSessionOpened(int32_t socket) { - DHLOGI("DCameraSoftbusSession OnSessionOpened Start, socket is: %d", socket); - if (info.networkId == nullptr) { - DHLOGE("DCameraSoftbusSession OnSessionOpened error, PeerDevId is null", socket); - listener_->OnSessionState(DCAMERA_CHANNEL_STATE_DISCONNECTED); - listener_->OnSessionError(DCAMERA_MESSAGE, DCAMERA_EVENT_OPEN_CHANNEL_ERROR, - std::string("softbus internal error")); - return DCAMERA_WRONG_STATE; - } - DHLOGI("peerDevId: %s peerSessionName: %s", GetAnonyString(info.networkId).c_str(), - GetAnonyString(info.name).c_str()); + DHLOGI("DCameraSoftbusSession OnSessionOpened Start, socket: %d", socket); sessionId_ = socket; state_ = DCAMERA_SOFTBUS_STATE_OPENED; listener_->OnSessionState(DCAMERA_CHANNEL_STATE_CONNECTED); @@ -100,16 +91,6 @@ int32_t DCameraSoftbusSession::OnSessionOpened(int32_t socket, PeerSocketInfo in return DCAMERA_OK; } -int32_t DCameraSoftbusSession::RefreshSessionStatus(int32_t socket) -{ - DHLOGI("DCameraSoftbusSession RefreshSessionStatus Start, socket: %d", socket); - sessionId_ = socket; - state_ = DCAMERA_SOFTBUS_STATE_OPENED; - listener_->OnSessionState(DCAMERA_CHANNEL_STATE_CONNECTED); - DHLOGI("DCameraSoftbusSession RefreshSessionStatus End, socket: %d", socket); - return DCAMERA_OK; -} - int32_t DCameraSoftbusSession::OnSessionClose(int32_t sessionId) { DHLOGI("DCameraSoftbusSession OnSessionClose sessionId: %d peerDevId: %s peerSessionName: %s", sessionId, @@ -453,5 +434,10 @@ std::string DCameraSoftbusSession::GetMySessionName() { return mySessionName_; } + +int32_t DCameraSoftbusSession::GetSessionId() +{ + return sessionId_; +} } // namespace DistributedHardware } // namespace OHOS diff --git a/services/channel/test/unittest/common/channel/dcamera_softbus_adapter_test.cpp b/services/channel/test/unittest/common/channel/dcamera_softbus_adapter_test.cpp index d3bdb377..291e7f1c 100644 --- a/services/channel/test/unittest/common/channel/dcamera_softbus_adapter_test.cpp +++ b/services/channel/test/unittest/common/channel/dcamera_softbus_adapter_test.cpp @@ -224,7 +224,12 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_008, TestSize.L int32_t ret = DCameraSoftbusAdapter::GetInstance().CreateSoftBusSourceSocketClient(myDevId, peerSessName, peerDevId, sessionMode, role); int32_t sessionId = 2; - PeerSocketInfo info = {}; + PeerSocketInfo info = { + .name = const_cast(peerSessName.c_str()), + .pkgName = const_cast(PKG_NAME.c_str()), + .networkId = const_cast(peerDevId.c_str()), + .dataType = TransDataType::DATA_TYPE_VIDEO_STREAM, + }; std::shared_ptr session = std::make_shared(); DCameraSoftbusAdapter::GetInstance().sourceSessions_.emplace(peerDevId + mySessName, session); ret = DCameraSoftbusAdapter::GetInstance().SourceOnBind(sessionId, info); @@ -250,7 +255,12 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_009, TestSize.L int32_t ret = DCameraSoftbusAdapter::GetInstance().CreateSoftBusSourceSocketClient(myDevId, peerSessName, peerDevId, sessionMode, role); int32_t sessionId = 2; - PeerSocketInfo info = {}; + PeerSocketInfo info = { + .name = const_cast(peerSessName.c_str()), + .pkgName = const_cast(PKG_NAME.c_str()), + .networkId = const_cast(peerDevId.c_str()), + .dataType = TransDataType::DATA_TYPE_VIDEO_STREAM, + }; DCameraSoftbusAdapter::GetInstance().SourceOnBind(sessionId, info); DCameraSoftbusAdapter::GetInstance().SourceOnShutDown(sessionId, ShutdownReason::SHUTDOWN_REASON_LOCAL); @@ -276,7 +286,12 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_010, TestSize.L int32_t ret = DCameraSoftbusAdapter::GetInstance().CreateSoftBusSourceSocketClient(myDevId, peerSessName, peerDevId, sessionMode, role); int32_t sessionId = 2; - PeerSocketInfo info = {}; + PeerSocketInfo info = { + .name = const_cast(peerSessName.c_str()), + .pkgName = const_cast(PKG_NAME.c_str()), + .networkId = const_cast(peerDevId.c_str()), + .dataType = TransDataType::DATA_TYPE_VIDEO_STREAM, + }; ret = DCameraSoftbusAdapter::GetInstance().SourceOnBind(sessionId, info); const void *data = "testdata"; uint32_t dataLen = 8; @@ -304,7 +319,12 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_011, TestSize.L int32_t ret = DCameraSoftbusAdapter::GetInstance().CreateSoftBusSourceSocketClient(myDevId, peerSessName, peerDevId, sessionMode, role); int32_t sessionId = 2; - PeerSocketInfo info = {}; + PeerSocketInfo info = { + .name = const_cast(peerSessName.c_str()), + .pkgName = const_cast(PKG_NAME.c_str()), + .networkId = const_cast(peerDevId.c_str()), + .dataType = TransDataType::DATA_TYPE_VIDEO_STREAM, + }; ret = DCameraSoftbusAdapter::GetInstance().SourceOnBind(sessionId, info); const void *data = "testdata"; uint32_t dataLen = 8; @@ -332,7 +352,12 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_012, TestSize.L int32_t ret = DCameraSoftbusAdapter::GetInstance().CreateSoftBusSourceSocketClient(myDevId, peerSessName, peerDevId, sessionMode, role); int32_t sessionId = 2; - PeerSocketInfo info = {}; + PeerSocketInfo info = { + .name = const_cast(peerSessName.c_str()), + .pkgName = const_cast(PKG_NAME.c_str()), + .networkId = const_cast(peerDevId.c_str()), + .dataType = TransDataType::DATA_TYPE_VIDEO_STREAM, + }; ret = DCameraSoftbusAdapter::GetInstance().SourceOnBind(sessionId, info); std::string buff01 = "testbuffer01"; StreamData test01; @@ -377,7 +402,12 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_013, TestSize.L int32_t ret = DCameraSoftbusAdapter::GetInstance().CreateSoftBusSourceSocketClient(myDevId, peerSessName, peerDevId, sessionMode, role); int32_t sessionId = 2; - PeerSocketInfo info = {}; + PeerSocketInfo info = { + .name = const_cast(peerSessName.c_str()), + .pkgName = const_cast(PKG_NAME.c_str()), + .networkId = const_cast(peerDevId.c_str()), + .dataType = TransDataType::DATA_TYPE_VIDEO_STREAM, + }; std::shared_ptr session = std::make_shared(); DCameraSoftbusAdapter::GetInstance().sinkSessions_.emplace(peerDevId + mySessName, session); ret = DCameraSoftbusAdapter::GetInstance().SinkOnBind(sessionId, info); @@ -402,7 +432,12 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_014, TestSize.L int32_t ret = DCameraSoftbusAdapter::GetInstance().CreateSoftBusSourceSocketClient(myDevId, peerSessName, peerDevId, sessionMode, role); int32_t sessionId = 2; - PeerSocketInfo info = {}; + PeerSocketInfo info = { + .name = const_cast(peerSessName.c_str()), + .pkgName = const_cast(PKG_NAME.c_str()), + .networkId = const_cast(peerDevId.c_str()), + .dataType = TransDataType::DATA_TYPE_VIDEO_STREAM, + }; DCameraSoftbusAdapter::GetInstance().SinkOnBind(sessionId, info); DCameraSoftbusAdapter::GetInstance().SinkOnShutDown(sessionId, ShutdownReason::SHUTDOWN_REASON_LOCAL); @@ -428,7 +463,12 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_015, TestSize.L int32_t ret = DCameraSoftbusAdapter::GetInstance().CreateSoftBusSourceSocketClient(myDevId, peerSessName, peerDevId, sessionMode, role); int32_t sessionId = 2; - PeerSocketInfo info = {}; + PeerSocketInfo info = { + .name = const_cast(peerSessName.c_str()), + .pkgName = const_cast(PKG_NAME.c_str()), + .networkId = const_cast(peerDevId.c_str()), + .dataType = TransDataType::DATA_TYPE_BYTES, + }; ret = DCameraSoftbusAdapter::GetInstance().SinkOnBind(sessionId, info); const void *data = "testdata"; uint32_t dataLen = 8; @@ -456,7 +496,12 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_016, TestSize.L int32_t ret = DCameraSoftbusAdapter::GetInstance().CreateSoftBusSourceSocketClient(myDevId, peerSessName, peerDevId, sessionMode, role); int32_t sessionId = 2; - PeerSocketInfo info = {}; + PeerSocketInfo info = { + .name = const_cast(peerSessName.c_str()), + .pkgName = const_cast(PKG_NAME.c_str()), + .networkId = const_cast(peerDevId.c_str()), + .dataType = TransDataType::DATA_TYPE_BYTES, + }; ret = DCameraSoftbusAdapter::GetInstance().SinkOnBind(sessionId, info); const void *data = "testdata"; uint32_t dataLen = 8; @@ -484,7 +529,12 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_017, TestSize.L int32_t ret = DCameraSoftbusAdapter::GetInstance().CreateSoftBusSourceSocketClient(myDevId, peerSessName, peerDevId, sessionMode, role); int32_t sessionId = 2; - PeerSocketInfo info = {}; + PeerSocketInfo info = { + .name = const_cast(peerSessName.c_str()), + .pkgName = const_cast(PKG_NAME.c_str()), + .networkId = const_cast(peerDevId.c_str()), + .dataType = TransDataType::DATA_TYPE_BYTES, + }; ret = DCameraSoftbusAdapter::GetInstance().SinkOnBind(sessionId, info); std::string buff01 = "testbuffer01"; StreamData test01; @@ -523,7 +573,12 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_018, TestSize.L sessionMode, role); int32_t sessionId = 2; std::shared_ptr session = std::make_shared(); - PeerSocketInfo info = {}; + PeerSocketInfo info = { + .name = const_cast(peerSessName.c_str()), + .pkgName = const_cast(PKG_NAME.c_str()), + .networkId = const_cast(peerDevId.c_str()), + .dataType = TransDataType::DATA_TYPE_BYTES, + }; ret = DCameraSoftbusAdapter::GetInstance().SourceOnBind(sessionId, info); ret = DCameraSoftbusAdapter::GetInstance().DCameraSoftbusSourceGetSession(sessionId, session); @@ -549,7 +604,12 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_019, TestSize.L int32_t ret = DCameraSoftbusAdapter::GetInstance().CreateSoftBusSourceSocketClient(myDevId, peerSessName, peerDevId, sessionMode, role); int32_t sessionId = 2; - PeerSocketInfo info = {}; + PeerSocketInfo info = { + .name = const_cast(peerSessName.c_str()), + .pkgName = const_cast(PKG_NAME.c_str()), + .networkId = const_cast(peerDevId.c_str()), + .dataType = TransDataType::DATA_TYPE_BYTES, + }; std::shared_ptr session = std::make_shared(); ret = DCameraSoftbusAdapter::GetInstance().SinkOnBind(sessionId, info); ret = DCameraSoftbusAdapter::GetInstance().DCameraSoftbusSinkGetSession(sessionId, session); @@ -576,7 +636,12 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_020, TestSize.L int32_t ret = DCameraSoftbusAdapter::GetInstance().CreateSoftBusSourceSocketClient(myDevId, peerSessName, peerDevId, sessionMode, role); int32_t sessionId = 2; - PeerSocketInfo info = {}; + PeerSocketInfo info = { + .name = const_cast(peerSessName.c_str()), + .pkgName = const_cast(PKG_NAME.c_str()), + .networkId = const_cast(peerDevId.c_str()), + .dataType = TransDataType::DATA_TYPE_BYTES, + }; std::shared_ptr session = std::make_shared(); ret = DCameraSoftbusAdapter::GetInstance().SinkOnBind(sessionId, info); ret = DCameraSoftbusAdapter::GetInstance().DCameraSoftbusGetSessionById(sessionId, session); @@ -603,7 +668,12 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_023, TestSize.L int32_t ret = DCameraSoftbusAdapter::GetInstance().CreateSoftBusSourceSocketClient(myDevId, peerSessName, peerDevId, sessionMode, role); int32_t sessionId = -1; - PeerSocketInfo info = {}; + PeerSocketInfo info = { + .name = const_cast(peerSessName.c_str()), + .pkgName = const_cast(PKG_NAME.c_str()), + .networkId = const_cast(peerDevId.c_str()), + .dataType = TransDataType::DATA_TYPE_BYTES, + }; std::shared_ptr session = std::make_shared(); ret = DCameraSoftbusAdapter::GetInstance().SinkOnBind(sessionId, info); ret = DCameraSoftbusAdapter::GetInstance().DCameraSoftbusGetSessionById(sessionId, session); @@ -631,7 +701,12 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_027, TestSize.L sessionMode, role); int32_t sessionId = 27; std::shared_ptr session = std::make_shared(); - PeerSocketInfo info = {}; + PeerSocketInfo info = { + .name = const_cast(peerSessName.c_str()), + .pkgName = const_cast(PKG_NAME.c_str()), + .networkId = const_cast(peerDevId.c_str()), + .dataType = TransDataType::DATA_TYPE_BYTES, + }; ret = DCameraSoftbusAdapter::GetInstance().SourceOnBind(sessionId, info); ret = DCameraSoftbusAdapter::GetInstance().DCameraSoftbusSourceGetSession(sessionId, session); EXPECT_EQ(DCAMERA_MEMORY_OPT_ERROR, ret); diff --git a/services/channel/test/unittest/common/channel/dcamera_softbus_session_test.cpp b/services/channel/test/unittest/common/channel/dcamera_softbus_session_test.cpp index fffb2d5e..ca4b3fd1 100644 --- a/services/channel/test/unittest/common/channel/dcamera_softbus_session_test.cpp +++ b/services/channel/test/unittest/common/channel/dcamera_softbus_session_test.cpp @@ -118,7 +118,7 @@ HWTEST_F(DCameraSoftbusSessionTest, dcamera_softbus_session_test_002, TestSize.L .pkgName = const_cast(pkgName.c_str()), .networkId = const_cast(networkId.c_str()), }; - int32_t ret = softbusSession_->OnSessionOpened(sessionId, info); + int32_t ret = softbusSession_->OnSessionOpened(sessionId); EXPECT_EQ(DCAMERA_OK, ret); } -- Gitee From 4efa8c093336f341a0205d0c2500bf653e4b15d8 Mon Sep 17 00:00:00 2001 From: "yaoruozi1@huawei.com" Date: Fri, 5 Jan 2024 11:58:38 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yaoruozi1@huawei.com --- services/channel/src/dcamera_softbus_adapter.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index 256a2fb8..447b9744 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -481,6 +481,10 @@ int32_t DCameraSoftbusAdapter::DCameraSoftbusSinkGetSession(int32_t socket, return DCAMERA_NOT_FOUND; } session = iter->second; + if (session -> GetSessionId() < 0) { + DHLOGE("DCameraSoftBusGetSessionByPeerSocket error, current sessionId is invalid"); + return DCAMERA_BAD_VALUE; + } } DHLOGI("DCameraSoftbusAdapter DCameraSoftbusSinkGetSession End, socket: %d", socket); return DCAMERA_OK; @@ -507,10 +511,6 @@ int32_t DCameraSoftbusAdapter::DCameraSoftBusGetSessionByPeerSocket(int32_t sock return DCAMERA_NOT_FOUND; } session = iter->second; - if (session -> GetSessionId() < 0) { - DHLOGE("DCameraSoftBusGetSessionByPeerSocket error, current sessionId is invalid"); - return DCAMERA_BAD_VALUE; - } { std::lock_guard autoLock(sinkSocketLock_); sinkSocketIdSessionMap_[socket] = session; -- Gitee From 45c9a2a41d5e0ef0a31bc9a0dcce26cae36f47f4 Mon Sep 17 00:00:00 2001 From: "yaoruozi1@huawei.com" Date: Fri, 5 Jan 2024 14:32:08 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yaoruozi1@huawei.com --- services/channel/src/dcamera_softbus_adapter.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index 447b9744..479d79df 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -143,9 +143,9 @@ int32_t DCameraSoftbusAdapter::CreatSoftBusSinkSocketServer(std::string mySessio } SocketInfo serverSocketInfo = { .name = const_cast(mySessionName.c_str()), - .pkgName = const_cast(PKG_NAME.c_str()), - .peerNetworkId = const_cast(peerDevId.c_str()), .peerName = const_cast(peerSessionName.c_str()), + .peerNetworkId = const_cast(peerDevId.c_str()), + .pkgName = const_cast(PKG_NAME.c_str()), .dataType = sessionModeAndDataTypeMap_[sessionMode], }; int socketId = Socket(serverSocketInfo); @@ -177,9 +177,9 @@ int32_t DCameraSoftbusAdapter::CreateSoftBusSourceSocketClient(std::string myDev std::string myDevIdPeerSessionName = myDevId + std::string("_") + peerSessionName; SocketInfo clientSocketInfo = { .name = const_cast(myDevIdPeerSessionName.c_str()), - .pkgName = const_cast(PKG_NAME.c_str()), - .peerNetworkId = const_cast(peerDevId.c_str()), .peerName = const_cast(peerSessionName.c_str()), + .peerNetworkId = const_cast(peerDevId.c_str()), + .pkgName = const_cast(PKG_NAME.c_str()), .dataType = sessionModeAndDataTypeMap_[sessionMode], }; int socketId = Socket(clientSocketInfo); @@ -513,7 +513,7 @@ int32_t DCameraSoftbusAdapter::DCameraSoftBusGetSessionByPeerSocket(int32_t sock session = iter->second; { std::lock_guard autoLock(sinkSocketLock_); - sinkSocketIdSessionMap_[socket] = session; + sinkSocketSessionMap_[socket] = session; } DHLOGI("DCameraSoftbusAdapter DCameraSoftBusGetSessionByPeerSocket End, socket %d", socket); return DCAMERA_OK; -- Gitee From 3079e4fb4e23fab0d5b97223480ef20f9c6125f1 Mon Sep 17 00:00:00 2001 From: "yaoruozi1@huawei.com" Date: Fri, 5 Jan 2024 14:50:15 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yaoruozi1@huawei.com --- .../channel/dcamera_softbus_adapter_test.cpp | 30 +++++++++---------- .../channel/dcamera_softbus_session_test.cpp | 5 ---- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/services/channel/test/unittest/common/channel/dcamera_softbus_adapter_test.cpp b/services/channel/test/unittest/common/channel/dcamera_softbus_adapter_test.cpp index 291e7f1c..c3c6cc93 100644 --- a/services/channel/test/unittest/common/channel/dcamera_softbus_adapter_test.cpp +++ b/services/channel/test/unittest/common/channel/dcamera_softbus_adapter_test.cpp @@ -226,7 +226,7 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_008, TestSize.L int32_t sessionId = 2; PeerSocketInfo info = { .name = const_cast(peerSessName.c_str()), - .pkgName = const_cast(PKG_NAME.c_str()), + .pkgName = const_cast(DCAMERA_PKG_NAME.c_str()), .networkId = const_cast(peerDevId.c_str()), .dataType = TransDataType::DATA_TYPE_VIDEO_STREAM, }; @@ -257,7 +257,7 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_009, TestSize.L int32_t sessionId = 2; PeerSocketInfo info = { .name = const_cast(peerSessName.c_str()), - .pkgName = const_cast(PKG_NAME.c_str()), + .pkgName = const_cast(DCAMERA_PKG_NAME.c_str()), .networkId = const_cast(peerDevId.c_str()), .dataType = TransDataType::DATA_TYPE_VIDEO_STREAM, }; @@ -288,7 +288,7 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_010, TestSize.L int32_t sessionId = 2; PeerSocketInfo info = { .name = const_cast(peerSessName.c_str()), - .pkgName = const_cast(PKG_NAME.c_str()), + .pkgName = const_cast(DCAMERA_PKG_NAME.c_str()), .networkId = const_cast(peerDevId.c_str()), .dataType = TransDataType::DATA_TYPE_VIDEO_STREAM, }; @@ -321,7 +321,7 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_011, TestSize.L int32_t sessionId = 2; PeerSocketInfo info = { .name = const_cast(peerSessName.c_str()), - .pkgName = const_cast(PKG_NAME.c_str()), + .pkgName = const_cast(DCAMERA_PKG_NAME.c_str()), .networkId = const_cast(peerDevId.c_str()), .dataType = TransDataType::DATA_TYPE_VIDEO_STREAM, }; @@ -354,7 +354,7 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_012, TestSize.L int32_t sessionId = 2; PeerSocketInfo info = { .name = const_cast(peerSessName.c_str()), - .pkgName = const_cast(PKG_NAME.c_str()), + .pkgName = const_cast(DCAMERA_PKG_NAME.c_str()), .networkId = const_cast(peerDevId.c_str()), .dataType = TransDataType::DATA_TYPE_VIDEO_STREAM, }; @@ -404,7 +404,7 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_013, TestSize.L int32_t sessionId = 2; PeerSocketInfo info = { .name = const_cast(peerSessName.c_str()), - .pkgName = const_cast(PKG_NAME.c_str()), + .pkgName = const_cast(DCAMERA_PKG_NAME.c_str()), .networkId = const_cast(peerDevId.c_str()), .dataType = TransDataType::DATA_TYPE_VIDEO_STREAM, }; @@ -434,7 +434,7 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_014, TestSize.L int32_t sessionId = 2; PeerSocketInfo info = { .name = const_cast(peerSessName.c_str()), - .pkgName = const_cast(PKG_NAME.c_str()), + .pkgName = const_cast(DCAMERA_PKG_NAME.c_str()), .networkId = const_cast(peerDevId.c_str()), .dataType = TransDataType::DATA_TYPE_VIDEO_STREAM, }; @@ -465,7 +465,7 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_015, TestSize.L int32_t sessionId = 2; PeerSocketInfo info = { .name = const_cast(peerSessName.c_str()), - .pkgName = const_cast(PKG_NAME.c_str()), + .pkgName = const_cast(DCAMERA_PKG_NAME.c_str()), .networkId = const_cast(peerDevId.c_str()), .dataType = TransDataType::DATA_TYPE_BYTES, }; @@ -498,7 +498,7 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_016, TestSize.L int32_t sessionId = 2; PeerSocketInfo info = { .name = const_cast(peerSessName.c_str()), - .pkgName = const_cast(PKG_NAME.c_str()), + .pkgName = const_cast(DCAMERA_PKG_NAME.c_str()), .networkId = const_cast(peerDevId.c_str()), .dataType = TransDataType::DATA_TYPE_BYTES, }; @@ -531,7 +531,7 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_017, TestSize.L int32_t sessionId = 2; PeerSocketInfo info = { .name = const_cast(peerSessName.c_str()), - .pkgName = const_cast(PKG_NAME.c_str()), + .pkgName = const_cast(DCAMERA_PKG_NAME.c_str()), .networkId = const_cast(peerDevId.c_str()), .dataType = TransDataType::DATA_TYPE_BYTES, }; @@ -575,7 +575,7 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_018, TestSize.L std::shared_ptr session = std::make_shared(); PeerSocketInfo info = { .name = const_cast(peerSessName.c_str()), - .pkgName = const_cast(PKG_NAME.c_str()), + .pkgName = const_cast(DCAMERA_PKG_NAME.c_str()), .networkId = const_cast(peerDevId.c_str()), .dataType = TransDataType::DATA_TYPE_BYTES, }; @@ -606,7 +606,7 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_019, TestSize.L int32_t sessionId = 2; PeerSocketInfo info = { .name = const_cast(peerSessName.c_str()), - .pkgName = const_cast(PKG_NAME.c_str()), + .pkgName = const_cast(DCAMERA_PKG_NAME.c_str()), .networkId = const_cast(peerDevId.c_str()), .dataType = TransDataType::DATA_TYPE_BYTES, }; @@ -638,7 +638,7 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_020, TestSize.L int32_t sessionId = 2; PeerSocketInfo info = { .name = const_cast(peerSessName.c_str()), - .pkgName = const_cast(PKG_NAME.c_str()), + .pkgName = const_cast(DCAMERA_PKG_NAME.c_str()), .networkId = const_cast(peerDevId.c_str()), .dataType = TransDataType::DATA_TYPE_BYTES, }; @@ -670,7 +670,7 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_023, TestSize.L int32_t sessionId = -1; PeerSocketInfo info = { .name = const_cast(peerSessName.c_str()), - .pkgName = const_cast(PKG_NAME.c_str()), + .pkgName = const_cast(DCAMERA_PKG_NAME.c_str()), .networkId = const_cast(peerDevId.c_str()), .dataType = TransDataType::DATA_TYPE_BYTES, }; @@ -703,7 +703,7 @@ HWTEST_F(DCameraSoftbusAdapterTest, dcamera_softbus_adapter_test_027, TestSize.L std::shared_ptr session = std::make_shared(); PeerSocketInfo info = { .name = const_cast(peerSessName.c_str()), - .pkgName = const_cast(PKG_NAME.c_str()), + .pkgName = const_cast(DCAMERA_PKG_NAME.c_str()), .networkId = const_cast(peerDevId.c_str()), .dataType = TransDataType::DATA_TYPE_BYTES, }; diff --git a/services/channel/test/unittest/common/channel/dcamera_softbus_session_test.cpp b/services/channel/test/unittest/common/channel/dcamera_softbus_session_test.cpp index ca4b3fd1..6b3ff9c9 100644 --- a/services/channel/test/unittest/common/channel/dcamera_softbus_session_test.cpp +++ b/services/channel/test/unittest/common/channel/dcamera_softbus_session_test.cpp @@ -113,11 +113,6 @@ HWTEST_F(DCameraSoftbusSessionTest, dcamera_softbus_session_test_002, TestSize.L std::string sessionName = "dcamera_softbus_session_test_002"; std::string pkgName = "ohos.dhardware.dcamera"; std::string networkId = "abcdefg123"; - PeerSocketInfo info = { - .name = const_cast(sessionName.c_str()), - .pkgName = const_cast(pkgName.c_str()), - .networkId = const_cast(networkId.c_str()), - }; int32_t ret = softbusSession_->OnSessionOpened(sessionId); EXPECT_EQ(DCAMERA_OK, ret); } -- Gitee From 44dcae336722e8731da764fd41ca4d3bc5eb8cad Mon Sep 17 00:00:00 2001 From: "yaoruozi1@huawei.com" Date: Fri, 5 Jan 2024 15:09:52 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yaoruozi1@huawei.com --- services/channel/src/dcamera_channel_source_impl.cpp | 2 +- services/channel/src/dcamera_softbus_adapter.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/channel/src/dcamera_channel_source_impl.cpp b/services/channel/src/dcamera_channel_source_impl.cpp index 5c2dd962..890b0fc1 100644 --- a/services/channel/src/dcamera_channel_source_impl.cpp +++ b/services/channel/src/dcamera_channel_source_impl.cpp @@ -84,7 +84,7 @@ int32_t DCameraChannelSourceImpl::CreateSession(std::vector& camIn std::shared_ptr softbusSess = std::make_shared(myDevId, mySessionName_, peerDevId, peerSessionName, listener, sessionMode); softbusSess->OnSessionOpened(sourceSocket); - std::map> socketSessionMap = + std::map> socketSessionMap = DCameraSoftbusAdapter::GetInstance().GetSourceSocketSessionMap(); socketSessionMap[sourceSocket] = softbusSess; DCameraSoftbusAdapter::GetInstance().SetSourceSocketSessionMap(socketSessionMap); diff --git a/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index 479d79df..e6c180e6 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -459,7 +459,7 @@ int32_t DCameraSoftbusAdapter::GetSourceSocketId() return sourceSocketId_; } -std::map> DCameraSoftbusAdapter::GetSourceSocketSessionMap() +std::map> DCameraSoftbusAdapter::GetSourceSocketSessionMap() { return sourceSocketSessionMap_; } -- Gitee From 4c8d2550129ae311ed17dc225c5053d8250d77cd Mon Sep 17 00:00:00 2001 From: "yaoruozi1@huawei.com" Date: Fri, 5 Jan 2024 15:58:44 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yaoruozi1@huawei.com --- services/channel/src/dcamera_softbus_adapter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index e6c180e6..44897d35 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -501,8 +501,8 @@ int32_t DCameraSoftbusAdapter::DCameraSoftBusGetSessionByPeerSocket(int32_t sock if (sessionNameIter == peerDevIdMySessionNameMap_.end()) { DHLOGE("DCameraSoftbusAdapter DCameraSoftBusGetSessionByPeerSocket error, socket %d", socket); return DCAMERA_NOT_FOUND; - mySessionName = sessionNameIter->second; } + mySessionName = sessionNameIter->second; } auto iter = sinkSessions_.find(std::string(mySessionName)); if (iter == sinkSessions_.end()) { -- Gitee From 2b75d728394272e3bdb8edc77b1f718b6115c658 Mon Sep 17 00:00:00 2001 From: "yaoruozi1@huawei.com" Date: Mon, 8 Jan 2024 10:04:16 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yaoruozi1@huawei.com --- .../channel/src/dcamera_softbus_adapter.cpp | 94 +++++++++---------- .../channel/src/dcamera_softbus_session.cpp | 12 +-- 2 files changed, 53 insertions(+), 53 deletions(-) diff --git a/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index 44897d35..0d355d29 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -150,12 +150,12 @@ int32_t DCameraSoftbusAdapter::CreatSoftBusSinkSocketServer(std::string mySessio }; int socketId = Socket(serverSocketInfo); if (socketId < 0) { - DHLOGE("DCameraSoftbusAdapter CreatSoftBusSinkSocketServer Error, socket is invalid"); + DHLOGE("CreatSoftBusSinkSocketServer Error, socket is invalid"); return DCAMERA_BAD_VALUE; } int ret = Listen(socketId, g_qosInfo, g_QosTV_Param_Index, &sessListeners_[role]); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusAdapter CreatSoftBusSinkSocketServer Error"); + DHLOGE("CreatSoftBusSinkSocketServer Error"); Shutdown(socketId); return DCAMERA_BAD_VALUE; } @@ -184,17 +184,17 @@ int32_t DCameraSoftbusAdapter::CreateSoftBusSourceSocketClient(std::string myDev }; int socketId = Socket(clientSocketInfo); if (socketId < 0) { - DHLOGE("DCameraSoftbusAdapter CreateSoftBusSourceSocketClient Error, socket is invalid"); + DHLOGE("CreateSoftBusSourceSocketClient Error, socket is invalid"); return DCAMERA_BAD_VALUE; } int ret = Bind(socketId, g_qosInfo, g_QosTV_Param_Index, &sessListeners_[role]); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusAdapter CreateSoftBusSourceSocketClient Error"); + DHLOGE("CreateSoftBusSourceSocketClient Error"); Shutdown(socketId); return DCAMERA_BAD_VALUE; } sourceSocketId_ = socketId; - DHLOGI("DCameraSoftbusAdapter CreateSoftBusSourceSocketClient End, myDevId: %s, peerSessionName: %s", + DHLOGI("CreateSoftBusSourceSocketClient End, myDevId: %s, peerSessionName: %s", GetAnonyString(myDevId).c_str(), GetAnonyString(peerSessionName).c_str()); return DCAMERA_OK; } @@ -203,12 +203,12 @@ int32_t DCameraSoftbusAdapter::DestroySoftbusSessionServer(std::string sessionNa { std::lock_guard autoLock(optLock_); if (sessionTotal_.find(sessionName) == sessionTotal_.end()) { - DHLOGI("DCameraSoftbusAdapter sessionName already destroy %s", sessionName.c_str()); + DHLOGI("current sessionName already destroy, sessionName: %s", GetAnonyString(sessionName).c_str()); return DCAMERA_OK; } sessionTotal_[sessionName]--; - DHLOGI("DCameraSoftbusAdapter sessionName destroy %s totalnum: %d", sessionName.c_str(), + DHLOGI("sessionName destroy %s totalnum: %d", GetAnonyString(sessionName).c_str(), sessionTotal_[sessionName]); uint32_t total_ = sessionTotal_[sessionName]; if (total_ == 0) { @@ -304,7 +304,7 @@ int32_t DCameraSoftbusAdapter::DCameraSoftbusSourceGetSession(int32_t socket, std::lock_guard autoLock(sourceSocketLock_); auto iter = sourceSocketSessionMap_.find(socket); if (iter == sourceSocketSessionMap_.end()) { - DHLOGE("DCameraSoftbusAdapter DCameraSoftbusSourceGetSession can not find socket %d", socket); + DHLOGE("DCameraSoftbusSourceGetSession can not find socket %d", socket); return DCAMERA_NOT_FOUND; } session = iter->second; @@ -314,7 +314,7 @@ int32_t DCameraSoftbusAdapter::DCameraSoftbusSourceGetSession(int32_t socket, // source int32_t DCameraSoftbusAdapter::SourceOnBind(int32_t socket, PeerSocketInfo info) { - DHLOGI("DCameraSoftbusAdapter SourceOnBind socket: %d", socket); + DHLOGI("SourceOnBind Begin, socket: %d", socket); std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusSourceGetSession(socket, session); if (ret != DCAMERA_OK) { @@ -324,22 +324,22 @@ int32_t DCameraSoftbusAdapter::SourceOnBind(int32_t socket, PeerSocketInfo info) ret = session->OnSessionOpened(socket); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusAdapter SourceOnBind failed %d socket: %d", ret, socket); + DHLOGE("SourceOnBind failed %d socket: %d", ret, socket); } else { std::lock_guard autoLock(idMapLock_); sessionIdMap_.emplace(socket, session); } - DHLOGI("DCameraSoftbusAdapter SourceOnBind socket: %d end", socket); + DHLOGI("SourceOnBind End, socket: %d end", socket); return ret; } void DCameraSoftbusAdapter::SourceOnShutDown(int32_t socket, ShutdownReason reason) { - DHLOGI("DCameraSoftbusAdapter SourceOnShutDown start socket: %d", socket); + DHLOGI("SourceOnShutDown start socket: %d", socket); std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusGetSessionById(socket, session); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusAdapter SourceOnShutDown not find socket %d", socket); + DHLOGE("SourceOnShutDown can not find socket %d", socket); return; } { @@ -347,32 +347,32 @@ void DCameraSoftbusAdapter::SourceOnShutDown(int32_t socket, ShutdownReason reas sessionIdMap_.erase(socket); } session->OnSessionClose(socket); - DHLOGI("DCameraSoftbusAdapter SourceOnShutDown end socket: %d end", socket); + DHLOGI("SourceOnShutDown end socket: %d end", socket); return; } void DCameraSoftbusAdapter::SourceOnBytes(int32_t socket, const void *data, uint32_t dataLen) { if (dataLen == 0 || dataLen > DCAMERA_MAX_RECV_DATA_LEN || data == nullptr) { - DHLOGE("DCameraSoftbusAdapter SourceOnBytes dataLen: %d, socket: %d", dataLen, socket); + DHLOGE("SourceOnBytes dataLen: %d, socket: %d", dataLen, socket); return; } - DHLOGI("DCameraSoftbusAdapter SourceOnBytes Start socket: %d", socket); + DHLOGI("SourceOnBytes Start, socket: %d", socket); std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusSourceGetSession(socket, session); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusAdapter SourceOnBytes not find session %d", socket); + DHLOGE("SourceOnBytes not find session %d", socket); return; } std::shared_ptr buffer = std::make_shared(dataLen); ret = memcpy_s(buffer->Data(), buffer->Capacity(), data, dataLen); if (ret != EOK) { - DHLOGE("DCameraSoftbusAdapter SourceOnBytes memcpy_s failed ret: %d", ret); + DHLOGE("SourceOnBytes memcpy_s failed ret: %d", ret); return; } session->OnDataReceived(buffer); - DHLOGI("DCameraSoftbusAdapter SourceOnBytes end socket: %d", socket); + DHLOGI("SourceOnBytes End, socket: %d", socket); return; } @@ -389,18 +389,18 @@ void DCameraSoftbusAdapter::SourceOnStream(int32_t socket, const StreamData *dat { int64_t recvT = GetNowTimeStampUs(); if (data == nullptr) { - DHLOGE("DCameraSoftbusAdapter::OnSourceStreamReceived, data is null, socket: %d.", socket); + DHLOGE("SourceOnStream Error, data is null, socket: %d.", socket); return; } int32_t dataLen = data->bufLen; if (dataLen <= 0 || dataLen > static_cast(DCAMERA_MAX_RECV_DATA_LEN)) { - DHLOGE("DCameraSoftbusAdapter OnSourceStreamReceived dataLen: %d, socket: %d", dataLen, socket); + DHLOGE("SourceOnStream Error, dataLen: %d, socket: %d", dataLen, socket); return; } std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusSourceGetSession(socket, session); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusAdapter OnSourceStreamReceived not find socket %d", socket); + DHLOGE("SourceOnStream not find socket %d", socket); return; } @@ -408,7 +408,7 @@ void DCameraSoftbusAdapter::SourceOnStream(int32_t socket, const StreamData *dat buffer->SetInt64(RECV_TIME_US, recvT); ret = memcpy_s(buffer->Data(), buffer->Capacity(), reinterpret_cast(data->buf), data->bufLen); if (ret != EOK) { - DHLOGE("DCameraSoftbusAdapter OnSourceStreamReceived memcpy_s failed ret: %d", ret); + DHLOGE("SourceOnStream memcpy_s failed ret: %d", ret); return; } ret = HandleSourceStreamExt(buffer, ext); @@ -472,12 +472,12 @@ void DCameraSoftbusAdapter::SetSourceSocketSessionMap(std::map& session) { - DHLOGI("DCameraSoftbusAdapter DCameraSoftbusSinkGetSession Start, socket: %d", socket); + DHLOGI("DCameraSoftbusSinkGetSession Start, socket: %d", socket); { std::lock_guard autoLock(sinkSocketLock_); auto iter = sinkSocketSessionMap_.find(socket); if (iter == sinkSocketSessionMap_.end()) { - DHLOGE("DCameraSoftbusAdapter DCameraSoftbusSinkGetSession can not find socket %d", socket); + DHLOGE("DCameraSoftbusSinkGetSession can not find socket %d", socket); return DCAMERA_NOT_FOUND; } session = iter->second; @@ -486,27 +486,27 @@ int32_t DCameraSoftbusAdapter::DCameraSoftbusSinkGetSession(int32_t socket, return DCAMERA_BAD_VALUE; } } - DHLOGI("DCameraSoftbusAdapter DCameraSoftbusSinkGetSession End, socket: %d", socket); + DHLOGI("DCameraSoftbusSinkGetSession End, socket: %d", socket); return DCAMERA_OK; } int32_t DCameraSoftbusAdapter::DCameraSoftBusGetSessionByPeerSocket(int32_t socket, std::shared_ptr &session, PeerSocketInfo info) { - DHLOGI("DCameraSoftbusAdapter DCameraSoftBusGetSessionByPeerSocket Start, socket %d", socket); + DHLOGI("DCameraSoftBusGetSessionByPeerSocket Start, socket %d", socket); std::string mySessionName = ""; { std::lock_guard autoLock(mySessionNamePeerDevIdLock_); auto sessionNameIter = peerDevIdMySessionNameMap_.find(info.name); if (sessionNameIter == peerDevIdMySessionNameMap_.end()) { - DHLOGE("DCameraSoftbusAdapter DCameraSoftBusGetSessionByPeerSocket error, socket %d", socket); + DHLOGE("DCameraSoftBusGetSessionByPeerSocket error, socket %d", socket); return DCAMERA_NOT_FOUND; } mySessionName = sessionNameIter->second; } auto iter = sinkSessions_.find(std::string(mySessionName)); if (iter == sinkSessions_.end()) { - DHLOGE("DCameraSoftbusAdapter DCameraSoftBusGetSessionByPeerSocket error, mySessionName %s", + DHLOGE("DCameraSoftBusGetSessionByPeerSocket error, mySessionName %s", GetAnonyString(mySessionName).c_str()); return DCAMERA_NOT_FOUND; } @@ -515,39 +515,39 @@ int32_t DCameraSoftbusAdapter::DCameraSoftBusGetSessionByPeerSocket(int32_t sock std::lock_guard autoLock(sinkSocketLock_); sinkSocketSessionMap_[socket] = session; } - DHLOGI("DCameraSoftbusAdapter DCameraSoftBusGetSessionByPeerSocket End, socket %d", socket); + DHLOGI("DCameraSoftBusGetSessionByPeerSocket End, socket %d", socket); return DCAMERA_OK; } // sink int32_t DCameraSoftbusAdapter::SinkOnBind(int32_t socket, PeerSocketInfo info) { - DHLOGI("DCameraSoftbusAdapter SinkOnBind Start socket: %d", socket); + DHLOGI("SinkOnBind Start, socket: %d", socket); std::shared_ptr session = nullptr; int32_t ret = DCameraSoftBusGetSessionByPeerSocket(socket, session, info); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusAdapter SinkOnBind not find socket %d", socket); + DHLOGE("SinkOnBind error, can not find socket %d", socket); return DCAMERA_NOT_FOUND; } ret = session->OnSessionOpened(socket); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusAdapter SinkOnBind not find socket %d", socket); + DHLOGE("SinkOnBind not find socket %d", socket); } else { std::lock_guard autoLock(idMapLock_); sessionIdMap_.emplace(socket, session); } - DHLOGI("DCameraSoftbusAdapter SinkOnBind End socket: %d", socket); + DHLOGI("SinkOnBind End, socket: %d", socket); return ret; } void DCameraSoftbusAdapter::SinkOnShutDown(int32_t socket, ShutdownReason reason) { - DHLOGI("DCameraSoftbusAdapter SinkOnShutDown Start socket: %d", socket); + DHLOGI("SinkOnShutDown Start, socket: %d", socket); std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusGetSessionById(socket, session); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusAdapter SinkOnShutDown not find session %d", socket); + DHLOGE("SinkOnShutDown not find session %d", socket); return; } { @@ -555,31 +555,31 @@ void DCameraSoftbusAdapter::SinkOnShutDown(int32_t socket, ShutdownReason reason sessionIdMap_.erase(socket); } session->OnSessionClose(socket); - DHLOGI("DCameraSoftbusAdapter SinkOnShutDown End socket: %d", socket); + DHLOGI("SinkOnShutDown End, socket: %d", socket); return; } void DCameraSoftbusAdapter::SinkOnBytes(int32_t socket, const void *data, uint32_t dataLen) { if (dataLen == 0 || dataLen > DCAMERA_MAX_RECV_DATA_LEN || data == nullptr) { - DHLOGE("DCameraSoftbusAdapter SinkOnBytes dataLen: %d, socket: %d", dataLen, socket); + DHLOGE("SinkOnBytes dataLen: %d, socket: %d", dataLen, socket); return; } - DHLOGI("DCameraSoftbusAdapter SinkOnBytes Start socket: %d", socket); + DHLOGI("SinkOnBytes Start, socket: %d", socket); std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusSinkGetSession(socket, session); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusAdapter SinkOnBytes not find session %d", socket); + DHLOGE("SinkOnBytes error, can not find session %d", socket); return; } std::shared_ptr buffer = std::make_shared(dataLen); ret = memcpy_s(buffer->Data(), buffer->Capacity(), data, dataLen); if (ret != EOK) { - DHLOGE("DCameraSoftbusAdapter SinkOnBytes memcpy_s failed ret: %d", ret); + DHLOGE("SinkOnBytes memcpy_s failed ret: %d", ret); return; } session->OnDataReceived(buffer); - DHLOGI("DCameraSoftbusAdapter SinkOnBytes End socket: %d", socket); + DHLOGI("SinkOnBytes End, socket: %d", socket); return; } @@ -592,25 +592,25 @@ void DCameraSoftbusAdapter::SinkOnStream(int32_t socket, const StreamData *data, const StreamFrameInfo *param) { if (data == nullptr) { - DHLOGE("DCameraSoftbusAdapter::SinkOnStream, data is null, socket: %d.", socket); + DHLOGE("SinkOnStream error, data is null, socket: %d.", socket); return; } int32_t dataLen = data->bufLen; if (dataLen <= 0 || dataLen > static_cast(DCAMERA_MAX_RECV_DATA_LEN)) { - DHLOGE("DCameraSoftbusAdapter SinkOnStream dataLen: %d socket: %d", dataLen, socket); + DHLOGE("SinkOnStream error, dataLen: %d socket: %d", dataLen, socket); return; } std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusSinkGetSession(socket, session); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusAdapter SinkOnStream not find session %d", socket); + DHLOGE("SinkOnStream error, can not find socket %d", socket); return; } std::shared_ptr buffer = std::make_shared(data->bufLen); ret = memcpy_s(buffer->Data(), buffer->Capacity(), reinterpret_cast(data->buf), data->bufLen); if (ret != EOK) { - DHLOGE("DCameraSoftbusAdapter SinkOnStream memcpy_s failed ret: %d", ret); + DHLOGE("SinkOnStream error, memcpy_s failed ret: %d", ret); return; } session->OnDataReceived(buffer); @@ -622,7 +622,7 @@ int32_t DCameraSoftbusAdapter::GetLocalNetworkId(std::string& myDevId) NodeBasicInfo basicInfo = { { 0 } }; int32_t ret = GetLocalNodeDeviceInfo(PKG_NAME.c_str(), &basicInfo); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusAdapter GetLocalNodeDeviceInfo failed ret: %d", ret); + DHLOGE("GetLocalNodeDeviceInfo failed ret: %d", ret); return ret; } diff --git a/services/channel/src/dcamera_softbus_session.cpp b/services/channel/src/dcamera_softbus_session.cpp index fa65a039..9a7ced72 100644 --- a/services/channel/src/dcamera_softbus_session.cpp +++ b/services/channel/src/dcamera_softbus_session.cpp @@ -62,16 +62,16 @@ DCameraSoftbusSession::~DCameraSoftbusSession() int32_t DCameraSoftbusSession::CloseSession() { - DHLOGI("DCameraSoftbusSession CloseSession sessionId: %d peerDevId: %s peerSessionName: %s", sessionId_, + DHLOGI("CloseSession sessionId: %d peerDevId: %s peerSessionName: %s", sessionId_, GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); if (sessionId_ == -1) { - DHLOGI("DCameraSoftbusSession CloseSession has already close peerDevId: %s peerSessionName: %s", + DHLOGI("CloseSession has already close peerDevId: %s peerSessionName: %s", GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); return DCAMERA_OK; } int32_t ret = DCameraSoftbusAdapter::GetInstance().CloseSoftbusSession(sessionId_); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusSession CloseSession failed, ret: %d, peerDevId: %s peerSessionName: %s", ret, + DHLOGE("CloseSession failed, ret: %d, peerDevId: %s peerSessionName: %s", ret, GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); return ret; } @@ -83,17 +83,17 @@ int32_t DCameraSoftbusSession::CloseSession() int32_t DCameraSoftbusSession::OnSessionOpened(int32_t socket) { - DHLOGI("DCameraSoftbusSession OnSessionOpened Start, socket: %d", socket); + DHLOGI("OnSessionOpened Start, socket: %d", socket); sessionId_ = socket; state_ = DCAMERA_SOFTBUS_STATE_OPENED; listener_->OnSessionState(DCAMERA_CHANNEL_STATE_CONNECTED); - DHLOGI("DCameraSoftbusSession OnSessionOpened End, socket: %d", socket); + DHLOGI("OnSessionOpened End, socket: %d", socket); return DCAMERA_OK; } int32_t DCameraSoftbusSession::OnSessionClose(int32_t sessionId) { - DHLOGI("DCameraSoftbusSession OnSessionClose sessionId: %d peerDevId: %s peerSessionName: %s", sessionId, + DHLOGI("OnSessionClose sessionId: %d peerDevId: %s peerSessionName: %s", sessionId, GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); sessionId_ = -1; state_ = DCAMERA_SOFTBUS_STATE_CLOSED; -- Gitee From ba1a47f46eb52ddfc6703eeb094c0c3086bde033 Mon Sep 17 00:00:00 2001 From: "yaoruozi1@huawei.com" Date: Wed, 10 Jan 2024 12:28:35 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yaoruozi1@huawei.com --- .../constants/distributed_camera_constants.h | 2 +- .../channel/include/dcamera_softbus_adapter.h | 3 +-- .../channel/include/dcamera_softbus_session.h | 4 ++-- .../channel/src/dcamera_channel_source_impl.cpp | 5 +---- services/channel/src/dcamera_softbus_adapter.cpp | 16 +++++++++------- .../encoder/encode_data_process.cpp | 4 ++-- 6 files changed, 16 insertions(+), 18 deletions(-) diff --git a/common/include/constants/distributed_camera_constants.h b/common/include/constants/distributed_camera_constants.h index 98481973..46908bb1 100644 --- a/common/include/constants/distributed_camera_constants.h +++ b/common/include/constants/distributed_camera_constants.h @@ -122,7 +122,7 @@ const int32_t HICOLLIE_INTERVAL_TIME_MS = 20 * 1000; const int32_t HICOLLIE_DELAY_TIME_MS = 5 * 1000; const size_t HICOLLIE_SLEEP_TIME_US = 5 * 1000 * 1000; -const int32_t DCAMERA_QOS_TYPE_MIN_BW = 160 * 1024 * 1024; +const int32_t DCAMERA_QOS_TYPE_MIN_BW = 40 * 1024 * 1024; const int32_t DCAMERA_QOS_TYPE_MAX_LATENCY = 4000; const int32_t DCAMERA_QOS_TYPE_MIN_LATENCY = 2000; diff --git a/services/channel/include/dcamera_softbus_adapter.h b/services/channel/include/dcamera_softbus_adapter.h index 438cb88b..1e4afd47 100644 --- a/services/channel/include/dcamera_softbus_adapter.h +++ b/services/channel/include/dcamera_softbus_adapter.h @@ -65,8 +65,7 @@ public: int32_t HandleSourceStreamExt(std::shared_ptr& buffer, const StreamData *ext); int32_t GetSourceSocketId(); - std::map> GetSourceSocketSessionMap(); - void SetSourceSocketSessionMap(std::map> &map); + void RecordSourceSocketSession(int32_t socket, std::shared_ptr session); public: std::map> sourceSessions_; diff --git a/services/channel/include/dcamera_softbus_session.h b/services/channel/include/dcamera_softbus_session.h index 3b811226..657a52ff 100644 --- a/services/channel/include/dcamera_softbus_session.h +++ b/services/channel/include/dcamera_softbus_session.h @@ -83,8 +83,8 @@ private: }; static const uint32_t BINARY_DATA_MAX_TOTAL_LEN = 100 * 1024 * 1024; - static const uint32_t BINARY_DATA_MAX_LEN = 1000 * 1024; - static const uint32_t BINARY_DATA_PACKET_MAX_LEN = 62 * 1024; + static const uint32_t BINARY_DATA_MAX_LEN = 4 * 1024 * 1024; + static const uint32_t BINARY_DATA_PACKET_MAX_LEN = 4 * 1024 * 1024; static const uint16_t PROTOCOL_VERSION = 1; static const uint16_t HEADER_UINT8_NUM = 1; static const uint16_t HEADER_UINT16_NUM = 2; diff --git a/services/channel/src/dcamera_channel_source_impl.cpp b/services/channel/src/dcamera_channel_source_impl.cpp index 890b0fc1..bd426df5 100644 --- a/services/channel/src/dcamera_channel_source_impl.cpp +++ b/services/channel/src/dcamera_channel_source_impl.cpp @@ -84,10 +84,7 @@ int32_t DCameraChannelSourceImpl::CreateSession(std::vector& camIn std::shared_ptr softbusSess = std::make_shared(myDevId, mySessionName_, peerDevId, peerSessionName, listener, sessionMode); softbusSess->OnSessionOpened(sourceSocket); - std::map> socketSessionMap = - DCameraSoftbusAdapter::GetInstance().GetSourceSocketSessionMap(); - socketSessionMap[sourceSocket] = softbusSess; - DCameraSoftbusAdapter::GetInstance().SetSourceSocketSessionMap(socketSessionMap); + DCameraSoftbusAdapter::GetInstance().RecordSourceSocketSession(sourceSocket, softbusSess); softbusSessions_.push_back(softbusSess); DCameraSoftbusAdapter::GetInstance().sourceSessions_[peerDevId + peerSessionName] = softbusSess; } diff --git a/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index 0d355d29..0d20401c 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -459,14 +459,16 @@ int32_t DCameraSoftbusAdapter::GetSourceSocketId() return sourceSocketId_; } -std::map> DCameraSoftbusAdapter::GetSourceSocketSessionMap() +void DCameraSoftbusAdapter::RecordSourceSocketSession(int32_t socket, std::shared_ptr session) { - return sourceSocketSessionMap_; -} - -void DCameraSoftbusAdapter::SetSourceSocketSessionMap(std::map> &map) -{ - sourceSocketSessionMap_ = map; + if (session == nullptr) { + DHLOGE("RecordSourceSocketSession error, session is null"); + return; + } + { + std::lock_guard autoLock(sourceSocketLock_); + sourceSocketSessionMap_[socket] = session; + } } int32_t DCameraSoftbusAdapter::DCameraSoftbusSinkGetSession(int32_t socket, 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 36dff26b..4ba8e846 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 @@ -501,9 +501,9 @@ int32_t EncodeDataProcess::GetEncoderOutputBuffer(uint32_t index, MediaAVCodec:: } int64_t timeStamp = info.presentationTimeUs; struct timespec time = {0, 0}; - clock_gettime(CLOCK_REALTIME, &time); + clock_gettime(CLOCK_MONOTONIC, &time); int64_t timeNs = static_cast(time.tv_sec) * S2NS + static_cast(time.tv_nsec); - int64_t encodeT = timeNs / static_cast(US2NS) - timeStamp; + int64_t encodeT = (timeNs - timeStamp) / static_cast(US2NS); int64_t finishEncodeT = GetNowTimeStampUs(); int64_t startEncodeT = finishEncodeT - encodeT; bufferOutput->SetInt64(START_ENCODE_TIME_US, startEncodeT); -- Gitee From 5560317325196087f72c0ea47165c51684fed9fb Mon Sep 17 00:00:00 2001 From: "yaoruozi1@huawei.com" Date: Wed, 10 Jan 2024 16:48:04 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yaoruozi1@huawei.com --- services/channel/include/dcamera_softbus_session.h | 1 + services/channel/src/dcamera_softbus_session.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/services/channel/include/dcamera_softbus_session.h b/services/channel/include/dcamera_softbus_session.h index 657a52ff..429b9f70 100644 --- a/services/channel/include/dcamera_softbus_session.h +++ b/services/channel/include/dcamera_softbus_session.h @@ -85,6 +85,7 @@ private: static const uint32_t BINARY_DATA_MAX_TOTAL_LEN = 100 * 1024 * 1024; static const uint32_t BINARY_DATA_MAX_LEN = 4 * 1024 * 1024; static const uint32_t BINARY_DATA_PACKET_MAX_LEN = 4 * 1024 * 1024; + static const uint32_t BINARY_DATA_PACKET_RESERVED_BUFFER = 512; static const uint16_t PROTOCOL_VERSION = 1; static const uint16_t HEADER_UINT8_NUM = 1; static const uint16_t HEADER_UINT16_NUM = 2; diff --git a/services/channel/src/dcamera_softbus_session.cpp b/services/channel/src/dcamera_softbus_session.cpp index 9a7ced72..ace4d92f 100644 --- a/services/channel/src/dcamera_softbus_session.cpp +++ b/services/channel/src/dcamera_softbus_session.cpp @@ -349,7 +349,7 @@ void DCameraSoftbusSession::SetHeadParaDataLen(SessionDataHeader& headPara, cons const uint32_t offset) { if (totalLen - offset > BINARY_DATA_PACKET_MAX_LEN) { - headPara.dataLen = BINARY_DATA_PACKET_MAX_LEN; + headPara.dataLen = BINARY_DATA_PACKET_MAX_LEN - BINARY_DATA_PACKET_RESERVED_BUFFER; } else { headPara.fragFlag = FRAG_END; headPara.dataLen = totalLen - offset; -- Gitee From 5c65df82c520b007464319d90b1009c7453ff8d3 Mon Sep 17 00:00:00 2001 From: "yaoruozi1@huawei.com" Date: Wed, 10 Jan 2024 22:27:52 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yaoruozi1@huawei.com --- .../common/camera_sink/dcamera_sink_handler_test.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/dcamera_sink_handler_test.cpp b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/dcamera_sink_handler_test.cpp index 84974e09..883c2612 100644 --- a/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/dcamera_sink_handler_test.cpp +++ b/interfaces/inner_kits/native_cpp/test/unittest/common/camera_sink/dcamera_sink_handler_test.cpp @@ -40,6 +40,11 @@ using namespace testing::ext; namespace OHOS { namespace DistributedHardware { +namespace { +static int32_t OHOS_PERMISSION_ENABLE_DISTRIBUTED_HARDWARE_INDEX = 0; +static int32_t OHOS_PERMISSION_DISTRIBUTED_DATASYNC_INDEX = 1; +static int32_t OHOS_PERMISSION_ACCESS_DISTRIBUTED_HARDWARE_INDEX = 2; +} class DCameraSinkHandlerTest : public testing::Test { public: static void SetUpTestCase(void); @@ -67,9 +72,9 @@ void DCameraSinkHandlerTest::SetUp(void) uint64_t tokenId; int32_t numberOfPermissions = 3; const char *perms[numberOfPermissions]; - perms[0] = "ohos.permission.ENABLE_DISTRIBUTED_HARDWARE"; - perms[1] = OHOS_PERMISSION_DISTRIBUTED_DATASYNC; - perms[2] = "ohos.permission.ACCESS_DISTRIBUTED_HARDWARE"; + perms[OHOS_PERMISSION_ENABLE_DISTRIBUTED_HARDWARE_INDEX] = "ohos.permission.ENABLE_DISTRIBUTED_HARDWARE"; + perms[OHOS_PERMISSION_DISTRIBUTED_DATASYNC_INDEX] = OHOS_PERMISSION_DISTRIBUTED_DATASYNC; + perms[OHOS_PERMISSION_ACCESS_DISTRIBUTED_HARDWARE_INDEX] = "ohos.permission.ACCESS_DISTRIBUTED_HARDWARE"; NativeTokenInfoParams infoInstance = { .dcapsNum = 0, .permsNum = numberOfPermissions, -- Gitee From cac420988fd19b7a050fd4b79988d61464425129 Mon Sep 17 00:00:00 2001 From: "yaoruozi1@huawei.com" Date: Thu, 11 Jan 2024 10:54:01 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yaoruozi1@huawei.com --- .../channel/src/dcamera_softbus_adapter.cpp | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index 0d20401c..a9ea9f56 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -131,7 +131,7 @@ DCameraSoftbusAdapter::~DCameraSoftbusAdapter() int32_t DCameraSoftbusAdapter::CreatSoftBusSinkSocketServer(std::string mySessionName, DCAMERA_CHANNEL_ROLE role, DCameraSessionMode sessionMode, std::string peerDevId, std::string peerSessionName) { - DHLOGI("CreatSoftBusSinkSocketServer start, mySessionName: %s,peerSessionName: %s", + DHLOGI("create socket server start, mySessionName: %s,peerSessionName: %s", GetAnonyString(mySessionName).c_str(), GetAnonyString(peerSessionName).c_str()); { std::lock_guard autoLock(mySessionNameLock_); @@ -150,12 +150,12 @@ int32_t DCameraSoftbusAdapter::CreatSoftBusSinkSocketServer(std::string mySessio }; int socketId = Socket(serverSocketInfo); if (socketId < 0) { - DHLOGE("CreatSoftBusSinkSocketServer Error, socket is invalid"); + DHLOGE("create socket server Error, socket is invalid"); return DCAMERA_BAD_VALUE; } int ret = Listen(socketId, g_qosInfo, g_QosTV_Param_Index, &sessListeners_[role]); if (ret != DCAMERA_OK) { - DHLOGE("CreatSoftBusSinkSocketServer Error"); + DHLOGE("create socket server Error"); Shutdown(socketId); return DCAMERA_BAD_VALUE; } @@ -164,7 +164,7 @@ int32_t DCameraSoftbusAdapter::CreatSoftBusSinkSocketServer(std::string mySessio std::string peerDevIdMySessionName = peerDevId + std::string("_") + mySessionName; peerDevIdMySessionNameMap_[peerDevIdMySessionName] = mySessionName; } - DHLOGI("CreatSoftBusSinkSocketServer End, mySessionName: %s, peerSessionName: %s", + DHLOGI("create socket server End, mySessionName: %s, peerSessionName: %s", GetAnonyString(mySessionName).c_str(), GetAnonyString(peerSessionName).c_str()); return DCAMERA_OK; } @@ -172,7 +172,7 @@ int32_t DCameraSoftbusAdapter::CreatSoftBusSinkSocketServer(std::string mySessio int32_t DCameraSoftbusAdapter::CreateSoftBusSourceSocketClient(std::string myDevId, std::string peerSessionName, std::string peerDevId, DCameraSessionMode sessionMode, DCAMERA_CHANNEL_ROLE role) { - DHLOGI("CreateSoftBusSourceSocketClient start, myDevId: %s, peerSessionName: %s", + DHLOGI("create socket client start, myDevId: %s, peerSessionName: %s", GetAnonyString(myDevId).c_str(), GetAnonyString(peerSessionName).c_str()); std::string myDevIdPeerSessionName = myDevId + std::string("_") + peerSessionName; SocketInfo clientSocketInfo = { @@ -184,17 +184,17 @@ int32_t DCameraSoftbusAdapter::CreateSoftBusSourceSocketClient(std::string myDev }; int socketId = Socket(clientSocketInfo); if (socketId < 0) { - DHLOGE("CreateSoftBusSourceSocketClient Error, socket is invalid"); + DHLOGE("create socket client Error, socket is invalid"); return DCAMERA_BAD_VALUE; } int ret = Bind(socketId, g_qosInfo, g_QosTV_Param_Index, &sessListeners_[role]); if (ret != DCAMERA_OK) { - DHLOGE("CreateSoftBusSourceSocketClient Error"); + DHLOGE("create socket client Error"); Shutdown(socketId); return DCAMERA_BAD_VALUE; } sourceSocketId_ = socketId; - DHLOGI("CreateSoftBusSourceSocketClient End, myDevId: %s, peerSessionName: %s", + DHLOGI("create socket client End, myDevId: %s, peerSessionName: %s", GetAnonyString(myDevId).c_str(), GetAnonyString(peerSessionName).c_str()); return DCAMERA_OK; } @@ -314,28 +314,28 @@ int32_t DCameraSoftbusAdapter::DCameraSoftbusSourceGetSession(int32_t socket, // source int32_t DCameraSoftbusAdapter::SourceOnBind(int32_t socket, PeerSocketInfo info) { - DHLOGI("SourceOnBind Begin, socket: %d", socket); + DHLOGI("source bind socket begin, socket: %d", socket); std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusSourceGetSession(socket, session); if (ret != DCAMERA_OK) { - DHLOGE("DCameraSoftbusAdapter SourceOnBind not find socket %d", socket); + DHLOGE("source bind socket can not find socket %d", socket); return DCAMERA_NOT_FOUND; } ret = session->OnSessionOpened(socket); if (ret != DCAMERA_OK) { - DHLOGE("SourceOnBind failed %d socket: %d", ret, socket); + DHLOGE("source bind socket failed, ret: %d socket: %d", ret, socket); } else { std::lock_guard autoLock(idMapLock_); sessionIdMap_.emplace(socket, session); } - DHLOGI("SourceOnBind End, socket: %d end", socket); + DHLOGI("source bind socket end, socket: %d end", socket); return ret; } void DCameraSoftbusAdapter::SourceOnShutDown(int32_t socket, ShutdownReason reason) { - DHLOGI("SourceOnShutDown start socket: %d", socket); + DHLOGI("source on shutdown socket start, socket: %d", socket); std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusGetSessionById(socket, session); if (ret != DCAMERA_OK) { @@ -347,7 +347,7 @@ void DCameraSoftbusAdapter::SourceOnShutDown(int32_t socket, ShutdownReason reas sessionIdMap_.erase(socket); } session->OnSessionClose(socket); - DHLOGI("SourceOnShutDown end socket: %d end", socket); + DHLOGI("source on shutdown socket end socket: %d end", socket); return; } @@ -474,41 +474,41 @@ void DCameraSoftbusAdapter::RecordSourceSocketSession(int32_t socket, std::share int32_t DCameraSoftbusAdapter::DCameraSoftbusSinkGetSession(int32_t socket, std::shared_ptr& session) { - DHLOGI("DCameraSoftbusSinkGetSession Start, socket: %d", socket); + DHLOGI("sink find session start, socket: %d", socket); { std::lock_guard autoLock(sinkSocketLock_); auto iter = sinkSocketSessionMap_.find(socket); if (iter == sinkSocketSessionMap_.end()) { - DHLOGE("DCameraSoftbusSinkGetSession can not find socket %d", socket); + DHLOGE("sink can not find socket %d", socket); return DCAMERA_NOT_FOUND; } session = iter->second; if (session -> GetSessionId() < 0) { - DHLOGE("DCameraSoftBusGetSessionByPeerSocket error, current sessionId is invalid"); + DHLOGE("sink find session error, current sessionId is invalid"); return DCAMERA_BAD_VALUE; } } - DHLOGI("DCameraSoftbusSinkGetSession End, socket: %d", socket); + DHLOGI("sink find session end, socket: %d", socket); return DCAMERA_OK; } int32_t DCameraSoftbusAdapter::DCameraSoftBusGetSessionByPeerSocket(int32_t socket, std::shared_ptr &session, PeerSocketInfo info) { - DHLOGI("DCameraSoftBusGetSessionByPeerSocket Start, socket %d", socket); + DHLOGI("find session by peer socket start, socket %d", socket); std::string mySessionName = ""; { std::lock_guard autoLock(mySessionNamePeerDevIdLock_); auto sessionNameIter = peerDevIdMySessionNameMap_.find(info.name); if (sessionNameIter == peerDevIdMySessionNameMap_.end()) { - DHLOGE("DCameraSoftBusGetSessionByPeerSocket error, socket %d", socket); + DHLOGE("find session by peer socket error, socket %d", socket); return DCAMERA_NOT_FOUND; } mySessionName = sessionNameIter->second; } auto iter = sinkSessions_.find(std::string(mySessionName)); if (iter == sinkSessions_.end()) { - DHLOGE("DCameraSoftBusGetSessionByPeerSocket error, mySessionName %s", + DHLOGE("find session by peer socket error, mySessionName %s", GetAnonyString(mySessionName).c_str()); return DCAMERA_NOT_FOUND; } @@ -517,39 +517,39 @@ int32_t DCameraSoftbusAdapter::DCameraSoftBusGetSessionByPeerSocket(int32_t sock std::lock_guard autoLock(sinkSocketLock_); sinkSocketSessionMap_[socket] = session; } - DHLOGI("DCameraSoftBusGetSessionByPeerSocket End, socket %d", socket); + DHLOGI("find session by peer socket end, socket %d", socket); return DCAMERA_OK; } // sink int32_t DCameraSoftbusAdapter::SinkOnBind(int32_t socket, PeerSocketInfo info) { - DHLOGI("SinkOnBind Start, socket: %d", socket); + DHLOGI("sink bind socket start, socket: %d", socket); std::shared_ptr session = nullptr; int32_t ret = DCameraSoftBusGetSessionByPeerSocket(socket, session, info); if (ret != DCAMERA_OK) { - DHLOGE("SinkOnBind error, can not find socket %d", socket); + DHLOGE("sink bind socket error, can not find socket %d", socket); return DCAMERA_NOT_FOUND; } ret = session->OnSessionOpened(socket); if (ret != DCAMERA_OK) { - DHLOGE("SinkOnBind not find socket %d", socket); + DHLOGE("sink bind socket error, not find socket %d", socket); } else { std::lock_guard autoLock(idMapLock_); sessionIdMap_.emplace(socket, session); } - DHLOGI("SinkOnBind End, socket: %d", socket); + DHLOGI("sink bind socket end, socket: %d", socket); return ret; } void DCameraSoftbusAdapter::SinkOnShutDown(int32_t socket, ShutdownReason reason) { - DHLOGI("SinkOnShutDown Start, socket: %d", socket); + DHLOGI("sink on shutdown socket start, socket: %d", socket); std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusGetSessionById(socket, session); if (ret != DCAMERA_OK) { - DHLOGE("SinkOnShutDown not find session %d", socket); + DHLOGE("sink on shutdown socket can not find socket %d", socket); return; } { @@ -557,31 +557,31 @@ void DCameraSoftbusAdapter::SinkOnShutDown(int32_t socket, ShutdownReason reason sessionIdMap_.erase(socket); } session->OnSessionClose(socket); - DHLOGI("SinkOnShutDown End, socket: %d", socket); + DHLOGI("sink on shutdown socket end, socket: %d", socket); return; } void DCameraSoftbusAdapter::SinkOnBytes(int32_t socket, const void *data, uint32_t dataLen) { if (dataLen == 0 || dataLen > DCAMERA_MAX_RECV_DATA_LEN || data == nullptr) { - DHLOGE("SinkOnBytes dataLen: %d, socket: %d", dataLen, socket); + DHLOGE("sink on bytes error, dataLen: %d, socket: %d", dataLen, socket); return; } - DHLOGI("SinkOnBytes Start, socket: %d", socket); + DHLOGI("sink on bytes start, socket: %d", socket); std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusSinkGetSession(socket, session); if (ret != DCAMERA_OK) { - DHLOGE("SinkOnBytes error, can not find session %d", socket); + DHLOGE("sink on bytes error, can not find session %d", socket); return; } std::shared_ptr buffer = std::make_shared(dataLen); ret = memcpy_s(buffer->Data(), buffer->Capacity(), data, dataLen); if (ret != EOK) { - DHLOGE("SinkOnBytes memcpy_s failed ret: %d", ret); + DHLOGE("sink on bytes memcpy_s failed ret: %d", ret); return; } session->OnDataReceived(buffer); - DHLOGI("SinkOnBytes End, socket: %d", socket); + DHLOGI("sink on bytes end, socket: %d", socket); return; } -- Gitee From 102fedc33a11a51d5d9a8cc77b45443f4468cbc9 Mon Sep 17 00:00:00 2001 From: "yaoruozi1@huawei.com" Date: Thu, 11 Jan 2024 11:04:37 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yaoruozi1@huawei.com --- .../channel/src/dcamera_softbus_adapter.cpp | 24 +++++++++---------- .../channel/src/dcamera_softbus_session.cpp | 18 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index a9ea9f56..7fea8e9b 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -150,12 +150,12 @@ int32_t DCameraSoftbusAdapter::CreatSoftBusSinkSocketServer(std::string mySessio }; int socketId = Socket(serverSocketInfo); if (socketId < 0) { - DHLOGE("create socket server Error, socket is invalid"); + DHLOGE("create socket server error, socket is invalid"); return DCAMERA_BAD_VALUE; } int ret = Listen(socketId, g_qosInfo, g_QosTV_Param_Index, &sessListeners_[role]); if (ret != DCAMERA_OK) { - DHLOGE("create socket server Error"); + DHLOGE("create socket server error"); Shutdown(socketId); return DCAMERA_BAD_VALUE; } @@ -164,7 +164,7 @@ int32_t DCameraSoftbusAdapter::CreatSoftBusSinkSocketServer(std::string mySessio std::string peerDevIdMySessionName = peerDevId + std::string("_") + mySessionName; peerDevIdMySessionNameMap_[peerDevIdMySessionName] = mySessionName; } - DHLOGI("create socket server End, mySessionName: %s, peerSessionName: %s", + DHLOGI("create socket server end, mySessionName: %s, peerSessionName: %s", GetAnonyString(mySessionName).c_str(), GetAnonyString(peerSessionName).c_str()); return DCAMERA_OK; } @@ -184,17 +184,17 @@ int32_t DCameraSoftbusAdapter::CreateSoftBusSourceSocketClient(std::string myDev }; int socketId = Socket(clientSocketInfo); if (socketId < 0) { - DHLOGE("create socket client Error, socket is invalid"); + DHLOGE("create socket client error, socket is invalid"); return DCAMERA_BAD_VALUE; } int ret = Bind(socketId, g_qosInfo, g_QosTV_Param_Index, &sessListeners_[role]); if (ret != DCAMERA_OK) { - DHLOGE("create socket client Error"); + DHLOGE("create socket client error"); Shutdown(socketId); return DCAMERA_BAD_VALUE; } sourceSocketId_ = socketId; - DHLOGI("create socket client End, myDevId: %s, peerSessionName: %s", + DHLOGI("create socket client end, myDevId: %s, peerSessionName: %s", GetAnonyString(myDevId).c_str(), GetAnonyString(peerSessionName).c_str()); return DCAMERA_OK; } @@ -304,7 +304,7 @@ int32_t DCameraSoftbusAdapter::DCameraSoftbusSourceGetSession(int32_t socket, std::lock_guard autoLock(sourceSocketLock_); auto iter = sourceSocketSessionMap_.find(socket); if (iter == sourceSocketSessionMap_.end()) { - DHLOGE("DCameraSoftbusSourceGetSession can not find socket %d", socket); + DHLOGE("source can not find current socket %d", socket); return DCAMERA_NOT_FOUND; } session = iter->second; @@ -354,25 +354,25 @@ void DCameraSoftbusAdapter::SourceOnShutDown(int32_t socket, ShutdownReason reas void DCameraSoftbusAdapter::SourceOnBytes(int32_t socket, const void *data, uint32_t dataLen) { if (dataLen == 0 || dataLen > DCAMERA_MAX_RECV_DATA_LEN || data == nullptr) { - DHLOGE("SourceOnBytes dataLen: %d, socket: %d", dataLen, socket); + DHLOGE("source callback send bytes error, dataLen: %d, socket: %d", dataLen, socket); return; } - DHLOGI("SourceOnBytes Start, socket: %d", socket); + DHLOGI("source callback send bytes start, socket: %d", socket); std::shared_ptr session = nullptr; int32_t ret = DCameraSoftbusSourceGetSession(socket, session); if (ret != DCAMERA_OK) { - DHLOGE("SourceOnBytes not find session %d", socket); + DHLOGE("source callback send bytes not find session %d", socket); return; } std::shared_ptr buffer = std::make_shared(dataLen); ret = memcpy_s(buffer->Data(), buffer->Capacity(), data, dataLen); if (ret != EOK) { - DHLOGE("SourceOnBytes memcpy_s failed ret: %d", ret); + DHLOGE("source callback send bytes memcpy_s failed ret: %d", ret); return; } session->OnDataReceived(buffer); - DHLOGI("SourceOnBytes End, socket: %d", socket); + DHLOGI("source callback send bytes end, socket: %d", socket); return; } diff --git a/services/channel/src/dcamera_softbus_session.cpp b/services/channel/src/dcamera_softbus_session.cpp index ace4d92f..b6257e2e 100644 --- a/services/channel/src/dcamera_softbus_session.cpp +++ b/services/channel/src/dcamera_softbus_session.cpp @@ -62,16 +62,16 @@ DCameraSoftbusSession::~DCameraSoftbusSession() int32_t DCameraSoftbusSession::CloseSession() { - DHLOGI("CloseSession sessionId: %d peerDevId: %s peerSessionName: %s", sessionId_, + DHLOGI("close session sessionId: %d peerDevId: %s peerSessionName: %s", sessionId_, GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); if (sessionId_ == -1) { - DHLOGI("CloseSession has already close peerDevId: %s peerSessionName: %s", + DHLOGI("current session has already close peerDevId: %s peerSessionName: %s", GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); return DCAMERA_OK; } int32_t ret = DCameraSoftbusAdapter::GetInstance().CloseSoftbusSession(sessionId_); if (ret != DCAMERA_OK) { - DHLOGE("CloseSession failed, ret: %d, peerDevId: %s peerSessionName: %s", ret, + DHLOGE("close session failed, ret: %d, peerDevId: %s peerSessionName: %s", ret, GetAnonyString(peerDevId_).c_str(), GetAnonyString(peerSessionName_).c_str()); return ret; } @@ -83,11 +83,11 @@ int32_t DCameraSoftbusSession::CloseSession() int32_t DCameraSoftbusSession::OnSessionOpened(int32_t socket) { - DHLOGI("OnSessionOpened Start, socket: %d", socket); + DHLOGI("open current session start, socket: %d", socket); sessionId_ = socket; state_ = DCAMERA_SOFTBUS_STATE_OPENED; listener_->OnSessionState(DCAMERA_CHANNEL_STATE_CONNECTED); - DHLOGI("OnSessionOpened End, socket: %d", socket); + DHLOGI("open current session end, socket: %d", socket); return DCAMERA_OK; } @@ -125,7 +125,7 @@ void DCameraSoftbusSession::DealRecvData(std::shared_ptr& buffer) void DCameraSoftbusSession::PackRecvData(std::shared_ptr& buffer) { if (buffer->Size() < BINARY_HEADER_FRAG_LEN) { - DHLOGE("DCameraSoftbusSession PackRecvData failed, size: %d, sess: %s peerSess: %s", + DHLOGE("pack recv data error, size: %d, sess: %s peerSess: %s", buffer->Size(), mySessionName_.c_str(), peerSessionName_.c_str()); return; } @@ -134,18 +134,18 @@ void DCameraSoftbusSession::PackRecvData(std::shared_ptr& buffer) GetFragDataLen(ptrPacket, headerPara); if (buffer->Size() != (headerPara.dataLen + BINARY_HEADER_FRAG_LEN) || headerPara.dataLen > headerPara.totalLen || headerPara.dataLen > BINARY_DATA_MAX_LEN || headerPara.totalLen > BINARY_DATA_MAX_TOTAL_LEN) { - DHLOGE("DCameraSoftbusSession PackRecvData failed, size: %d, dataLen: %d, totalLen: %d sess: %s peerSess: %s", + DHLOGE("pack recv data failed, size: %d, dataLen: %d, totalLen: %d sess: %s peerSess: %s", buffer->Size(), headerPara.dataLen, headerPara.totalLen, mySessionName_.c_str(), peerSessionName_.c_str()); return; } - DHLOGD("DCameraSoftbusSession PackRecvData Assemble, size: %d, dataLen: %d, totalLen: %d, nowTime: %lld start", + DHLOGD("pack recv data Assemble, size: %d, dataLen: %d, totalLen: %d, nowTime: %lld start", buffer->Size(), headerPara.dataLen, headerPara.totalLen, GetNowTimeStampUs()); if (headerPara.fragFlag == FRAG_START_END) { AssembleNoFrag(buffer, headerPara); } else { AssembleFrag(buffer, headerPara); } - DHLOGD("DCameraSoftbusSession PackRecvData Assemble, size: %d, dataLen: %d, totalLen: %d, nowTime: %lld end", + DHLOGD("pack recv data Assemble, size: %d, dataLen: %d, totalLen: %d, nowTime: %lld end", buffer->Size(), headerPara.dataLen, headerPara.totalLen, GetNowTimeStampUs()); } -- Gitee From b8b4051dbf9bcae46c32cf4bd1e6f3a7b65c511e Mon Sep 17 00:00:00 2001 From: "yaoruozi1@huawei.com" Date: Thu, 11 Jan 2024 15:07:59 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yaoruozi1@huawei.com --- services/channel/src/dcamera_softbus_adapter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/channel/src/dcamera_softbus_adapter.cpp b/services/channel/src/dcamera_softbus_adapter.cpp index 7fea8e9b..b8e32114 100644 --- a/services/channel/src/dcamera_softbus_adapter.cpp +++ b/services/channel/src/dcamera_softbus_adapter.cpp @@ -483,7 +483,7 @@ int32_t DCameraSoftbusAdapter::DCameraSoftbusSinkGetSession(int32_t socket, return DCAMERA_NOT_FOUND; } session = iter->second; - if (session -> GetSessionId() < 0) { + if (session->GetSessionId() < 0) { DHLOGE("sink find session error, current sessionId is invalid"); return DCAMERA_BAD_VALUE; } -- Gitee