X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=f5c3cd743ba43bf3df96d4a1706507a33a0e3a95;hb=8d58a7c5f4320ad5c111e336c45e44d6b51ab509;hp=b47d7fc3a3fb56909e9a120d216a9207e6b00571;hpb=a183c1776cfd020a37d028ebb0f641352f49697b;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index b47d7fc3a..f5c3cd743 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,46 +17,50 @@
 
 */
 
+/** @file  src/lib/video_decoder.h
+ *  @brief VideoDecoder class.
+ */
+
 #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 ImageProxy;
 
-class VideoDecoder : public VideoSource, public virtual Decoder
+/** @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);
 
-	virtual void seek (Time);
-	virtual void seek_back ();
-	virtual void seek_forward ();
-	
-	/* Calls for VideoContent to find out about itself */
+	boost::shared_ptr<const VideoContent> video_content () const {
+		return _video_content;
+	}
 
-	/** @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;
+#ifdef DCPOMATIC_DEBUG
+	int test_gaps;
+#endif
 
 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 ImageProxy>, VideoFrame frame);
+	std::list<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;
+	bool _same;
 };
 
 #endif