Merge pull request #11389 from Memphiz/vtb_choppy_bp

[osx] - fix refclock after refreshrate change and re-add videoscreen.delayrefreshchange
xbmc · Jan 11, 2017 · 413464b · 413464b
2 parents 77d3a00 + 6b0d017
commit 413464b
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/xbmc/windowing/osx/WinSystemOSX.h b/xbmc/windowing/osx/WinSystemOSX.h
@@ -79,6 +79,7 @@ class CWinSystemOSX : public CWinSystemBase, public ITimerCallback
 
   void        AnnounceOnLostDevice();
   void        AnnounceOnResetDevice();
+  void        HandleOnResetDevice();
   void        StartLostDeviceTimer();
   void        StopLostDeviceTimer();
 
@@ -119,6 +120,8 @@ class CWinSystemOSX : public CWinSystemBase, public ITimerCallback
   CCriticalSection             m_resourceSection;
   std::vector<IDispResource*>  m_resources;
   CTimer                       m_lostDeviceTimer;
+  bool                         m_delayDispReset;
+  XbmcThreads::EndTime         m_dispResetTimer;
 };
 
 #endif
diff --git a/xbmc/windowing/osx/WinSystemOSX.mm b/xbmc/windowing/osx/WinSystemOSX.mm
@@ -516,7 +516,7 @@ static void DisplayReconfigured(CGDirectDisplayID display,
     if (flags & kCGDisplaySetModeFlag || flags == 0)
     {
       winsys->StopLostDeviceTimer(); // no need to timeout - we've got the callback
-      winsys->AnnounceOnResetDevice();
+      winsys->HandleOnResetDevice();
     }
   }
 
@@ -540,6 +540,7 @@ static void DisplayReconfigured(CGDirectDisplayID display,
   m_lastDisplayNr = -1;
   m_movedToOtherScreen = false;
   m_refreshRate = 0.0;
+  m_delayDispReset = false;
 }
 
 CWinSystemOSX::~CWinSystemOSX()
@@ -561,7 +562,7 @@ static void DisplayReconfigured(CGDirectDisplayID display,
 
 void CWinSystemOSX::OnTimeout()
 {
-  AnnounceOnResetDevice();
+  HandleOnResetDevice();
 }
 
 bool CWinSystemOSX::InitWindowSystem()
@@ -1741,8 +1742,33 @@ static void DisplayReconfigured(CGDirectDisplayID display,
     (*i)->OnLostDisplay();
 }
 
+void CWinSystemOSX::HandleOnResetDevice()
+{
+
+  int delay = CSettings::GetInstance().GetInt("videoscreen.delayrefreshchange");
+  if (delay > 0)
+  {
+    m_delayDispReset = true;
+    m_dispResetTimer.Set(delay * 100);
+  }
+  else
+  {
+    AnnounceOnResetDevice();
+  }
+}
+
 void CWinSystemOSX::AnnounceOnResetDevice()
 {
+  double currentFps = m_refreshRate;
+  int w = 0;
+  int h = 0;
+  int currentScreenIdx = GetCurrentScreen();
+  // ensure that graphics context knows about the current refreshrate before
+  // doing the callbacks
+  GetScreenResolution(&w, &h, &currentFps, currentScreenIdx);
+
+  g_graphicsContext.SetFPS(currentFps);
+
   CSingleLock lock(m_resourceSection);
   // tell any shared resources
   CLog::Log(LOGDEBUG, "CWinSystemOSX::AnnounceOnResetDevice");

diff --git a/xbmc/windowing/osx/WinSystemOSXGL.mm b/xbmc/windowing/osx/WinSystemOSXGL.mm
@@ -41,6 +41,12 @@
 {
   if (rendered)
     FlushBuffer();
+
+  if (m_delayDispReset && m_dispResetTimer.IsTimePast())
+  {
+    m_delayDispReset = false;
+    AnnounceOnResetDevice();
+  }
 }
 
 void CWinSystemOSXGL::SetVSyncImpl(bool enable)