VideoPlayer: consider offset to vsync

xbmc/Application.cpp

@@ -1883,8 +1883,6 @@ void CApplication::Render()
     g_infoManager.UpdateFPS();
   }
 
-  m_pPlayer->AfterRender();
-
   // TODO: find better solution
   // if video is rendered to a separate layer, we should not block this thread
   if (!m_pPlayer->IsRenderingVideoLayer() || hasRendered)

xbmc/ApplicationPlayer.cpp

@@ -790,13 +790,6 @@ void CApplicationPlayer::Render(bool clear, uint32_t alpha, bool gui)
     player->Render(clear, alpha, gui);
 }
 
-void CApplicationPlayer::AfterRender()
-{
-  std::shared_ptr<IPlayer> player = GetInternal();
-  if (player)
-    player->AfterRender();
-}
-
 void CApplicationPlayer::FlushRenderer()
 {
   std::shared_ptr<IPlayer> player = GetInternal();

xbmc/ApplicationPlayer.h

@@ -82,7 +82,6 @@ class CApplicationPlayer
   void FrameMove();
   bool HasFrame();
   void Render(bool clear, uint32_t alpha = 255, bool gui = true);
-  void AfterRender();
   void FlushRenderer();
   void SetRenderViewMode(int mode);
   float GetRenderAspectRatio();

xbmc/cores/IPlayer.h

@@ -394,8 +394,6 @@ class IPlayer
 
   virtual void Render(bool clear, uint32_t alpha = 255, bool gui = true) {};
 
-  virtual void AfterRender() {};
-
   virtual void FlushRenderer() {};
 
   virtual void SetRenderViewMode(int mode) {};

xbmc/cores/VideoPlayer/DVDAudio.cpp

@@ -332,9 +332,8 @@ void CDVDAudio::SetResampleMode(int mode)
 
 double CDVDAudio::GetClock()
 {
-  double absolute;
   if (m_pClock)
-    return m_pClock->GetClock(absolute) / DVD_TIME_BASE * 1000;
+    return (m_pClock->GetClock() + m_pClock->GetVsyncAdjust()) / DVD_TIME_BASE * 1000;
   else
     return 0.0;
 }

xbmc/cores/VideoPlayer/DVDClock.cpp

@@ -39,6 +39,8 @@ CDVDClock::CDVDClock()
   m_systemAdjust = 0;
   m_speedAdjust = 0;
   m_startClock = 0;
+  m_vSyncAdjust = 0;
+  m_frameTime = DVD_TIME_BASE / 60;
 
   m_videoRefClock.reset(new CVideoReferenceClock());
   m_lastSystemTime = m_videoRefClock->GetTime();
@@ -86,6 +88,18 @@ double CDVDClock::GetClock(double& absolute, bool interpolated /*= true*/)
   return SystemToPlaying(current);
 }
 
+void CDVDClock::SetVsyncAdjust(double adjustment)
+{
+  CSingleLock lock(m_critSection);
+  m_vSyncAdjust = adjustment;
+}
+
+double CDVDClock::GetVsyncAdjust()
+{
+  CSingleLock lock(m_critSection);
+  return m_vSyncAdjust;
+}
+
 void CDVDClock::SetSpeed(int iSpeed)
 {
   // this will sometimes be a little bit of due to rounding errors, ie clock might jump abit when changing speed
@@ -124,38 +138,40 @@ double CDVDClock::GetSpeedAdjust()
   return m_speedAdjust;
 }
 
-bool CDVDClock::Update(double clock, double absolute, double limit, const char* log)
+double CDVDClock::ErrorAdjust(double error, const char* log)
 {
-  double was_absolute;
-  double was_clock;
-
-  {
-    CSingleLock lock(m_critSection);
-    was_absolute = SystemToAbsolute(m_startClock);
-    was_clock = m_iDisc + absolute - was_absolute;
-  }
+  CSingleLock lock(m_critSection);
 
-  double error = std::abs(clock - was_clock);
+  double clock, absolute, adjustment;
+  clock = GetClock(absolute);
 
   // skip minor updates while speed adjust is active
   // -> adjusting buffer levels
   if (m_speedAdjust != 0 && error < DVD_MSEC_TO_TIME(100))
   {
-    return false;
+    return 0;
   }
-  else if (error > limit)
+
+  adjustment = error;
+
+  if (m_vSyncAdjust != 0)
   {
-    Discontinuity(clock, absolute);
-
-    CLog::Log(LOGDEBUG, "CDVDClock::Discontinuity - %s - was:%f, should be:%f, error:%f"
-                      , log
-                      , was_clock
-                      , clock
-                      , clock - was_clock);
-    return true;
+    if (error > 0.5 * m_frameTime)
+      adjustment = m_frameTime;
+    else if (error < -0.5 * m_frameTime)
+      adjustment = -m_frameTime;
+    else
+      adjustment = 0;
   }
-  else
-    return false;
+
+  if (adjustment == 0)
+    return 0;
+
+  Discontinuity(clock+adjustment, absolute);
+
+  CLog::Log(LOGDEBUG, "CDVDClock::ErrorAdjust - %s - error:%f, adjusted:%f",
+                      log, error, adjustment);
+  return adjustment;
 }
 
 void CDVDClock::Discontinuity(double clock, double absolute)
@@ -168,6 +184,7 @@ void CDVDClock::Discontinuity(double clock, double absolute)
   m_bReset = false;
   m_systemAdjust = 0;
   m_speedAdjust = 0;
+  m_vSyncAdjust = 0;
 }
 
 void CDVDClock::SetMaxSpeedAdjust(double speed)
@@ -184,6 +201,8 @@ int CDVDClock::UpdateFramerate(double fps, double* interval /*= NULL*/)
   if(fps == 0.0)
     return -1;
 
+  m_frameTime = 1/fps * DVD_TIME_BASE;
+
   //check if the videoreferenceclock is running, will return -1 if not
   double rate = m_videoRefClock->GetRefreshRate(interval);
 
@@ -242,6 +261,7 @@ double CDVDClock::SystemToPlaying(int64_t system)
     m_iDisc = 0;
     m_systemAdjust = 0;
     m_speedAdjust = 0;
+    m_vSyncAdjust = 0;
     m_bReset = false;
   }
 

xbmc/cores/VideoPlayer/DVDClock.h

@@ -47,7 +47,7 @@ class CDVDClock
   double GetClock(bool interpolated = true);
   double GetClock(double& absolute, bool interpolated = true);
 
-  bool Update(double clock, double absolute, double limit, const char* log);
+  double ErrorAdjust(double error, const char* log);
   void Discontinuity(double clock, double absolute);
   void Discontinuity(double clock = 0LL)
   {
@@ -72,6 +72,8 @@ class CDVDClock
 
   double GetRefreshRate();
   bool GetClockInfo(int& MissedVblanks, double& ClockSpeed, double& RefreshRate) const;
+  void SetVsyncAdjust(double adjustment);
+  double GetVsyncAdjust();
 
 protected:
   double SystemToAbsolute(int64_t system);
@@ -93,6 +95,8 @@ class CDVDClock
   int64_t m_systemAdjust;
   int64_t m_lastSystemTime;
   double m_speedAdjust;
+  double m_vSyncAdjust;
+  double m_frameTime;
 
   double m_maxspeedadjust;
   CCriticalSection m_speedsection;

xbmc/cores/VideoPlayer/VideoPlayer.cpp

@@ -4933,11 +4933,6 @@ void CVideoPlayer::Render(bool clear, uint32_t alpha, bool gui)
   m_renderManager.Render(clear, 0, alpha, gui);
 }
 
-void CVideoPlayer::AfterRender()
-{
-  m_renderManager.FrameFinish();
-}
-
 void CVideoPlayer::FlushRenderer()
 {
   m_renderManager.Flush();

xbmc/cores/VideoPlayer/VideoPlayer.h

@@ -317,7 +317,6 @@ class CVideoPlayer : public IPlayer, public CThread, public IVideoPlayer, public
   virtual void FrameMove();
   virtual bool HasFrame();
   virtual void Render(bool clear, uint32_t alpha = 255, bool gui = true);
-  virtual void AfterRender();
   virtual void FlushRenderer();
   virtual void SetRenderViewMode(int mode);
   float GetRenderAspectRatio();

xbmc/cores/VideoPlayer/VideoPlayerAudio.cpp

@@ -530,14 +530,12 @@ bool CVideoPlayerAudio::OutputPacket(DVDAudioFrame &audioframe)
   if (m_synctype == SYNC_DISCON)
   {
     double limit, error;
-    limit = DVD_MSEC_TO_TIME(10);
     error = syncerror;
 
-    double absolute;
-    double clock = m_pClock->GetClock(absolute);
-    if (m_pClock->Update(clock + error, absolute, limit - 0.001, "CVideoPlayerAudio::OutputPacket"))
+    double correction = m_pClock->ErrorAdjust(error, "CVideoPlayerAudio::OutputPacket");
+    if (correction != 0)
     {
-      m_dvdAudio.SetSyncErrorCorrection(-error);
+      m_dvdAudio.SetSyncErrorCorrection(-correction);
     }
   }
   m_dvdAudio.AddPackets(audioframe);