[rbp/omxplayer] fixed subtitle display time. fixes #13861

xbmc · Jan 3, 2013 · c47e925 · c47e925
1 parent f92ecf8
commit c47e925
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp
@@ -443,7 +443,7 @@ void OMXPlayerVideo::Output(int iGroupId, double pts, bool bDropPacket)
   m_dropbase = 0.0f;
 #endif
 
-  double pts_media = m_av_clock->OMXMediaTime();
+  double pts_media = m_av_clock->OMXMediaTime(false, false);
   ProcessOverlays(iGroupId, pts_media);
 
   while(!CThread::m_bStop && m_av_clock->GetAbsoluteClock(false) < (iCurrentClock + iSleepTime + DVD_MSEC_TO_TIME(500)) )

diff --git a/xbmc/linux/OMXClock.cpp b/xbmc/linux/OMXClock.cpp
@@ -704,9 +704,6 @@ double OMXClock::OMXWallTime(bool lock /* = true */)
 
   pts = FromOMXTime(timeStamp.nTimestamp);
 
-  if(pts != 0.0f)
-    pts += (OMX_PRE_ROLL * 1000);
-
   if(lock)
     UnLock();
 
@@ -739,7 +736,7 @@ double OMXClock::OMXMediaTime(bool fixPreroll /* true */ , bool lock /* = true *
 
   pts = FromOMXTime(timeStamp.nTimestamp);
 
-  if(pts != 0.0f && fixPreroll)
+  if(fixPreroll)
     pts += (OMX_PRE_ROLL * 1000);
 
   if(lock)