X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=6e4fd48c0019710a2632e921d35645efa119c239;hb=b5019f1495234d2c9b5658285b039e2b2d36c875;hp=fb782cd7eaea8ed30b4f136b56584be7c1d53f5f;hpb=40532d61ea4909b3f8b12dd7024de217dbdfec6d;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index fb782cd7e..6e4fd48c0 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -24,57 +24,60 @@
 #include "stream.h"
 #include "decoder.h"
 
-class VideoDecoder : public VideoSource, public virtual Decoder
+class VideoDecoder : public TimedVideoSource, public virtual Decoder
 {
 public:
-	VideoDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
+	VideoDecoder (boost::shared_ptr<Film>, DecodeOptions);
 
 	/** @return video frames per second, or 0 if unknown */
 	virtual float frames_per_second () const = 0;
 	/** @return native size in pixels */
-	virtual Size native_size () const = 0;
+	virtual libdcp::Size native_size () const = 0;
+	/** @return length (in source video frames), according to our content's header */
+	virtual SourceFrame 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;
 
-	virtual void set_subtitle_stream (boost::optional<SubtitleStream>);
+	virtual void set_subtitle_stream (boost::shared_ptr<SubtitleStream>);
 
-	void set_progress () const;
+	void set_progress (Job *) const;
 	
-	SourceFrame video_frame () const {
+	int video_frame () const {
 		return _video_frame;
 	}
 
-	boost::optional<SubtitleStream> subtitle_stream () const {
+	boost::shared_ptr<SubtitleStream> subtitle_stream () const {
 		return _subtitle_stream;
 	}
 
-	std::vector<SubtitleStream> subtitle_streams () const {
+	std::vector<boost::shared_ptr<SubtitleStream> > subtitle_streams () const {
 		return _subtitle_streams;
 	}
 
+	double last_source_time () const {
+		return _last_source_time;
+	}
+
 protected:
 	
 	virtual PixelFormat pixel_format () const = 0;
 
-	void emit_video (boost::shared_ptr<Image>);
+	void emit_video (boost::shared_ptr<Image>, bool, double);
 	void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
-	void repeat_last_video ();
 
-	boost::optional<SubtitleStream> _subtitle_stream;
-	std::vector<SubtitleStream> _subtitle_streams;
+	/** Subtitle stream to use when decoding */
+	boost::shared_ptr<SubtitleStream> _subtitle_stream;
+	/** Subtitle streams that this decoder's content has */
+	std::vector<boost::shared_ptr<SubtitleStream> > _subtitle_streams;
 
 private:
-	void signal_video (boost::shared_ptr<Image>, boost::shared_ptr<Subtitle>);
-
-	SourceFrame _video_frame;
-
+	int _video_frame;
+	double _last_source_time;
+	
 	boost::shared_ptr<TimedSubtitle> _timed_subtitle;
-
-	boost::shared_ptr<Image> _last_image;
-	boost::shared_ptr<Subtitle> _last_subtitle;
 };
 
 #endif