Update comment.

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

diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index a95964f4773602f0acfe88b4d468909bfce0fc81..85b814d58faa53798a4bda8a90c2c2c1e52db4fa 100644 (file)
--- a/src/lib/subtitle_decoder.cc
+++ b/src/lib/subtitle_decoder.cc
@@ -63,14 +63,7 @@ SubtitleDecoder::get (list<T> const & subs, list<ContentTimePeriod> const & sp,
                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 +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) && (subs.empty() || (subs.back().period().to < sp.back().to))) {}
 
        /* Now look for what we wanted in the data we have collected */
        /* XXX: inefficient */