Merge pull request #1999 from linzack/fix/streamchange-audio-deadlock

[inputstream.adaptive] Fix audio deadlock on quality STREAMCHANGE

Author: CastagnaIT

src/common/ChooserDefault.cpp

@@ -91,6 +91,9 @@ void CRepresentationChooserDefault::SetSecureSession(const bool isSecureSession)
 
 void CRepresentationChooserDefault::PostInit()
 {
+  m_screenLastWidth = m_screenCurrentWidth;
+  m_screenLastHeight = m_screenCurrentHeight;
+
   RefreshResolution();
 
   if (!m_bandwidthInitAuto)
@@ -116,7 +119,7 @@ void CRepresentationChooserDefault::PostInit()
 
 void CRepresentationChooserDefault::CheckResolution()
 {
-  if (m_screenWidth != m_screenCurrentWidth || m_screenHeight != m_screenCurrentHeight)
+  if (m_screenLastWidth != m_screenCurrentWidth || m_screenLastHeight != m_screenCurrentHeight)
   {
     // Update the screen resolution values only after n seconds
     // to prevent too fast update when Kodi window will be resized
@@ -128,6 +131,8 @@ void CRepresentationChooserDefault::CheckResolution()
       return;
     }
     RefreshResolution();
+    m_screenLastWidth = m_screenCurrentWidth;
+    m_screenLastHeight = m_screenCurrentHeight;
     m_screenResLastUpdate = std::chrono::steady_clock::now();
     LOG::Log(LOGDEBUG, "[Repr. chooser] Screen resolution has changed: %ix%i", m_screenCurrentWidth,
              m_screenCurrentHeight);

src/common/ChooserDefault.h

@@ -49,6 +49,8 @@ class ATTR_DLL_LOCAL CRepresentationChooserDefault : public IRepresentationChoos
 
   int m_screenWidth{0};
   int m_screenHeight{0};
+  int m_screenLastWidth{0};
+  int m_screenLastHeight{0};
   std::optional<std::chrono::steady_clock::time_point> m_screenResLastUpdate;
 
   std::pair<int, int> m_screenResMax; // Max resolution for non-protected video content

src/main.cpp

@@ -184,10 +184,12 @@ bool CInputStreamAdaptive::OpenStream(int streamid)
   if (!stream)
     return false;
 
+  const bool isStreamChanged{stream->m_adStream.StreamChanged()};
+
   if (stream->IsEnabled())
   {
     // Stream quality changed (by "adaptive" streaming, not OSD)
-    if (stream->m_adStream.StreamChanged())
+    if (isStreamChanged)
     {
       stream->Reset();
       stream->m_adStream.Reset();
@@ -221,7 +223,7 @@ bool CInputStreamAdaptive::OpenStream(int streamid)
     }
   }
 
-  if (m_checkCoreReopen)
+  if (m_checkCoreReopen && !isStreamChanged)
   {
     LOG::Log(LOGDEBUG, "OpenStream(%d): The stream has already been opened", streamid);
     return false;