X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubtitle_decoder.cc;h=454243b524d279b65eeaa7b57eacdc4f43cabab9;hb=a28709f05088fea7337ca37c7854f85bf30fcaee;hp=5336686165d6dc12dbe94a1b15fb237f42dbafcf;hpb=d7828e4dd74716019fdc982a105b158f8a328131;p=dcpomatic.git

diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index 533668616..454243b52 100644
--- a/src/lib/subtitle_decoder.cc
+++ b/src/lib/subtitle_decoder.cc
@@ -21,6 +21,7 @@
 #include "subtitle_content.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/foreach.hpp>
+#include <iostream>
 
 using std::list;
 using std::cout;
@@ -55,21 +56,14 @@ SubtitleDecoder::text_subtitle (ContentTimePeriod period, list<dcp::SubtitleStri
 /** @param sp Full periods of subtitles that are showing or starting during the specified period */
 template <class T>
 list<T>
-SubtitleDecoder::get (list<T> const & subs, list<ContentTimePeriod> const & sp, ContentTimePeriod period, bool starting)
+SubtitleDecoder::get (list<T> const & subs, list<ContentTimePeriod> const & sp, ContentTimePeriod period, bool starting, bool accurate)
 {
 	if (sp.empty ()) {
 		/* Nothing in this period */
 		return list<T> ();
 	}
 
-	/* 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.
-	*/
+	/* Seek if what we want is before what we have, or a more than a little bit after */
 	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);
 	}
@@ -78,7 +72,7 @@ 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 () && (subs.empty() || (subs.back().period().to < sp.back().to))) {}
+	while (!pass(PASS_REASON_SUBTITLE, accurate) && (subs.empty() || (subs.back().period().to < sp.back().to))) {}
 
 	/* Now look for what we wanted in the data we have collected */
 	/* XXX: inefficient */
@@ -111,15 +105,15 @@ SubtitleDecoder::get (list<T> const & subs, list<ContentTimePeriod> const & sp,
 }
 
 list<ContentTextSubtitle>
-SubtitleDecoder::get_text_subtitles (ContentTimePeriod period, bool starting)
+SubtitleDecoder::get_text_subtitles (ContentTimePeriod period, bool starting, bool accurate)
 {
-	return get<ContentTextSubtitle> (_decoded_text_subtitles, text_subtitles_during (period, starting), period, starting);
+	return get<ContentTextSubtitle> (_decoded_text_subtitles, text_subtitles_during (period, starting), period, starting, accurate);
 }
 
 list<ContentImageSubtitle>
-SubtitleDecoder::get_image_subtitles (ContentTimePeriod period, bool starting)
+SubtitleDecoder::get_image_subtitles (ContentTimePeriod period, bool starting, bool accurate)
 {
-	return get<ContentImageSubtitle> (_decoded_image_subtitles, image_subtitles_during (period, starting), period, starting);
+	return get<ContentImageSubtitle> (_decoded_image_subtitles, image_subtitles_during (period, starting), period, starting, accurate);
 }
 
 void