From d7828e4dd74716019fdc982a105b158f8a328131 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 31 Aug 2015 17:28:49 +0100 Subject: Reduce seek-inducing slack in SubtitleDecoder; see comment. --- src/lib/subtitle_decoder.cc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/lib/subtitle_decoder.cc') diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc index d20196a63..533668616 100644 --- a/src/lib/subtitle_decoder.cc +++ b/src/lib/subtitle_decoder.cc @@ -62,8 +62,15 @@ SubtitleDecoder::get (list const & subs, list const & sp, return list (); } - /* 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); } -- cgit v1.2.3