diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerinitsink_fuzzer/initsink_fuzzer.cpp b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerinitsink_fuzzer/initsink_fuzzer.cpp index b5acae6950cc57064b051ea335647d63a1ea63e5..eb9a523bb087d3cc979cddc619cfedb337b760fd 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerinitsink_fuzzer/initsink_fuzzer.cpp +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerinitsink_fuzzer/initsink_fuzzer.cpp @@ -24,7 +24,7 @@ namespace OHOS { namespace DistributedHardware { void InitSinkFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlersubscribelocalhardware_fuzzer/subscribelocalhardware_fuzzer.cpp b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlersubscribelocalhardware_fuzzer/subscribelocalhardware_fuzzer.cpp index e6b49992dbed5560fe1f0bfe6667ef636be2a712..6d55f22430e5bee347050b237f8611f89bc0ad00 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlersubscribelocalhardware_fuzzer/subscribelocalhardware_fuzzer.cpp +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlersubscribelocalhardware_fuzzer/subscribelocalhardware_fuzzer.cpp @@ -24,7 +24,7 @@ namespace OHOS { namespace DistributedHardware { void SubscribeLocalHardwareFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerunsubscribelocalhardware_fuzzer/unsubscribelocalhardware_fuzzer.cpp b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerunsubscribelocalhardware_fuzzer/unsubscribelocalhardware_fuzzer.cpp index cdeecb149d38b11f5501dedc3ca412fd9866a739..942ca8b119a477c8a0fa48e7d110fb08f8d36de9 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerunsubscribelocalhardware_fuzzer/unsubscribelocalhardware_fuzzer.cpp +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_handler/handlerunsubscribelocalhardware_fuzzer/unsubscribelocalhardware_fuzzer.cpp @@ -24,7 +24,7 @@ namespace OHOS { namespace DistributedHardware { void UnsubscribeLocalHardwareFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyinitsink_fuzzer/initsink_fuzzer.cpp b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyinitsink_fuzzer/initsink_fuzzer.cpp index df1d4c35ffa31aea2b43e151a3e290b27cf897ba..5c4c7c4a83f3e83a630a965256aae04b35ab1b5c 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyinitsink_fuzzer/initsink_fuzzer.cpp +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyinitsink_fuzzer/initsink_fuzzer.cpp @@ -27,7 +27,7 @@ namespace OHOS { namespace DistributedHardware { void InitSinkFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxysubscribelocalhardware_fuzzer/subscribelocalhardware_fuzzer.cpp b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxysubscribelocalhardware_fuzzer/subscribelocalhardware_fuzzer.cpp index c0dcb6d4da46fc5b5a11b6195e4abf4c6f24e15e..8dac4383f07e21d4f5a6c32a560de86b1ace0da8 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxysubscribelocalhardware_fuzzer/subscribelocalhardware_fuzzer.cpp +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxysubscribelocalhardware_fuzzer/subscribelocalhardware_fuzzer.cpp @@ -27,7 +27,7 @@ namespace OHOS { namespace DistributedHardware { void SubscribeLocalHardwareFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyunsubscribelocalhardware_fuzzer/unsubscribelocalhardware_fuzzer.cpp b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyunsubscribelocalhardware_fuzzer/unsubscribelocalhardware_fuzzer.cpp index 6d0596f227b98546767c7818070e3c9ac963efd4..7c39d54c5f626133ba131e88bb7905eb9059c8d9 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyunsubscribelocalhardware_fuzzer/unsubscribelocalhardware_fuzzer.cpp +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_sink_proxy/proxyunsubscribelocalhardware_fuzzer/unsubscribelocalhardware_fuzzer.cpp @@ -27,7 +27,7 @@ namespace OHOS { namespace DistributedHardware { void UnsubscribeLocalHardwareFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerconfigdistributedhardware_fuzzer/configdistributedhardware_fuzzer.cpp b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerconfigdistributedhardware_fuzzer/configdistributedhardware_fuzzer.cpp index cf1238d01b78a64aa8a20471e37b730d1d8adb34..e6fdf7abd8014ca1eb72d4e64a47cccee6c3ecf3 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerconfigdistributedhardware_fuzzer/configdistributedhardware_fuzzer.cpp +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerconfigdistributedhardware_fuzzer/configdistributedhardware_fuzzer.cpp @@ -24,7 +24,7 @@ namespace OHOS { namespace DistributedHardware { void ConfigDistributedHardwareFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerinitsource_fuzzer/initsource_fuzzer.cpp b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerinitsource_fuzzer/initsource_fuzzer.cpp index 4d804239fe62c53ea8bd4fce8f869968a45b51c1..6868e7f95dd943be150665382839ef668226f6c2 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerinitsource_fuzzer/initsource_fuzzer.cpp +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerinitsource_fuzzer/initsource_fuzzer.cpp @@ -24,7 +24,7 @@ namespace OHOS { namespace DistributedHardware { void InitSourceFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerregisterdistributedhardware_fuzzer/registerdistributedhardware_fuzzer.cpp b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerregisterdistributedhardware_fuzzer/registerdistributedhardware_fuzzer.cpp index 1ce18dca37f9e5caf1f4d38f1a7b2c1fe703d241..aa3473785b3201d08762cee5144a4ef9b30abb7c 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerregisterdistributedhardware_fuzzer/registerdistributedhardware_fuzzer.cpp +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerregisterdistributedhardware_fuzzer/registerdistributedhardware_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace DistributedHardware { void RegisterDistributedHardwareFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerunregisterdistributedhardware_fuzzer/unregisterdistributedhardware_fuzzer.cpp b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerunregisterdistributedhardware_fuzzer/unregisterdistributedhardware_fuzzer.cpp index 6a36a164629434db2c5914a0758228f2f0bc91c1..7612e70bcfea3d1e25b558895e295c44c90acde3 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerunregisterdistributedhardware_fuzzer/unregisterdistributedhardware_fuzzer.cpp +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_handler/handlerunregisterdistributedhardware_fuzzer/unregisterdistributedhardware_fuzzer.cpp @@ -25,7 +25,7 @@ namespace OHOS { namespace DistributedHardware { void UnregisterDistributedHardwareFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyconfigdistributedhardware_fuzzer/configdistributedhardware_fuzzer.cpp b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyconfigdistributedhardware_fuzzer/configdistributedhardware_fuzzer.cpp index dca9799573d15bf7c0b902eb0a8fcfe80bf53d02..a097bafb536bed7d8c8e645ce7ac596e6549cd44 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyconfigdistributedhardware_fuzzer/configdistributedhardware_fuzzer.cpp +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyconfigdistributedhardware_fuzzer/configdistributedhardware_fuzzer.cpp @@ -27,7 +27,7 @@ namespace OHOS { namespace DistributedHardware { void ConfigDistributedHardwareFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyinitsource_fuzzer/initsource_fuzzer.cpp b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyinitsource_fuzzer/initsource_fuzzer.cpp index 01f5e3ef8907d6e88cd0569908f4fb03a415368b..aaa4ae91bc71fd37850ea905557c12debf4c1474 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyinitsource_fuzzer/initsource_fuzzer.cpp +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyinitsource_fuzzer/initsource_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { namespace DistributedHardware { void InitSourceFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyregisterdistributedhardware_fuzzer/registerdistributedhardware_fuzzer.cpp b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyregisterdistributedhardware_fuzzer/registerdistributedhardware_fuzzer.cpp index 0ce21584a41181c5ced5668a978dd91cac026347..82e40466627825d05b07cd7dd13ab85dc15824e0 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyregisterdistributedhardware_fuzzer/registerdistributedhardware_fuzzer.cpp +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyregisterdistributedhardware_fuzzer/registerdistributedhardware_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { namespace DistributedHardware { void RegisterDistributedHardwareFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyunregisterdistributedhardware_fuzzer/unregisterdistributedhardware_fuzzer.cpp b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyunregisterdistributedhardware_fuzzer/unregisterdistributedhardware_fuzzer.cpp index 9dbf372c5a8f54348edeca0af20e2b9e07439ac5..73357b41a01bc803c9e21068ac450dd235a42999 100644 --- a/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyunregisterdistributedhardware_fuzzer/unregisterdistributedhardware_fuzzer.cpp +++ b/interfaces/innerkits/native_cpp/test/fuzztest/dscreen_source_proxy/proxyunregisterdistributedhardware_fuzzer/unregisterdistributedhardware_fuzzer.cpp @@ -28,7 +28,7 @@ namespace OHOS { namespace DistributedHardware { void UnregisterDistributedHardwareFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp index 3eb3ff72339357772c046e481825ea0a1355ffd3..86903c93b11e557f6699f63e83bc9618b05053d0 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp +++ b/interfaces/innerkits/native_cpp/test/unittest/screensourcetest/src/dscreen_source_handler_test.cpp @@ -52,25 +52,9 @@ HWTEST_F(DScreenSourceHandlerTest, RegisterDistributedHardware_001, TestSize.Lev std::shared_ptr callback = std::make_shared(); int32_t ret = DScreenSourceHandler::GetInstance().RegisterDistributedHardware(devId, dhId, param, callback); EXPECT_EQ(DH_SUCCESS, ret); -} -/** - * @tc.name: RegisterDistributedHardware_002 - * @tc.desc: Verify the RegisterDistributedHardware function. - * @tc.type: FUNC - * @tc.require: Issue Number - */ -HWTEST_F(DScreenSourceHandlerTest, RegisterDistributedHardware_002, TestSize.Level1) -{ - const std::string devId = "devId"; - const std::string dhId = "dhId"; - EnableParam param; - param.version = "1"; - param.attrs = "attrs"; - std::shared_ptr callback = std::make_shared(); DScreenSourceHandler::GetInstance().dScreenSourceCallback_ = nullptr; - - int32_t ret = DScreenSourceHandler::GetInstance().RegisterDistributedHardware(devId, dhId, param, callback); + ret = DScreenSourceHandler::GetInstance().RegisterDistributedHardware(devId, dhId, param, callback); EXPECT_EQ(ERR_DH_SCREEN_SA_SOURCEPCALLBACK_NOT_INIT, ret); } diff --git a/screenhandler/test/fuzztest/pluginhardware_fuzzer/pluginhardware_fuzzer.cpp b/screenhandler/test/fuzztest/pluginhardware_fuzzer/pluginhardware_fuzzer.cpp index b5ee154d341b1d22e71f60f11c59ff3f30255ff4..dc8d2f2343b8b68c88cd3b916c2be5c6a1f0d9f5 100644 --- a/screenhandler/test/fuzztest/pluginhardware_fuzzer/pluginhardware_fuzzer.cpp +++ b/screenhandler/test/fuzztest/pluginhardware_fuzzer/pluginhardware_fuzzer.cpp @@ -24,7 +24,7 @@ namespace OHOS { namespace DistributedHardware { void PluginHardwareFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/registerpluginlistener_fuzzer.cpp b/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/registerpluginlistener_fuzzer.cpp index 7dc7ff40d2bdbe69c521bf0cbfb773907d7d41cc..b807086de3ae4185f8efdec2077eb9730868c58c 100644 --- a/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/registerpluginlistener_fuzzer.cpp +++ b/screenhandler/test/fuzztest/registerpluginlistener_fuzzer/registerpluginlistener_fuzzer.cpp @@ -26,7 +26,7 @@ namespace OHOS { namespace DistributedHardware { void RegisterPluginListenerFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/screenhandler/test/fuzztest/unpluginhardware_fuzzer/unpluginhardware_fuzzer.cpp b/screenhandler/test/fuzztest/unpluginhardware_fuzzer/unpluginhardware_fuzzer.cpp index 1678eff253f768b519936b7f9e3e454aeccc058f..3441383faa000ec72a1f401c2d4b843567f02ceb 100644 --- a/screenhandler/test/fuzztest/unpluginhardware_fuzzer/unpluginhardware_fuzzer.cpp +++ b/screenhandler/test/fuzztest/unpluginhardware_fuzzer/unpluginhardware_fuzzer.cpp @@ -24,7 +24,7 @@ namespace OHOS { namespace DistributedHardware { void UnPluginHardwareFuzzTest(const uint8_t* data, size_t size) { - if ((data == nullptr) || (size <= 0)) { + if ((data == nullptr) || (size == 0)) { return; } diff --git a/services/screenclient/src/screen_client_window_adapter.cpp b/services/screenclient/src/screen_client_window_adapter.cpp index 8499d1977ed60123a754cbc48ebf79161b4a3481..ef6279b9d107fac167028d3d909dbcdf3abfdf21 100644 --- a/services/screenclient/src/screen_client_window_adapter.cpp +++ b/services/screenclient/src/screen_client_window_adapter.cpp @@ -107,7 +107,7 @@ int32_t ScreenClientWindowAdapter::ShowWindow(int32_t windowId) std::lock_guard dataLock(windowIdMapMutex_); auto iter = windowIdMap_.find(windowId); if (iter == windowIdMap_.end()) { - DHLOGE("ERR_DH_SCREEN_SCREENCLIENT_SHOW_WINDOW_ERROR."); + DHLOGE("Invalid windowId (windowId = %d).", windowId); return ERR_DH_SCREEN_SCREENCLIENT_SHOW_WINDOW_ERROR; } window = iter->second; @@ -131,7 +131,7 @@ int32_t ScreenClientWindowAdapter::HideWindow(int32_t windowId) std::lock_guard dataLock(windowIdMapMutex_); auto iter = windowIdMap_.find(windowId); if (iter == windowIdMap_.end()) { - DHLOGE("ERR_DH_SCREEN_SCREENCLIENT_HIDE_WINDOW_ERROR."); + DHLOGE("Invalid windowId (windowId = %d).", windowId); return ERR_DH_SCREEN_SCREENCLIENT_HIDE_WINDOW_ERROR; } window = iter->second; diff --git a/services/screendemo/decoder_demo.cpp b/services/screendemo/decoder_demo.cpp index b9e56ce5fbf82b294fec084008d741ffc96c5e69..23c597f336a32677551b6430fdc5c89b30f9a620 100644 --- a/services/screendemo/decoder_demo.cpp +++ b/services/screendemo/decoder_demo.cpp @@ -243,7 +243,7 @@ void VDecDemo::InputFunc() uint32_t index = signal_->inQueue_.front(); auto buffer = vdec_->GetInputBuffer(index); - char *fileBuffer = (char *)malloc(sizeof(char) * (*frameLen) + 1); + char *fileBuffer = static_cast(malloc(sizeof(char) * (*frameLen) + 1)); if (fileBuffer == nullptr) { break; } diff --git a/services/screendemo/test.cpp b/services/screendemo/test.cpp index e915c9f4679c504ef8d7217ced0a58df3faaef1b..762e568789a3fef20b6856122419325f1ad20dd3 100644 --- a/services/screendemo/test.cpp +++ b/services/screendemo/test.cpp @@ -231,14 +231,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", GetAnonyString((char *)udid).c_str()); + printf("Udid = %s\n", GetAnonyString(reinterpret_cast(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", GetAnonyString((char *)uuid).c_str()); + printf("Uuid = %s\n", GetAnonyString(reinterpret_cast(udid)).c_str()); } } @@ -315,10 +315,7 @@ static void CreateWindow() cout << "create window success." << endl; auto vdec = make_shared(); - if (vdec == nullptr) { - cout << "videoDecoder is nullptr" << endl; - return; - } + vdec->SetWindowSize(windowWidth, windowHeight); vdec->SetOutputSurface(surface); cout << "start run decoder" << endl; diff --git a/services/screentransport/screendatachannel/src/screen_data_channel_impl.cpp b/services/screentransport/screendatachannel/src/screen_data_channel_impl.cpp index b19f70b78739d367685b7b365b9db1b6517069aa..f9f94bfddd53dfdfb13544405064bc93e10d5a2a 100644 --- a/services/screentransport/screendatachannel/src/screen_data_channel_impl.cpp +++ b/services/screentransport/screendatachannel/src/screen_data_channel_impl.cpp @@ -114,7 +114,7 @@ int32_t ScreenDataChannelImpl::SendData(const std::shared_ptr &scree return ERR_DH_SCREEN_TRANS_NULL_VALUE; } - StreamData data = {(char *)screenData->Data(), screenData->Capacity()}; + StreamData data = {reinterpret_cast(screenData->Data()), screenData->Capacity()}; StreamData ext = {0}; StreamFrameInfo frameInfo = {0}; @@ -183,12 +183,9 @@ void ScreenDataChannelImpl::OnStreamReceived(int32_t sessionId, const StreamData DHLOGI("%s: OnScreenStreamReceived, sessionId(%d) dataSize(%zu).", LOG_TAG, sessionId, data->bufLen); auto dataBuffer = std::make_shared(data->bufLen); - if (dataBuffer == nullptr) { - DHLOGE("%s: DataBuffer is null.", LOG_TAG); - return; - } - int32_t ret = memcpy_s(dataBuffer->Data(), dataBuffer->Capacity(), (uint8_t *)data->buf, data->bufLen); + int32_t ret = memcpy_s(dataBuffer->Data(), dataBuffer->Capacity(), reinterpret_cast(data->buf), + data->bufLen); if (ret != EOK) { DHLOGE("%s: Data memcpy_s failed.", LOG_TAG); return; diff --git a/services/screentransport/screensinkprocessor/src/image_sink_processor.cpp b/services/screentransport/screensinkprocessor/src/image_sink_processor.cpp index e692bff818b970e0014678e0cd226fb2c0972193..6cc0e46b657c43ade4d16f2b83c7bbb535137a69 100644 --- a/services/screentransport/screensinkprocessor/src/image_sink_processor.cpp +++ b/services/screentransport/screensinkprocessor/src/image_sink_processor.cpp @@ -31,10 +31,6 @@ int32_t ImageSinkProcessor::ConfigureImageProcessor( remoteParam_ = remoteParam; imageDecoder_ = std::make_shared(imageListener); - if (imageDecoder_ == nullptr) { - DHLOGE("%s: Decoder is null.", LOG_TAG); - return ERR_DH_SCREEN_TRANS_NULL_VALUE; - } int32_t ret = imageDecoder_->ConfigureDecoder(localParam); if (ret != DH_SUCCESS) { diff --git a/services/screentransport/screensinktrans/src/screen_sink_trans.cpp b/services/screentransport/screensinktrans/src/screen_sink_trans.cpp index 8b92aa2918f056263a666a08ac539cdd94846305..f574ad101f251bc7721ac4d06b752b02815f5c9d 100644 --- a/services/screentransport/screensinktrans/src/screen_sink_trans.cpp +++ b/services/screentransport/screensinktrans/src/screen_sink_trans.cpp @@ -208,10 +208,7 @@ int32_t ScreenSinkTrans::InitScreenTrans(const VideoParam &localParam, const Vid const std::string &peerDevId) { screenChannel_ = std::make_shared(peerDevId); - if (screenChannel_ == nullptr) { - DHLOGE("%s: Create screen data channel failed.", LOG_TAG); - return ERR_DH_SCREEN_TRANS_NULL_VALUE; - } + int32_t ret = RegisterChannelListener(); if (ret != DH_SUCCESS) { DHLOGE("%s: Register channel listener failed.", LOG_TAG); @@ -220,11 +217,7 @@ int32_t ScreenSinkTrans::InitScreenTrans(const VideoParam &localParam, const Vid } imageProcessor_ = std::make_shared(); - if (imageProcessor_ == nullptr) { - DHLOGE("%s: Create image processor failed.", LOG_TAG); - screenChannel_ = nullptr; - return ERR_DH_SCREEN_TRANS_NULL_VALUE; - } + ret = RegisterProcessorListener(localParam, remoteParam, peerDevId); if (ret != DH_SUCCESS) { DHLOGE("%s: Register processor listener failed.", LOG_TAG); diff --git a/services/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp b/services/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp index a265b8dca412a41f98d49063c2d616ddd2d8327d..f600a269b023dc43a6feb268fc598305f6d4483f 100644 --- a/services/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp +++ b/services/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp @@ -236,10 +236,7 @@ void ImageSourceEncoder::OnOutputBufferAvailable(uint32_t index, Media::AVCodecB return; } auto dataBuf = std::make_shared(dataSize); - if (dataBuf == nullptr) { - DHLOGE("%s: Create buffer failed.", LOG_TAG); - return; - } + int32_t ret = memcpy_s(dataBuf->Data(), dataBuf->Capacity(), videoSharedMemory_->GetBase(), dataSize); if (ret != EOK) { DHLOGE("%s: Copy data failed.", LOG_TAG); diff --git a/services/screentransport/screensourceprocessor/src/image_source_processor.cpp b/services/screentransport/screensourceprocessor/src/image_source_processor.cpp index 52cc5b528941ff1752abab605488f52f948f7f67..077fb2f24c1295eac11cfb306031c7cae4b76b95 100644 --- a/services/screentransport/screensourceprocessor/src/image_source_processor.cpp +++ b/services/screentransport/screensourceprocessor/src/image_source_processor.cpp @@ -27,10 +27,6 @@ int32_t ImageSourceProcessor::ConfigureImageProcessor(const VideoParam &localPar { DHLOGI("%s: ConfigureImageProcessor.", LOG_TAG); imageEncoder_ = std::make_shared(listener); - if (imageEncoder_ == nullptr) { - DHLOGE("%s: Create screen encoder failed.", LOG_TAG); - return ERR_DH_SCREEN_TRANS_NULL_VALUE; - } int32_t ret = imageEncoder_->ConfigureEncoder(localParam); if (ret != DH_SUCCESS) { diff --git a/services/screentransport/screensourcetrans/src/screen_source_trans.cpp b/services/screentransport/screensourcetrans/src/screen_source_trans.cpp index fc075ca90ca558dd0604a07808193fdb79bf27f6..b46522eaf9a11aaa93463e24c5e582ad4a3e7d77 100644 --- a/services/screentransport/screensourcetrans/src/screen_source_trans.cpp +++ b/services/screentransport/screensourcetrans/src/screen_source_trans.cpp @@ -226,10 +226,7 @@ int32_t ScreenSourceTrans::InitScreenTrans(const VideoParam &localParam, const V { DHLOGI("%s:InitScreenTrans.", LOG_TAG); screenChannel_ = std::make_shared(peerDevId); - if (screenChannel_ == nullptr) { - DHLOGE("%s: Create screen data channel failed.", LOG_TAG); - return ERR_DH_SCREEN_TRANS_NULL_VALUE; - } + int32_t ret = RegisterChannelListener(); if (ret != DH_SUCCESS) { DHLOGE("%s: Register channel listener failed ret: %d.", LOG_TAG, ret); @@ -238,11 +235,7 @@ int32_t ScreenSourceTrans::InitScreenTrans(const VideoParam &localParam, const V } imageProcessor_ = std::make_shared(); - if (imageProcessor_ == nullptr) { - DHLOGE("%s: Create image processor failed.", LOG_TAG); - screenChannel_ = nullptr; - return ERR_DH_SCREEN_TRANS_NULL_VALUE; - } + ret = RegisterProcessorListener(localParam, remoteParam); if (ret != DH_SUCCESS) { DHLOGE("%s: Register data processor listener failed ret: %d.", LOG_TAG, ret);