From c47e925c8e044521a9321614882947f03e5754b0 Mon Sep 17 00:00:00 2001 From: gimli Date: Thu, 3 Jan 2013 13:40:38 +0100 Subject: [PATCH] [rbp/omxplayer] fixed subtitle display time. fixes #13861 --- xbmc/cores/omxplayer/OMXPlayerVideo.cpp | 2 +- xbmc/linux/OMXClock.cpp | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/xbmc/cores/omxplayer/OMXPlayerVideo.cpp b/xbmc/cores/omxplayer/OMXPlayerVideo.cpp index 065cd739ba610..7b0a5d24821f4 100644 --- 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 index e28c0b9d12080..41fd0a8714015 100644 --- 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)