From 9c399a21b37d83ceb2c81706975e2c46d1a3f673 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 18 Dec 2013 09:39:36 +0000 Subject: Considerable rework of decoder timing; tests pass, at least. --- src/lib/ffmpeg_decoder.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/lib/ffmpeg_decoder.h') diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index ed4557702..e50b248cf 100644 --- a/src/lib/ffmpeg_decoder.h +++ b/src/lib/ffmpeg_decoder.h @@ -51,15 +51,12 @@ public: FFmpegDecoder (boost::shared_ptr, boost::shared_ptr, bool video, bool audio); ~FFmpegDecoder (); - void pass (); - void seek (DCPTime time, bool); - bool done () const; + void seek (ContentTime time, bool); private: friend class ::ffmpeg_pts_offset_test; - static double compute_pts_offset (double, double, float); - + bool pass (); void flush (); void setup_subtitle (); @@ -74,9 +71,9 @@ private: void maybe_add_subtitle (); boost::shared_ptr deinterleave_audio (uint8_t** data, int size); - bool seek_overrun_finished (DCPTime) const; + bool seek_overrun_finished (ContentTime, ContentTime, ContentTime) const; bool seek_final_finished (int, int) const; - int minimal_run (boost::function); + int minimal_run (boost::function); void seek_and_flush (int64_t); AVCodecContext* _subtitle_codec_context; ///< may be 0 if there is no subtitle -- cgit v1.2.3