Apply additional changes from third patch in ticket #11455 that shoul…

…d have been applied in [e5e9cc8]. The first patch was applied by mistake. Refs #11455
MythTV · Jul 9, 2013 · 811be23 · 811be23
1 parent 010a87d
commit 811be23
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp b/mythtv/libs/libmythtv/DVD/dvdringbuffer.cpp
@@ -1540,7 +1540,7 @@ bool DVDRingBuffer::DecodeSubtitles(AVSubtitle *sub, int *gotSubtitles,
     sub->rects = NULL;
     sub->num_rects = 0;
     sub->start_display_time = startTime;
-    sub->end_display_time = 0xFFFFFFFF;
+    sub->end_display_time = startTime;
 
     cmd_pos = GETBE16(spu_pkt + 2);
     while ((cmd_pos + 4) < buf_size)

diff --git a/mythtv/libs/libmythtv/DVD/mythdvdplayer.cpp b/mythtv/libs/libmythtv/DVD/mythdvdplayer.cpp
@@ -618,6 +618,7 @@ void MythDVDPlayer::DisplayDVDButton(void)
     }
 
     if (dvdSubtitle &&
+        (dvdSubtitle->end_display_time > dvdSubtitle->start_display_time) &&
         (dvdSubtitle->end_display_time < currentFrame->timecode))
     {
         expired = true;

diff --git a/mythtv/libs/libmythtv/subtitlereader.cpp b/mythtv/libs/libmythtv/subtitlereader.cpp
@@ -60,10 +60,10 @@ bool SubtitleReader::AddAVSubtitle(const AVSubtitle &subtitle,
     m_AVSubtitles.buffers.push_back(subtitle);
     // in case forced subtitles aren't displayed, avoid leaking by
     // manually clearing the subtitles
-    if (m_AVSubtitles.buffers.size() > 20)
+    if (m_AVSubtitles.buffers.size() > 40)
     {
         LOG(VB_GENERAL, LOG_ERR,
-            "SubtitleReader: >20 AVSubtitles queued - clearing.");
+            "SubtitleReader: >40 AVSubtitles queued - clearing.");
         clearsubs = true;
     }
     m_AVSubtitles.lock.unlock();