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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 8947c2708..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
@@ -25,7 +25,7 @@
 #include "decoder.h"
 #include "video_content.h"
 #include "util.h"
-#include "decoded.h"
+#include "content_video.h"
 
 class VideoContent;
 class Image;
@@ -33,16 +33,26 @@ class Image;
 class VideoDecoder : public virtual Decoder
 {
 public:
-	VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const VideoContent>);
+	VideoDecoder (boost::shared_ptr<const VideoContent> c);
+
+	boost::optional<ContentVideo> get_video (VideoFrame frame, bool accurate);
 
 	boost::shared_ptr<const VideoContent> video_content () const {
 		return _video_content;
 	}
 
+#ifdef DCPOMATIC_DEBUG
+	int test_gaps;
+#endif
+
 protected:
 
-	void video (boost::shared_ptr<const Image>, bool, VideoFrame);
+	void seek (ContentTime time, bool accurate);
+	void video (boost::shared_ptr<const Image>, VideoFrame frame);
+	boost::optional<ContentVideo> decoded_video (VideoFrame frame);
+
 	boost::shared_ptr<const VideoContent> _video_content;
+	std::list<ContentVideo> _decoded_video;
 };
 
 #endif