Fixes for mouse cursor and deadlock at high resolution

Author: GennadiyAMD

README.md

@@ -1,19 +1,21 @@
-# AMD Interactive Streaming SDK
+# Advanced Interactive Streaming SDK
 
-AMD Interactive Streaming SDK is a C++ library that provides building blocks and samples for low latency streaming applications, such as Cloud Game Streaming, Virtual Desktop Interface (VDI),
+Advanced Interactive Streaming SDK is a C++ library that provides building blocks and samples for low latency streaming applications, such as Cloud Game Streaming, Virtual Desktop Interface (VDI),
 Virtual and Augmented Reality, etc. using AMD Radeon graphics. It allows you to build a complete streaming solution including video and audio capture, video and audio encoder/decoder/pre-post-processing pipelines, a robust and secure network stack, or use some of its components, while implementing the rest yourself.
 
 ## Changelog:
-- Initial revision
+- v1.0.1 - bug fixes:
+	- System mouse cursor doesn't get hidden correctly in some games
+	- Deadlock on server exit when streaming at high (8K) resolution
 
 ## Dependencies:
-AMD Interactive Streaming SDK depends on a number of other components from AMD and third parties:
+Advanced Interactive Streaming SDK depends on a number of other components from AMD and third parties:
 - [Advanced Media Framework (AMF SDK)](https://github.com/GPUOpen-LibrariesAndSDKs/AMF) for video encoding/decoding/processing
 - [MbedTLS](https://github.com/Mbed-TLS/mbedtls) for encryption
 - [Ffmpeg](https://github.com/FFmpeg/FFmpeg) for audio encoding/decoding/resampling
 
 ## License:
-AMD Interactive Streaming SDK is distributed in open source under the [MIT license](LICENSE.md)
+Advanced Interactive Streaming SDK is distributed in open source under the [MIT license](LICENSE.md)
 
 ## Documentation:
 Comprehensive documentation is provided by the [Streaming SDK Wiki](https://github.com/GPUOpen-LibrariesAndSDKs/Streaming-SDK/wiki)

samples/RemoteDesktopServer/AVStreamer.cpp

@@ -603,7 +603,6 @@ void AVStreamer::CaptureVideo()
     {
         amf::AMFSurfacePtr frame(capturedData);
         m_TimestampCalibrator.SubmitVideo(frame);   //  This synchronizes low latency video timestamp to audio. See notes in sdk/util/pipeline/TimestampCalibrator.h for detailed explanations
-        amf::AMFLock    lock(&m_Guard);
         m_VideoOutput->SubmitInput(frame, lastOriginPts, timeOfLastOriginPts);
     }
 }
@@ -615,7 +614,6 @@ void AVStreamer::CaptureAudio()
     {
         amf::AMFAudioBufferPtr buffer(capturedData);
         m_TimestampCalibrator.SubmitAudio(buffer);
-        amf::AMFLock    lock(&m_Guard);
         m_AudioOutput->SubmitInput(buffer);
     }
 }

sdk/controllers/client/win/MouseCursorWin.cpp

@@ -52,7 +52,7 @@ namespace ssdk::ctls
     {
         amf::AMFLock lock(&m_cs);
 
-        if (m_pCursor == nullptr || m_bShowCursor == false)
+        if (m_pCursor == nullptr)
         {
             return;
         }
@@ -183,7 +183,7 @@ namespace ssdk::ctls
 
         if (bShownOld != bShownNew)
         {
-            if (m_pCursor == nullptr || m_bShowCursor == false)
+            if (m_pCursor == nullptr)
             {
                 ::PostMessage(HWND(m_hWindow), WM_USER_SHOW_CURSOR, 0, FALSE);
             }
@@ -198,6 +198,8 @@ namespace ssdk::ctls
     void MouseCursorWin::OnCursorHidden()
     {
         ::PostMessage(HWND(m_hWindow), WM_USER_SHOW_CURSOR, 0, FALSE);
+        amf::AMFLock lock(&m_cs);
+        m_pCursor = nullptr;
     }
 
     //-------------------------------------------------------------------------------------------------

sdk/controllers/server/ControllerManagerSvr.cpp

@@ -244,6 +244,7 @@ namespace ssdk::ctls::svr
 
     void ControllerManager::OnConnectionEstablished()
     {
+        amf::AMFLock lock(&m_Guard);
         for (std::vector<ControllerBase::Ptr>::iterator it = m_Controllers.begin(); it != m_Controllers.end(); it++)
         {
             (*it)->OnConnectionEstablished();
@@ -252,6 +253,7 @@ namespace ssdk::ctls::svr
 
     void ControllerManager::OnConnectionTerminated()
     {
+        amf::AMFLock lock(&m_Guard);
         for (std::vector<ControllerBase::Ptr>::iterator it = m_Controllers.begin(); it != m_Controllers.end(); it++)
         {
             (*it)->OnConnectionTerminated();
@@ -260,6 +262,7 @@ namespace ssdk::ctls::svr
 
     void ControllerManager::Update()
     {
+        amf::AMFLock lock(&m_Guard);
         for (std::vector<ControllerBase::Ptr>::iterator it = m_Controllers.begin(); it != m_Controllers.end(); it++)
         {
             (*it)->Update();

sdk/transports/transport-amd/ServerTransportImpl.cpp

@@ -858,7 +858,6 @@ namespace ssdk::transport_amd
         // Find subscriber and send video data to client
         Result result = Result::FAIL;
         Subscriber::Ptr pSubscriber = FindSubscriber(m_Sessions[session]);
-        amf::AMFLock lock(&m_Guard);
         if (pSubscriber != nullptr)
         {
             result = pSubscriber->TransmitMessage(Channel::VIDEO_OUT, bufToSend.GetData(), bufToSend.GetSize());
@@ -1545,24 +1544,28 @@ namespace ssdk::transport_amd
     //-------------------------------------------------------------------------------------------------
     bool ServerTransportImpl::DeleteSubscriber(Session* session, TerminationReason reason)
     {
-        amf::AMFLock lock(&m_Guard);
-
-        Subscribers::iterator it = m_Subscribers.find(session);
-        if (it != m_Subscribers.end())
+        ConnectionManagerCallback* pCMCallback = nullptr;
+        SessionHandle hSession = session->GetSessionHandle();
+        bool result = false;
         {
-            Subscriber::Ptr pSubscriber = it->second;
-            m_Subscribers.erase(it);
+            amf::AMFLock lock(&m_Guard);
 
-            ConnectionManagerCallback* pCMCallback = m_InitParams.GetConnectionManagerCallback();
-            SessionHandle hSession = session->GetSessionHandle();
-            if (pCMCallback != nullptr)
+            Subscribers::iterator it = m_Subscribers.find(session);
+            if (it != m_Subscribers.end())
             {
-                pCMCallback->OnClientDisconnected(hSession, reason == TerminationReason::DISCONNECT ? ConnectionManagerCallback::DisconnectReason::CLIENT_DISCONNECTED : ConnectionManagerCallback::DisconnectReason::TIMEOUT);
+                Subscriber::Ptr pSubscriber = it->second;
+                m_Subscribers.erase(it);
+
+                pCMCallback = m_InitParams.GetConnectionManagerCallback();
+                result = true;
             }
-            return true;
+        }
+        if (pCMCallback != nullptr)
+        {
+            pCMCallback->OnClientDisconnected(hSession, reason == TerminationReason::DISCONNECT ? ConnectionManagerCallback::DisconnectReason::CLIENT_DISCONNECTED : ConnectionManagerCallback::DisconnectReason::TIMEOUT);
         }
 
-        return false;
+        return result;
     }
 
     ssdk::util::AESPSKCipher::Ptr ServerTransportImpl::FindCipherForSession(SessionHandle session)