X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=8715b9714cfefadcbc37c1a53016202153fb51af;hb=c86ed0c80b762d31eb68386662a7c37ae4e21b6b;hp=147dc60be02858b4898fc3b5e411b8c17d17dfcc;hpb=11c70b0e3051517e7bb96a7d6fa53053dab6e978;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 147dc60be..8715b9714 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,50 +20,39 @@
 #ifndef DCPOMATIC_VIDEO_DECODER_H
 #define DCPOMATIC_VIDEO_DECODER_H
 
-#include "video_source.h"
+#include <boost/signals2.hpp>
+#include <boost/shared_ptr.hpp>
 #include "decoder.h"
+#include "video_content.h"
+#include "util.h"
+#include "content_video.h"
 
 class VideoContent;
+class Image;
 
-class VideoDecoder : public VideoSource, public virtual Decoder
+class VideoDecoder : public virtual Decoder
 {
 public:
-	VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const VideoContent>);
+	VideoDecoder (boost::shared_ptr<const VideoContent> c);
 
-	/** @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 length according to our content's header */
-	virtual ContentVideoFrame video_length () const = 0;
+	boost::optional<ContentVideo> get_video (VideoFrame frame, bool accurate);
 
-	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;
+	boost::shared_ptr<const VideoContent> video_content () const {
+		return _video_content;
 	}
 
-	Time last_content_time () const {
-		return _last_content_time;
-	}
+#ifdef DCPOMATIC_DEBUG
+	int test_gaps;
+#endif
 
 protected:
-	
-	virtual PixelFormat pixel_format () const = 0;
 
-	void emit_video (boost::shared_ptr<Image>, bool, Time);
-	void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
+	void seek (ContentTime time, bool accurate);
+	void video (boost::shared_ptr<const Image>, VideoFrame frame);
+	boost::optional<ContentVideo> decoded_video (VideoFrame frame);
 
-private:
 	boost::shared_ptr<const VideoContent> _video_content;
-	int _video_frame;
-	Time _last_content_time;
-	boost::shared_ptr<TimedSubtitle> _timed_subtitle;
+	std::list<ContentVideo> _decoded_video;
 };
 
 #endif