X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.h;h=1a4a01d58cd8af449647a7f222a66e83f16b7146;hb=8f8730cadb3dae36e8aa7b7c732a7c162eac0fb6;hp=6275c5113c758bf18563e0475e8aaf38fb50fd27;hpb=3a42767c354cb0877f17a2a0078bbf37380967d0;p=dcpomatic.git

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 6275c5113..1a4a01d58 100644
--- 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,6 +31,8 @@ extern "C" {
 }
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/noncopyable.hpp>
 
 class Image;
 class ImageProxy;
@@ -41,7 +43,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 +55,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>);
@@ -70,7 +74,7 @@ public:
 	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 +109,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 +124,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.
@@ -132,6 +141,10 @@ private:
 	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