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 42add42aacc547c3be5e2bced87882dfdacecd0b..62757e3a9356b2e71681aea6ded0afa1aad2b60b 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -1,61 +1,73 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+/** @file  src/lib/video_decoder.h
+ *  @brief VideoDecoder class.
+ */
+
 #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 "decoder_part.h"
+#include <boost/signals2.hpp>
+#include <boost/shared_ptr.hpp>
 
 class VideoContent;
 class ImageProxy;
+class Image;
+class Log;
 
-class VideoDecoder : public virtual Decoder
+/** @class VideoDecoder
+ *  @brief Parent for classes which decode video.
+ */
+class VideoDecoder : public DecoderPart
 {
 public:
-       VideoDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const VideoContent>);
-
-       /** Seek so that the next pass() will yield (approximately) the requested frame.
-        *  Pass accurate = true to try harder to get close to the request.
-        */
-       virtual void seek (VideoContent::Frame frame, bool accurate) = 0;
-
-       /** Emitted when a video frame is ready.
-        *  First parameter is the video image.
-        *  Second parameter is the eye(s) which should see this image.
-        *  Third parameter is the part of this image that should be used.
-        *  Fourth parameter is true if the image is the same as the last one that was emitted for this Eyes value.
-        *  Fourth parameter is the frame within our source.
-        */
-       boost::signals2::signal<void (boost::shared_ptr<const ImageProxy>, Eyes, Part, bool, VideoContent::Frame)> Video;
-       
-protected:
-
-       void video (boost::shared_ptr<const ImageProxy>, bool, VideoContent::Frame);
-       boost::shared_ptr<const VideoContent> _video_content;
-       /** This is in frames without taking 3D into account (e.g. if we are doing 3D alternate,
-        *  this would equal 2 on the left-eye second frame (not 1)).
-        */
-       VideoContent::Frame _video_position;
+       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);
+
+       boost::optional<dcpomatic::ContentTime> position (boost::shared_ptr<const Film>) const {
+               return _position;
+       }
+
+       void seek ();
+       void emit (boost::shared_ptr<const Film> film, boost::shared_ptr<const ImageProxy>, Frame frame);
+
+       /** @return true if the emitted data was accepted, false if not */
+       boost::signals2::signal<void (ContentVideo)> Data;
+
+private:
+       boost::shared_ptr<const Content> _content;
+       /** 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