X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=9e56546df952e5a659904b5be064f259c4b62fa8;hb=58f0530b1687673ea6e24a083063c3fdf2bff0b2;hp=d8c362354ee02b2f9614b265c6159ee1b200bf7d;hpb=521c09170d9e62cd72cc2da66c41816761008a4b;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index d8c362354..9e56546df 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
@@ -17,6 +17,10 @@
 
 */
 
+/** @file  src/lib/video_decoder.h
+ *  @brief VideoDecoder class.
+ */
+
 #ifndef DCPOMATIC_VIDEO_DECODER_H
 #define DCPOMATIC_VIDEO_DECODER_H
 
@@ -25,24 +29,44 @@
 #include "decoder.h"
 #include "video_content.h"
 #include "util.h"
-#include "decoded.h"
+#include "content_video.h"
 
 class VideoContent;
+class ImageProxy;
 class Image;
 
+/** @class VideoDecoder
+ *  @brief Parent for classes which decode video.
+ */
 class VideoDecoder : public virtual Decoder
 {
 public:
-	VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const VideoContent>);
+	VideoDecoder (boost::shared_ptr<const VideoContent> c);
+
+	std::list<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:
+	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 fill_up_to_2d (VideoFrame);
+	void fill_up_to_3d (VideoFrame, Eyes);
 
-	void video (boost::shared_ptr<const Image>, bool, ContentTime);
 	boost::shared_ptr<const VideoContent> _video_content;
+	std::list<ContentVideo> _decoded_video;
+	bool _same;
+	boost::shared_ptr<Image> _black_image;
 };
 
 #endif