Put Image in dcpomatic:: to avoid Fastvideo name clash.

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

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 6275c5113c758bf18563e0475e8aaf38fb50fd27..9fd313a15eb03c51911ada209487fc4d57a0af28 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-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -31,8 +31,13 @@ extern "C" {
 }
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/noncopyable.hpp>
+
+namespace dcpomatic {
+       class Image;
+}
 
-class Image;
 class ImageProxy;
 class Film;
 class Socket;
@@ -41,7 +46,7 @@ class Socket;
  *  bits still their raw form.  We may want to combine the bits on a remote machine,
  *  or maybe not even bother to combine them at all.
  */
-class PlayerVideo
+class PlayerVideo : public boost::noncopyable
 {
 public:
        PlayerVideo (
@@ -53,8 +58,10 @@ public:
                Eyes,
                Part,
                boost::optional<ColourConversion>,
+               VideoRange video_range,
                boost::weak_ptr<Content>,
-               boost::optional<Frame>
+               boost::optional<Frame>,
+               bool error
                );
 
        PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>);
@@ -64,13 +71,13 @@ public:
        void set_text (PositionImage);
 
        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;
+       boost::shared_ptr<dcpomatic::Image> image (boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const;
 
        static AVPixelFormat force (AVPixelFormat, AVPixelFormat);
        static AVPixelFormat keep_xyz_or_rgb (AVPixelFormat);
 
        void add_metadata (xmlpp::Node* node) const;
-       void send_binary (boost::shared_ptr<Socket> socket) const;
+       void write_to_socket (boost::shared_ptr<Socket> socket) const;
 
        bool reset_metadata (boost::shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size);
 
@@ -105,6 +112,10 @@ public:
                return _content;
        }
 
+       bool error () const {
+               return _error;
+       }
+
 private:
        void make_image (boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const;
 
@@ -116,6 +127,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.
@@ -125,13 +137,17 @@ private:
        boost::optional<Frame> _video_frame;
 
        mutable boost::mutex _mutex;
-       mutable boost::shared_ptr<Image> _image;
+       mutable boost::shared_ptr<dcpomatic::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;
+       /** true if there was an error when decoding our image */
+       mutable bool _error;
 };
 
 #endif