X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=c14a877f267e793ad2d4fd6ffc0728a7801c6184;hb=504c63b3d62038bc486ca8a09e77fbb403907edd;hp=f5c3cd743ba43bf3df96d4a1706507a33a0e3a95;hpb=b56bc3c45953fe113a9934b0d2ec2c1134de07ab;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index f5c3cd743..c14a877f2 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-2016 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,43 +24,64 @@
 #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 Log;
 
 /** @class VideoDecoder
  *  @brief Parent for classes which decode video.
  */
-class VideoDecoder : public virtual Decoder
+class VideoDecoder
 {
 public:
-	VideoDecoder (boost::shared_ptr<const VideoContent> c);
+	VideoDecoder (Decoder* parent, boost::shared_ptr<const Content> c, boost::shared_ptr<Log> log);
 
-	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 ();
+	bool ignore_video () const {
+		return _ignore_video;
 	}
 
 #ifdef DCPOMATIC_DEBUG
 	int test_gaps;
 #endif
 
-protected:
+	friend struct video_decoder_fill_test1;
+	friend struct video_decoder_fill_test2;
+	friend struct ffmpeg_pts_offset_test;
+	friend void ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int gaps, int video_length);
 
 	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);
+
+private:
+
+	std::list<ContentVideo> decoded_video (Frame frame);
+	void fill_one_eye (Frame from, Frame to, Eyes);
+	void fill_both_eyes (Frame from, Frame to, Eyes);
 
-	boost::shared_ptr<const VideoContent> _video_content;
+	Decoder* _parent;
+	boost::shared_ptr<const Content> _video_content;
+	boost::shared_ptr<Log> _log;
 	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;
+	/** if set, this is a frame for which we got no data because the Decoder said
+	 *  it has no more to give.
+	 */
+	boost::optional<Frame> _no_data_frame;
 };
 
 #endif