Restore checking of 2D files that are incorrectly set as 3D.

[dcpomatic.git] / src / lib / video_decoder.h

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 2442d3173fcb77f66f0c0f955f178ba9b576be30..62757e3a9356b2e71681aea6ded0afa1aad2b60b 100644 (file)
--- 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-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -44,38 +44,30 @@ 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, boost::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 (boost::shared_ptr<const Film>) const {
+               return _position;
+       }
 
-private:
+       void seek ();
+       void emit (boost::shared_ptr<const Film> film, boost::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);
+       /** @return true if the emitted data was accepted, false if not */
+       boost::signals2::signal<void (ContentVideo)> Data;
 
+private:
        boost::shared_ptr<const Content> _content;
-       boost::shared_ptr<Log> _log;
-       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;
+       /** Frame of last thing to be emitted; only used for 3D */
+       boost::optional<Frame> _last_emitted_frame;
+       boost::optional<Eyes> _last_emitted_eyes;
+       boost::optional<dcpomatic::ContentTime> _position;
+       std::vector<Frame> _last_threed_frames;
 };
 
 #endif