From ea910e250a0fb3b0ad3ce0cf32dd27b24c17cd1d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 11 Dec 2013 10:31:18 +0000 Subject: Various work on better seeking (and seeking of audio). --- src/lib/ffmpeg_decoder.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/lib/ffmpeg_decoder.h') diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index 11f83ed97..f54ee2496 100644 --- a/src/lib/ffmpeg_decoder.h +++ b/src/lib/ffmpeg_decoder.h @@ -52,7 +52,7 @@ public: ~FFmpegDecoder (); void pass (); - void seek (VideoContent::Frame, bool); + void seek (Time time, bool); bool done () const; private: @@ -74,6 +74,11 @@ private: void maybe_add_subtitle (); boost::shared_ptr deinterleave_audio (uint8_t** data, int size); + bool seek_overrun_finished (Time) const; + bool seek_final_finished (int, int) const; + int minimal_run (boost::function); + void seek_and_flush (int64_t); + AVCodecContext* _subtitle_codec_context; ///< may be 0 if there is no subtitle AVCodec* _subtitle_codec; ///< may be 0 if there is no subtitle -- cgit v1.2.3