X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=5266604c58c54fa94e5132af1146c7440d6c255f;hb=43877eccbedc0950ab253e76dd0cea691fd7a4b0;hp=f5c3cd743ba43bf3df96d4a1706507a33a0e3a95;hpb=39029279954b1f346d3ba28ec12c58211bfa7436;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index f5c3cd743..5266604c5 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 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
@@ -24,15 +24,16 @@
 #ifndef DCPOMATIC_VIDEO_DECODER_H
 #define DCPOMATIC_VIDEO_DECODER_H
 
-#include <boost/signals2.hpp>
-#include <boost/shared_ptr.hpp>
 #include "decoder.h"
 #include "video_content.h"
 #include "util.h"
 #include "content_video.h"
+#include <boost/signals2.hpp>
+#include <boost/shared_ptr.hpp>
 
 class VideoContent;
 class ImageProxy;
+class Image;
 
 /** @class VideoDecoder
  *  @brief Parent for classes which decode video.
@@ -42,25 +43,36 @@ class VideoDecoder : public virtual Decoder
 public:
 	VideoDecoder (boost::shared_ptr<const VideoContent> c);
 
-	std::list<ContentVideo> get_video (VideoFrame frame, bool accurate);
+	std::list<ContentVideo> get_video (Frame frame, bool accurate);
 
 	boost::shared_ptr<const VideoContent> video_content () const {
 		return _video_content;
 	}
 
+	void set_ignore_video ();
+
 #ifdef DCPOMATIC_DEBUG
 	int test_gaps;
 #endif
 
 protected:
+	friend struct video_decoder_fill_test1;
+	friend struct video_decoder_fill_test2;
 
 	void seek (ContentTime time, bool accurate);
-	void video (boost::shared_ptr<const ImageProxy>, VideoFrame frame);
-	std::list<ContentVideo> decoded_video (VideoFrame frame);
+	void video (boost::shared_ptr<const ImageProxy>, Frame frame);
+	std::list<ContentVideo> decoded_video (Frame frame);
+	void fill_2d (Frame from, Frame to);
+	void fill_3d (Frame from, Frame to, Eyes);
 
 	boost::shared_ptr<const VideoContent> _video_content;
 	std::list<ContentVideo> _decoded_video;
-	bool _same;
+	boost::shared_ptr<Image> _black_image;
+	boost::optional<ContentTime> _last_seek_time;
+	bool _last_seek_accurate;
+
+	/** true if this decoder should ignore all video; i.e. never produce any */
+	bool _ignore_video;
 };
 
 #endif