Merge master into direct-mxf.

[dcpomatic.git] / src / lib / ffmpeg_decoder.h

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 2011ef72f9f416661ce2394d15eb4e7bafb12c7c..9a4e65ebc2ccd7a4db041df1dae59f6f03ec03e9 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -86,11 +86,11 @@ private:
 class FFmpegDecoder : public VideoDecoder, public AudioDecoder
 {
 public:
-       FFmpegDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const DecodeOptions>, Job *);
+       FFmpegDecoder (boost::shared_ptr<Film>, DecodeOptions, Job *);
        ~FFmpegDecoder ();
 
        float frames_per_second () const;
-       Size native_size () const;
+       libdcp::Size native_size () const;
        SourceFrame length () const;
        int time_base_numerator () const;
        int time_base_denominator () const;
@@ -100,17 +100,20 @@ public:
        void set_audio_stream (boost::shared_ptr<AudioStream>);
        void set_subtitle_stream (boost::shared_ptr<SubtitleStream>);
 
-       bool seek (SourceFrame);
+       bool seek (double);
+       bool seek_to_last ();
 
 private:
 
        bool pass ();
+       bool do_seek (double p, bool);
        PixelFormat pixel_format () const;
        AVSampleFormat audio_sample_format () const;
        int bytes_per_audio_sample () const;
 
        void out_with_sync ();
        void filter_and_emit_video (AVFrame *);
+       double frame_time () const;
 
        void setup_general ();
        void setup_video ();