Barely-functioning GL playback with new arrangement.

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

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 8e41e8f2371dc5dff5d504aabf65fad32acca172..3cd5594097baa42e7a3727ba59c83d6ae0544d18 100644 (file)
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -31,9 +31,11 @@ extern "C" {
 }
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
+#include <boost/thread/mutex.hpp>
 
 class Image;
 class ImageProxy;
+class Film;
 class Socket;
 
 /** Everything needed to describe a video frame coming out of the player, but with the
@@ -52,6 +54,7 @@ public:
                Eyes,
                Part,
                boost::optional<ColourConversion>,
+               VideoRange video_range,
                boost::weak_ptr<Content>,
                boost::optional<Frame>
                );
@@ -62,7 +65,7 @@ public:
 
        void set_text (PositionImage);
 
-       void prepare ();
+       void prepare (boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast);
        boost::shared_ptr<Image> image (boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const;
 
        static AVPixelFormat force (AVPixelFormat, AVPixelFormat);
@@ -71,7 +74,7 @@ public:
        void add_metadata (xmlpp::Node* node) const;
        void send_binary (boost::shared_ptr<Socket> socket) const;
 
-       bool reset_metadata (dcp::Size video_container_size, dcp::Size film_frame_size);
+       bool reset_metadata (boost::shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size);
 
        bool has_j2k () const;
        dcp::Data j2k () const;
@@ -105,6 +108,8 @@ public:
        }
 
 private:
+       void make_image (boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const;
+
        boost::shared_ptr<const ImageProxy> _in;
        Crop _crop;
        boost::optional<double> _fade;
@@ -113,6 +118,7 @@ private:
        Eyes _eyes;
        Part _part;
        boost::optional<ColourConversion> _colour_conversion;
+       VideoRange _video_range;
        boost::optional<PositionImage> _text;
        /** Content that we came from.  This is so that reset_metadata() can work, and also
         *  for variant:swaroop's non-skippable ads.
@@ -120,6 +126,17 @@ private:
        boost::weak_ptr<Content> _content;
        /** Video frame that we came from.  Again, this is for reset_metadata() */
        boost::optional<Frame> _video_frame;
+
+       mutable boost::mutex _mutex;
+       mutable boost::shared_ptr<Image> _image;
+       /** _crop that was used to make _image */
+       mutable Crop _image_crop;
+       /** _inter_size that was used to make _image */
+       mutable dcp::Size _image_inter_size;
+       /** _out_size that was used to make _image */
+       mutable dcp::Size _image_out_size;
+       /** _fade that was used to make _image */
+       mutable boost::optional<double> _image_fade;
 };
 
 #endif