Fix the build for older macOS.

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

diff --git a/src/lib/video_decoder.h b/src/lib/video_decoder.h
index 9e56546df952e5a659904b5be064f259c4b62fa8..9d69f743a33d6c08d3efae5af36329a4278cb709 100644 (file)
--- a/src/lib/video_decoder.h
+++ b/src/lib/video_decoder.h
@@ -1,72 +1,77 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 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>
+
 
 class VideoContent;
 class ImageProxy;
 class Image;
+class Log;
+class FrameIntervalChecker;
+
 
 /** @class VideoDecoder
  *  @brief Parent for classes which decode video.
  */
-class VideoDecoder : public virtual Decoder
+class VideoDecoder : public DecoderPart
 {
 public:
-       VideoDecoder (boost::shared_ptr<const VideoContent> c);
+       VideoDecoder (Decoder* parent, std::shared_ptr<const Content> c);
 
-       std::list<ContentVideo> get_video (VideoFrame frame, bool accurate);
+       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::shared_ptr<const VideoContent> video_content () const {
-               return _video_content;
+       boost::optional<dcpomatic::ContentTime> position (std::shared_ptr<const Film>) const {
+               return _position;
        }
 
-#ifdef DCPOMATIC_DEBUG
-       int test_gaps;
-#endif
+       void seek ();
+       void emit (std::shared_ptr<const Film> film, std::shared_ptr<const ImageProxy>, Frame frame);
 
-protected:
-       friend struct video_decoder_fill_test1;
-       friend struct video_decoder_fill_test2;
-
-       void seek (ContentTime time, bool accurate);
-       void video (boost::shared_ptr<const ImageProxy>, VideoFrame frame);
-       std::list<ContentVideo> decoded_video (VideoFrame frame);
-       void fill_up_to_2d (VideoFrame);
-       void fill_up_to_3d (VideoFrame, Eyes);
+       boost::signals2::signal<void (ContentVideo)> Data;
 
-       boost::shared_ptr<const VideoContent> _video_content;
-       std::list<ContentVideo> _decoded_video;
-       bool _same;
-       boost::shared_ptr<Image> _black_image;
+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