A possibly-better approach to seeking.

Before this commit, decoders try to guess whether they should
request a seek based on what they have in their buffers.  This
seems reasonable for video and audio, which will always (I think)
have some data lying around to give an indication of where their
parent decoders are in the timeline.

It doesn't work so well for subtitles, as the storage of subs is
cleared out based on time (+/- 5s of "now") so there is a good chance
that the storage will be empty.  This gives the subtitle decoder no
chance of knowing where its parent is, so it's very likely to seek.

This commit asks the parent decoder to seek if it wants to, and it
decides based on a knowledge of roughly where it is in the timeline.
Hence the sub-decoders just see if they have got the data that is being
requested, and if not they suggest to the parent that it might like
to seek.  They then start calling pass().  Hence the parent should only
seek if some calls to pass() are not going to elicit the required data
in a reasonable time.

1 files changed, 15 insertions, 3 deletions

diff --git a/src/lib/subtitle_decoder.cc b/src/lib/subtitle_decoder.cc
index 307226da6..4be5c96b3 100644
--- a/src/lib/subtitle_decoder.cc
+++ b/src/lib/subtitle_decoder.cc
@@ -90,9 +90,21 @@ 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 */
-	if (subs.empty() || sp.back().to < subs.front().period().from || sp.front().from > (subs.back().period().to + ContentTime::from_seconds (1))) {
-		_parent->seek (sp.front().from, true);
+	/* Find the time of the first subtitle we don't have in subs */
+	optional<ContentTime> missing;
+	BOOST_FOREACH (ContentTimePeriod i, sp) {
+		typename list<T>::const_iterator j = subs.begin();
+		while (j != subs.end() && j->period() != i) {
+			++j;
+		}
+		if (j == subs.end ()) {
+			missing = i.from;
+		}
+	}
+
+	/* Suggest to our parent decoder that it might want to seek if we haven't got what we're being asked for */
+	if (missing) {
+		_parent->maybe_seek (*missing, true);
 	}
 
 	/* Now enough pass() calls will either: