diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-10-07 16:22:38 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-11-17 01:06:31 +0000 |
| commit | 97d39f46795af78b84d5f7bc9118a188f2864781 (patch) | |
| tree | 354ad3d03ba0bf545fc76102c907dab2d31a0b08 /src/lib/video_decoder.cc | |
| parent | 987e2daa218ab39c6ddc3780667eedaab1c0872e (diff) | |
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.
Diffstat (limited to 'src/lib/video_decoder.cc')
| -rw-r--r-- | src/lib/video_decoder.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc index 0d7cbfe2e..f240640d0 100644 --- a/src/lib/video_decoder.cc +++ b/src/lib/video_decoder.cc @@ -86,7 +86,12 @@ VideoDecoder::get (Frame frame, bool accurate) _log->log (String::compose ("VD has request for %1", frame), LogEntry::TYPE_DEBUG_DECODE); - if (_decoded.empty() || frame < _decoded.front().frame.index() || frame > (_decoded.back().frame.index() + 1)) { + /* See if we have frame, and suggest a seek if not */ + list<ContentVideo>::const_iterator i = _decoded.begin (); + while (i != _decoded.end() && i->frame.index() != frame) { + ++i; + } + if (i == _decoded.end()) { Frame seek_frame = frame; if (_content->video->frame_type() == VIDEO_FRAME_TYPE_3D_ALTERNATE) { /* 3D alternate is a special case as the frame index in the content is not the same @@ -94,8 +99,7 @@ VideoDecoder::get (Frame frame, bool accurate) */ seek_frame *= 2; } - _log->log (String::compose ("VD seeks to %1", seek_frame), LogEntry::TYPE_DEBUG_DECODE); - _parent->seek (ContentTime::from_frames (seek_frame, _content->active_video_frame_rate()), accurate); + _parent->maybe_seek (ContentTime::from_frames (seek_frame, _content->active_video_frame_rate()), accurate); } /* Work out the number of frames that we should return; we |