Basics of splitting up Decoder tree like Content.

[dcpomatic.git] / src / lib / subtitle_decoder.cc

diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index 30b8661ae640d6ca386e08602e64cb3af8d8ad65..e9692b99f586f752a53928f9f2492b1716d12e5b 100644 (file)
--- a/src/lib/subtitle_decoder.cc
+++ b/src/lib/subtitle_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -27,9 +27,18 @@ using std::list;
 using std::cout;
 using boost::shared_ptr;
 using boost::optional;
-
-SubtitleDecoder::SubtitleDecoder (shared_ptr<const SubtitleContent> c)
-       : _subtitle_content (c)
+using boost::function;
+
+SubtitleDecoder::SubtitleDecoder (
+       Decoder* parent,
+       shared_ptr<const SubtitleContent> c,
+       function<list<ContentTimePeriod> (ContentTimePeriod, bool)> image_subtitles_during,
+       function<list<ContentTimePeriod> (ContentTimePeriod, bool)> text_subtitles_during
+       )
+       : _parent (parent)
+       , _subtitle_content (c)
+       , _image_subtitles_during (image_subtitles_during)
+       , _text_subtitles_during (text_subtitles_during)
 {
 
 }
@@ -56,21 +65,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);
        }
@@ -79,7 +81,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(PASS_REASON_SUBTITLE) && (subs.empty() || (subs.back().period().to < sp.back().to))) {}
+       while (!_parent->pass(Decoder::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 */
@@ -112,15 +114,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