Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[rbp/omxplayer] Fix for subtitle flood at start of file

The test for pts==0 results in every subtitle in the overlay container being rendered at start of file.
#2565 results in every subitle from an external file being loaded into the overlay container at start of file.

This results in hundreds of subtitles being rendered which is slow and ugly. See:
https://dl.dropboxusercontent.com/u/3669512/temp/screenshot001.png

Remove this test.

Also remove setting the media_pts to the predicted media_pts as that causes a subtitle flurry after seeking while GPU fifo fills
  • Loading branch information...
commit d80875c5da8c749f23f2565ec8343a924e6365f0 1 parent c38e6b9
@popcornmix authored
Showing with 3 additions and 3 deletions.
  1. +3 −3 xbmc/cores/omxplayer/OMXPlayerVideo.cpp
View
6 xbmc/cores/omxplayer/OMXPlayerVideo.cpp
@@ -242,7 +242,7 @@ void OMXPlayerVideo::ProcessOverlays(double pts)
double pts2 = pOverlay->bForced ? pts : pts - m_iSubtitleDelay;
- if((pOverlay->iPTSStartTime <= pts2 && (pOverlay->iPTSStopTime > pts2 || pOverlay->iPTSStopTime == 0LL)) || pts == 0)
+ if((pOverlay->iPTSStartTime <= pts2 && (pOverlay->iPTSStopTime > pts2 || pOverlay->iPTSStopTime == 0LL))/* || pts == 0*/)
{
if(pOverlay->IsOverlayType(DVDOVERLAY_TYPE_GROUP))
overlays.insert(overlays.end(), static_cast<CDVDOverlayGroup*>(pOverlay)->m_overlays.begin()
@@ -299,8 +299,8 @@ void OMXPlayerVideo::Output(double pts, bool bDropPacket)
double subtitle_pts = m_nextOverlay;
double time = subtitle_pts != DVD_NOPTS_VALUE ? subtitle_pts - media_pts : 0.0;
- if (m_nextOverlay != DVD_NOPTS_VALUE)
- media_pts = m_nextOverlay;
+ //if (m_nextOverlay != DVD_NOPTS_VALUE)
+ // media_pts = m_nextOverlay;
m_nextOverlay = NextOverlay(media_pts);
Please sign in to comment.
Something went wrong with that request. Please try again.