Ticket #1686: NuppelVideoPlayer.diff

NuppelVideoPlayer.cpp

@@ -2337 +2337 @@
         DisplaySubtitles();
     else if (osdHasSubtitles)
         ClearSubtitles();
+    else
+        ExpireSubtitles();
 
     // handle scan type changes
     AutoDeint(frame);
@@ -5700 +5702 @@
 
             bool displaysub = true;
             if (nonDisplayedSubtitles.size() > 0 &&
-                nonDisplayedSubtitles.front().start_display_time < 
+                nonDisplayedSubtitles.front().end_display_time < 
                 currentFrame->timecode)
             {
                 displaysub = false;
@@ -5780 +5782 @@
     }
 }
 
+// discard non-displayed subtitles
+void NuppelVideoPlayer::ExpireSubtitles()
+{
+    subtitleLock.lock();
+    VideoFrame *currentFrame = videoOutput->GetLastShownFrame();
+
+    while (nonDisplayedSubtitles.size() > 0)
+    {
+        const AVSubtitle subtitlePage = nonDisplayedSubtitles.front();
+
+        //Stop when we hit one old enough
+        if (subtitlePage.end_display_time > currentFrame->timecode)
+            break;
+
+        nonDisplayedSubtitles.pop_front();
+
+        for (std::size_t i = 0; i < subtitlePage.num_rects; ++i)
+        {
+            AVSubtitleRect* rect = &subtitlePage.rects[i];
+            av_free(rect->rgba_palette);
+            av_free(rect->bitmap);
+        }
+        if (subtitlePage.num_rects > 0)
+            av_free(subtitlePage.rects);
+    }
+    subtitleLock.unlock();
+}
+
 // hide subtitles and free the undisplayed subtitles
 void NuppelVideoPlayer::ClearSubtitles() 
 {

NuppelVideoPlayer.h

@@ -477 +477 @@
     // Private subtitle stuff
     void  DisplaySubtitles(void);
     void  ClearSubtitles(void);
+    void  ExpireSubtitles(void);
 
     // Private LiveTV stuff
     void  SwitchToProgram(void);