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 05cf99a961e3ebbcdda8b97833f0ae5ef5ff48f4..62757e3a9356b2e71681aea6ded0afa1aad2b60b 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -1,76 +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/>.
 
 */
 
-#ifndef DVDOMATIC_VIDEO_DECODER_H
-#define DVDOMATIC_VIDEO_DECODER_H
+/** @file  src/lib/video_decoder.h
+ *  @brief VideoDecoder class.
+ */
+
+#ifndef DCPOMATIC_VIDEO_DECODER_H
+#define DCPOMATIC_VIDEO_DECODER_H
 
-#include "video_source.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 VideoDecoder : public VideoSource, public virtual Decoder
+class ImageProxy;
+class Image;
+class Log;
+
+/** @class VideoDecoder
+ *  @brief Parent for classes which decode video.
+ */
+class VideoDecoder : public DecoderPart
 {
 public:
-       VideoDecoder (boost::shared_ptr<const Film>);
-
-       /** @return video frame rate second, or 0 if unknown */
-       virtual float video_frame_rate () const = 0;
-       /** @return native size in pixels */
-       virtual libdcp::Size native_size () const = 0;
-       /** @return length according to our content's header */
-       virtual ContentVideoFrame video_length () const = 0;
-
-       virtual int time_base_numerator () const = 0;
-       virtual int time_base_denominator () const = 0;
-       virtual int sample_aspect_ratio_numerator () const = 0;
-       virtual int sample_aspect_ratio_denominator () const = 0;
-
-       void set_progress (Job *) const;
-       
-       int video_frame () const {
-               return _video_frame;
-       }
+       VideoDecoder (Decoder* parent, boost::shared_ptr<const Content> c);
 
-       double last_content_time () const {
-               return _last_content_time;
+       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;
        }
 
-protected:
-       
-       virtual PixelFormat pixel_format () const = 0;
+       void seek ();
+       void emit (boost::shared_ptr<const Film> film, boost::shared_ptr<const ImageProxy>, Frame frame);
 
-       void emit_video (boost::shared_ptr<Image>, double);
-       void emit_subtitle (boost::shared_ptr<TimedSubtitle>);
-       bool have_last_video () const;
-       void repeat_last_video (double);
+       /** @return true if the emitted data was accepted, false if not */
+       boost::signals2::signal<void (ContentVideo)> Data;
 
 private:
-       void signal_video (boost::shared_ptr<Image>, bool, boost::shared_ptr<Subtitle>, double);
-
-       int _video_frame;
-       double _last_content_time;
-       
-       boost::shared_ptr<TimedSubtitle> _timed_subtitle;
-
-       boost::shared_ptr<Image> _last_image;
-       boost::shared_ptr<Subtitle> _last_subtitle;
+       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