X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=828ac66a20af1cbbff7785f039b9c1fd8a32bddb;hb=182b9d2e2feb6545592868606aaf0f0146095481;hp=4f764d203f6406dc2cd979697236abfa7eb86680;hpb=878e19aabf2278828a3c9b518e0804b2cef0c01e;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 4f764d203..828ac66a2 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,25 +18,30 @@
 
 */
 
+
 /** @file  src/lib/video_decoder.h
  *  @brief VideoDecoder class.
  */
 
+
 #ifndef DCPOMATIC_VIDEO_DECODER_H
 #define DCPOMATIC_VIDEO_DECODER_H
 
+
 #include "decoder.h"
 #include "video_content.h"
 #include "util.h"
 #include "content_video.h"
 #include "decoder_part.h"
 #include <boost/signals2.hpp>
-#include <boost/shared_ptr.hpp>
+
 
 class VideoContent;
 class ImageProxy;
 class Image;
 class Log;
+class FrameIntervalChecker;
+
 
 /** @class VideoDecoder
  *  @brief Parent for classes which decode video.
@@ -44,37 +49,29 @@ class Log;
 class VideoDecoder : public DecoderPart
 {
 public:
-	VideoDecoder (Decoder* parent, boost::shared_ptr<const Content> c, boost::shared_ptr<Log> log);
-
-	std::list<ContentVideo> get (Frame frame, bool accurate);
-
-#ifdef DCPOMATIC_DEBUG
-	int test_gaps;
-#endif
+	VideoDecoder (Decoder* parent, std::shared_ptr<const Content> c);
 
 	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 give (boost::shared_ptr<const ImageProxy>, Frame frame);
+	boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film>) const override {
+		return _position;
+	}
 
-private:
+	void seek () override;
+	void emit (std::shared_ptr<const Film> film, std::shared_ptr<const ImageProxy>, Frame frame);
 
-	std::list<ContentVideo> decoded (Frame frame);
-	void fill_one_eye (Frame from, Frame to, Eyes);
-	void fill_both_eyes (VideoFrame from, VideoFrame to);
-
-	boost::shared_ptr<const Content> _content;
-	std::list<ContentVideo> _decoded;
-	boost::shared_ptr<Image> _black_image;
-	boost::optional<ContentTime> _last_seek_time;
-	bool _last_seek_accurate;
-	/** 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;
+	boost::signals2::signal<void (ContentVideo)> Data;
+
+private:
+	std::shared_ptr<const Content> _content;
+	/** Eyes of last thing to be emitted; only used for THREE_D_ALTERNATE */
+	boost::optional<Eyes> _last_emitted_eyes;
+	boost::optional<dcpomatic::ContentTime> _position;
+	boost::scoped_ptr<FrameIntervalChecker> _frame_interval_checker;
 };
 
+
 #endif