diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-02 18:10:58 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-02 18:10:58 +0100 |
| commit | c88a8a6ec6b396dc90d40a4843160d616a45db76 (patch) | |
| tree | b58c18fdb6c7946446ae244747fa7b4461fd9661 /src/lib/subtitle_decoder.cc | |
| parent | 712f8144f1992364d79a80b2b586248423f7ac11 (diff) | |
Hopefully improve subtitle decoder seeking etc.
Diffstat (limited to 'src/lib/subtitle_decoder.cc')
| -rw-r--r-- | src/lib/subtitle_decoder.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc index 1b789fdab..b8cb3e5c8 100644 --- a/src/lib/subtitle_decoder.cc +++ b/src/lib/subtitle_decoder.cc @@ -51,20 +51,23 @@ template <class T> list<T> SubtitleDecoder::get (list<T> const & subs, ContentTimePeriod period) { - if (!has_subtitle_during (period)) { + /* Get the full periods of the subtitles that are showing during the specified period */ + list<ContentTimePeriod> sp = subtitles_during (period); + if (sp.empty ()) { + /* Nothing in this period */ return list<T> (); } - if (subs.empty() || period.from < subs.front().period().from || period.to > (subs.back().period().to + ContentTime::from_seconds (10))) { - /* Either we have no decoded data, or what we do have is a long way from what we want: seek */ - seek (period.from, true); + /* 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 (sp.front().from, true); } /* Now enough pass() calls will either: * (a) give us what we want, or * (b) hit the end of the decoder. */ - while (!pass() && (subs.empty() || (subs.front().period().from > period.from || period.to < subs.back().period().to))) {} + while (!pass() && (subs.empty() || (subs.back().period().to < sp.back().to))) {} /* Now look for what we wanted in the data we have collected */ /* XXX: inefficient */ |