added: overload of CDVDClock::GetClock that also returns the absolute…

… dvdclock time, this fixes a problem in CDVDPlayerVideo::OutputPicture() where two different clock samples were used to convert a pts into a presenttime, if the clock moves forward in between calls, so does the presenttime
xbmc · Jul 8, 2011 · 41da564 · TheSwissKnife · Jul 8, 2011 · bobo1on1
1 parent b366660
commit 41da564
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/xbmc/cores/dvdplayer/DVDClock.cpp b/xbmc/cores/dvdplayer/DVDClock.cpp
@@ -96,6 +96,19 @@ double CDVDClock::GetClock(bool interpolated /*= true*/)
   return SystemToPlaying(g_VideoReferenceClock.GetTime(interpolated));
 }
 
+double CDVDClock::GetClock(double& absolute, bool interpolated /*= true*/)
+{
+  int64_t current = g_VideoReferenceClock.GetTime(interpolated);
+  {
+    CSingleLock lock(m_systemsection);
+    CheckSystemClock();
+    absolute = SystemToAbsolute(current);
+  }
+
+  CSharedLock lock(m_critSection);
+  return SystemToPlaying(current);
+}
+
 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

diff --git a/xbmc/cores/dvdplayer/DVDClock.h b/xbmc/cores/dvdplayer/DVDClock.h
@@ -43,6 +43,7 @@ class CDVDClock
   ~CDVDClock();
 
   double GetClock(bool interpolated = true);
+  double GetClock(double& absolute, bool interpolated = true);
 
   void Discontinuity(double currentPts = 0LL);
 

diff --git a/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp b/xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
@@ -1041,10 +1041,10 @@ int CDVDPlayerVideo::OutputPicture(DVDVideoPicture* pPicture, double pts)
   pts += m_iVideoDelay;
 
   // calculate the time we need to delay this picture before displaying
-  double iSleepTime, iClockSleep, iFrameSleep, iCurrentClock, iFrameDuration;
+  double iSleepTime, iClockSleep, iFrameSleep, iPlayingClock, iCurrentClock, iFrameDuration;
 
-  iCurrentClock = m_pClock->GetAbsoluteClock(false); // snapshot current clock
-  iClockSleep = pts - m_pClock->GetClock(false);  //sleep calculated by pts to clock comparison
+  iPlayingClock = m_pClock->GetClock(iCurrentClock, false); // snapshot current clock
+  iClockSleep = pts - iPlayingClock; //sleep calculated by pts to clock comparison
   iFrameSleep = m_FlipTimeStamp - iCurrentClock; // sleep calculated by duration of frame
   iFrameDuration = pPicture->iDuration;