From 97d39f46795af78b84d5f7bc9118a188f2864781 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 7 Oct 2016 16:22:38 +0100 Subject: 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. --- src/lib/ffmpeg_decoder.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/lib/ffmpeg_decoder.h') diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index 76755c1fc..dfe1f2694 100644 --- a/src/lib/ffmpeg_decoder.h +++ b/src/lib/ffmpeg_decoder.h @@ -52,6 +52,7 @@ private: bool pass (PassReason, bool accurate); void seek (ContentTime time, bool); void flush (); + void update_position (ContentTime p); AVSampleFormat audio_sample_format (boost::shared_ptr stream) const; int bytes_per_audio_sample (boost::shared_ptr stream) const; -- cgit v1.2.3