Fix tests.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 286a0d6e4770c7ce467a21f1edf4469d9f1dbf92..f0d140d803149b314202d462797f7360f4dfa00c 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -22,6 +22,7 @@
 
 #include "video_source.h"
 #include "decoder.h"
+#include "util.h"
 
 class VideoContent;
 
@@ -30,40 +31,35 @@ class VideoDecoder : public VideoSource, public virtual Decoder
 public:
        VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const VideoContent>);
 
+       virtual void seek (Time);
+       virtual void seek_back ();
+       virtual void seek_forward ();
+       
+       /* Calls for VideoContent to find out about itself */
+
        /** @return video frame rate second, or 0 if unknown */
        virtual float video_frame_rate () const = 0;
-       /** @return native size in pixels */
-       virtual libdcp::Size native_size () const = 0;
+       /** @return video size in pixels */
+       virtual libdcp::Size video_size () const = 0;
        /** @return length according to our content's header */
        virtual ContentVideoFrame video_length () const = 0;
 
-       virtual int time_base_numerator () const = 0;
-       virtual int time_base_denominator () const = 0;
-       virtual int sample_aspect_ratio_numerator () const = 0;
-       virtual int sample_aspect_ratio_denominator () const = 0;
-
-       void set_progress (Job *) const;
-       
-       int video_frame () const {
-               return _video_frame;
-       }
-
-       double last_content_time () const {
-               return _last_content_time;
-       }
+       void set_video_container_size (libdcp::Size);
 
 protected:
        
-       virtual PixelFormat pixel_format () const = 0;
+       void video (boost::shared_ptr<Image>, bool, Time);
+       void subtitle (boost::shared_ptr<TimedSubtitle>);
+       bool video_done () const;
 
-       void emit_video (boost::shared_ptr<Image>, bool, Time);
-       void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
+       Time _next_video;
+       boost::shared_ptr<const VideoContent> _video_content;
 
 private:
-       boost::shared_ptr<const VideoContent> _video_content;
-       int _video_frame;
-       double _last_content_time;
        boost::shared_ptr<TimedSubtitle> _timed_subtitle;
+       FrameRateConversion _frame_rate_conversion;
+       bool _odd;
+       boost::optional<libdcp::Size> _video_container_size;
 };
 
 #endif