X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_decoder.cc;h=a95964f4773602f0acfe88b4d468909bfce0fc81;hb=10a0dd6c5153019e0b17793c812f1653f26e0960;hp=2efe9afb692bdebcf3b4a3d8e44c7e655a3f02c9;hpb=4447fc2edd80d85c9779187e4f3a0405e6e4d443;p=dcpomatic.git

diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index 2efe9afb6..a95964f47 100644
--- a/src/lib/subtitle_decoder.cc
+++ b/src/lib/subtitle_decoder.cc
@@ -17,9 +17,11 @@
 
 */
 
-#include <boost/shared_ptr.hpp>
 #include "subtitle_decoder.h"
 #include "subtitle_content.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/foreach.hpp>
+#include <iostream>
 
 using std::list;
 using std::cout;
@@ -46,9 +48,9 @@ SubtitleDecoder::image_subtitle (ContentTimePeriod period, shared_ptr<Image> ima
 }
 
 void
-SubtitleDecoder::text_subtitle (list<dcp::SubtitleString> s)
+SubtitleDecoder::text_subtitle (ContentTimePeriod period, list<dcp::SubtitleString> s)
 {
-	_decoded_text_subtitles.push_back (ContentTextSubtitle (s));
+	_decoded_text_subtitles.push_back (ContentTextSubtitle (period, s));
 }
 
 /** @param sp Full periods of subtitles that are showing or starting during the specified period */
@@ -61,8 +63,15 @@ SubtitleDecoder::get (list<T> const & subs, list<ContentTimePeriod> const & sp,
 		return list<T> ();
 	}
 
-	/* Seek if what we want is before what we have, or more than a reasonable amount after */
-	if (subs.empty() || sp.back().to < subs.front().period().from || sp.front().from > (subs.back().period().to + ContentTime::from_seconds (5))) {
+	/* Seek if what we want is before what we have, or a more than a little bit after.
+	   Be careful with the length of this `little bit'; consider the case where the last
+	   subs were just less than this little bit B ago.  Then we will not seek, but instead
+	   pass() for nearly B seconds; if we are a FFmpegDecoder then this will generate B's
+	   worth of video which will stack up.  If B + the pre-roll is bigger than the maximum
+	   number of frames that the VideoDecoder will keep then we will get an assertion
+	   failure in VideoDecoder.
+	*/
+	if (subs.empty() || sp.back().to < subs.front().period().from || sp.front().from > (subs.back().period().to + ContentTime::from_seconds (1))) {
 		seek (sp.front().from, true);
 	}
 
@@ -70,11 +79,11 @@ SubtitleDecoder::get (list<T> const & subs, list<ContentTimePeriod> const & sp,
 	 *  (a) give us what we want, or
 	 *  (b) hit the end of the decoder.
 	 */
-	while (!pass(PASS_REASON_SUBTITLE) && (subs.empty() || (subs.back().period().to < sp.back().to))) {}
+	while (!pass () && (subs.empty() || (subs.back().period().to < sp.back().to))) {}
 
 	/* Now look for what we wanted in the data we have collected */
 	/* XXX: inefficient */
-	
+
 	list<T> out;
 	for (typename list<T>::const_iterator i = subs.begin(); i != subs.end(); ++i) {
 		if ((starting && period.contains (i->period().from)) || (!starting && period.overlaps (i->period ()))) {
@@ -83,7 +92,7 @@ SubtitleDecoder::get (list<T> const & subs, list<ContentTimePeriod> const & sp,
 	}
 
 	/* Discard anything in _decoded_image_subtitles that is outside 5 seconds either side of period */
-	
+
 	list<ContentImageSubtitle>::iterator i = _decoded_image_subtitles.begin();
 	while (i != _decoded_image_subtitles.end()) {
 		list<ContentImageSubtitle>::iterator tmp = i;