diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-10-16 17:19:30 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-10-16 17:19:30 +0100 |
| commit | bd709c1e98e7653dafe7dff302440a7890140c7d (patch) | |
| tree | 5ed050d67e30195e665f5475322d27d7790c2b23 /src/lib/subtitle_decoder.cc | |
| parent | f0da433894308ed72b0dbdd116a30a8d659c33cc (diff) | |
| parent | f09e6545efa4c5ca816e89e28a287bc6ab1ee50b (diff) | |
Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic
Diffstat (limited to 'src/lib/subtitle_decoder.cc')
| -rw-r--r-- | src/lib/subtitle_decoder.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc index a95964f47..85b814d58 100644 --- 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 */ |