X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.h;h=f6ee17425b6d77b48d6b074c5d369f6cfbd888c3;hb=HEAD;hp=c2ba8386ebfa7475a8a7e9aec757e232da60bb6e;hpb=c4403784febdbdd42e9c32e67fadb147f11fe566;p=dcpomatic.git

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index c2ba8386e..f6ee17425 100644
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2018 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,29 @@
 
 */
 
+
 /** @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.h"
 #include "decoder_part.h"
+#include "video_content.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,28 +48,29 @@ class Log;
 class VideoDecoder : public DecoderPart
 {
 public:
-	VideoDecoder (Decoder* parent, boost::shared_ptr<const Content> c);
+	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);
 
-	dcpomatic::ContentTime position (boost::shared_ptr<const Film>) const {
+	boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film>) const override {
 		return _position;
 	}
 
-	void seek ();
-	void emit (boost::shared_ptr<const Film> film, boost::shared_ptr<const ImageProxy>, Frame frame);
+	void seek () override;
+	void emit (std::shared_ptr<const Film> film, std::shared_ptr<const ImageProxy>, Frame frame);
 
-	/** @return true if the emitted data was accepted, false if not */
 	boost::signals2::signal<void (ContentVideo)> Data;
 
 private:
-	/** Time of last thing to be emitted */
-	boost::shared_ptr<const Content> _content;
-	boost::optional<Frame> _last_emitted;
-	dcpomatic::ContentTime _position;
+	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