X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=86a9489b111338241dc5907cb7d8f9ad0e685229;hb=1eeba876ce09cedfa4c779bf3554372c01dc34c5;hp=5073efead72835ba87edcb3857bfd6d31805ca20;hpb=883d885dc8690519d205c8baa275385af8a39f4b;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 5073efead..86a9489b1 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,39 +20,35 @@
 #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);
 
-	/* Calls for VideoContent to find out about itself */
+	boost::optional<ContentVideo> get_video (VideoFrame frame, bool accurate);
 
-	/** @return video frame rate second, or 0 if unknown */
-	virtual float video_frame_rate () 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;
+	boost::shared_ptr<const VideoContent> video_content () const {
+		return _video_content;
+	}
 
 protected:
-	
-	void video (boost::shared_ptr<Image>, bool, Time);
-	void subtitle (boost::shared_ptr<TimedSubtitle>);
-	bool video_done () const;
 
-	Time _next_video;
-	boost::shared_ptr<const VideoContent> _video_content;
+	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<TimedSubtitle> _timed_subtitle;
-	FrameRateConversion _frame_rate_conversion;
-	bool _odd;
+	boost::shared_ptr<const VideoContent> _video_content;
+	std::list<ContentVideo> _decoded_video;
 };
 
 #endif