diff --git a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/src/dscreen_sink_handler_test.cpp b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/src/dscreen_sink_handler_test.cpp index 2dd330ff53e1178089211fdaa6b26933705732cc..decfb5ab27594805a0e880518eba1329e4b54d3b 100644 --- a/interfaces/innerkits/native_cpp/test/unittest/screensinktest/src/dscreen_sink_handler_test.cpp +++ b/interfaces/innerkits/native_cpp/test/unittest/screensinktest/src/dscreen_sink_handler_test.cpp @@ -76,10 +76,12 @@ HWTEST_F(DScreenSinkHandlerTest, LocalHardware_001, TestSize.Level1) { const std::string dhId = "DScreenSinkHandlerTest"; const std::string param = "DScreenSinkHandlerTest"; + int32_t ret = DScreenSinkHandler::GetInstance().InitSink(param); + EXPECT_EQ(DH_SUCCESS, ret); sptr loadCallback = new DScreenSinkLoadCallback(param); loadCallback->OnLoadSystemAbilitySuccess(DISTRIBUTED_HARDWARE_SCREEN_SINK_SA_ID, nullptr); loadCallback->OnLoadSystemAbilitySuccess(DISTRIBUTED_HARDWARE_SCREEN_SOURCE_SA_ID, nullptr); - int32_t ret = DScreenSinkHandler::GetInstance().SubscribeLocalHardware(dhId, param); + ret = DScreenSinkHandler::GetInstance().SubscribeLocalHardware(dhId, param); EXPECT_EQ(DH_SUCCESS, ret); ret = DScreenSinkHandler::GetInstance().UnsubscribeLocalHardware(dhId); diff --git a/services/common/decision_center/include/screen_decision_center.h b/services/common/decision_center/include/screen_decision_center.h index 9fa2691e416c90936c8babc686acdce08095e19a..745f9304a8f03647c8e62c899e9eeceaa7616352 100644 --- a/services/common/decision_center/include/screen_decision_center.h +++ b/services/common/decision_center/include/screen_decision_center.h @@ -46,7 +46,7 @@ private: std::shared_ptr imageProcessor_ = nullptr; VideoParam configParam_; int32_t frameCount_ = 0; - time_t sendFullTime_; + time_t sendFullTime_ = 0; }; } // namespace DistributedHardware } // namespace OHOS diff --git a/services/screentransport/screendatachannel/src/screen_data_channel_impl.cpp b/services/screentransport/screendatachannel/src/screen_data_channel_impl.cpp index 166b77e400b156d7a90b13efb620ad11d2378999..dcf23a66b9687d66e887b20ea863904a0c44310b 100644 --- a/services/screentransport/screendatachannel/src/screen_data_channel_impl.cpp +++ b/services/screentransport/screendatachannel/src/screen_data_channel_impl.cpp @@ -53,7 +53,6 @@ int32_t ScreenDataChannelImpl::CreateSession(const std::shared_ptr softbusListener = shared_from_this(); ret = SoftbusAdapter::GetInstance().RegisterSoftbusListener(softbusListener, JPEG_SESSION_NAME, peerDevId_); if (ret != DH_SUCCESS) { @@ -86,7 +85,7 @@ int32_t ScreenDataChannelImpl::ReleaseSession() } if (jpegSessionFlag_ == true) { - int32_t ret = SoftbusAdapter::GetInstance().RemoveSoftbusSessionServer(PKG_NAME, JPEG_SESSION_NAME, peerDevId_); + ret = SoftbusAdapter::GetInstance().RemoveSoftbusSessionServer(PKG_NAME, JPEG_SESSION_NAME, peerDevId_); if (ret != DH_SUCCESS) { DHLOGE("%s: Release jpeg session failed ret: %" PRId32, LOG_TAG, ret); return ret; @@ -114,7 +113,7 @@ int32_t ScreenDataChannelImpl::OpenSession() } sessionId_ = sessionId; if (jpegSessionFlag_ == true) { - int32_t sessionId = + sessionId = SoftbusAdapter::GetInstance().OpenSoftbusSession(DATA_SESSION_NAME, JPEG_SESSION_NAME, peerDevId_); if (sessionId < 0) { DHLOGE("%s: Open jpeg session failed, ret: %" PRId32, LOG_TAG, sessionId); @@ -141,7 +140,7 @@ int32_t ScreenDataChannelImpl::CloseSession() } sessionId_ = 0; if (jpegSessionFlag_ == true && jpegSessionId_ != 0) { - int32_t ret = SoftbusAdapter::GetInstance().CloseSoftbusSession(sessionId_); + ret = SoftbusAdapter::GetInstance().CloseSoftbusSession(sessionId_); if (ret != DH_SUCCESS) { DHLOGE("%s: Close jpeg session failed ret: %" PRId32, LOG_TAG, ret); return ret; diff --git a/services/screentransport/screensourcetrans/src/screen_source_trans.cpp b/services/screentransport/screensourcetrans/src/screen_source_trans.cpp index 66540c7f947c3f75702adfce9757001343632d8a..8ec4fa7c23ff5bb3f6541c6cb42369269770fd8a 100644 --- a/services/screentransport/screensourcetrans/src/screen_source_trans.cpp +++ b/services/screentransport/screensourcetrans/src/screen_source_trans.cpp @@ -402,10 +402,16 @@ void ScreenSourceTrans::OnDamageProcessDone(sptr &surfaceBuffer, case OLD: DHLOGI("%s: ProcessFullImage.", LOG_TAG); ret = imageProcessor_->ProcessFullImage(surfaceBuffer); + if (ret != DH_SUCCESS) { + DHLOGE("%s: ImageProcessor process full image failed.", LOG_TAG); + } break; case NEW: DHLOGI("%s: InputBufferImage.", LOG_TAG); ret = screenDecisionCenter_->InputBufferImage(surfaceBuffer, damages); + if (ret != DH_SUCCESS) { + DHLOGE("%s: DecisionCenter process full image failed.", LOG_TAG); + } break; default: break;