X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.h;h=8134c8d4e564715dc1f296cac4f6334bedd24806;hb=6cac49dc50dae6b173135df101d532f20031ca70;hp=1e214beeaaaf1fff6a1b9b06ba087f4b647f9d95;hpb=51bdd082283e39ebeca5150995d98cdade189fe1;p=dcpomatic.git

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 1e214beea..8134c8d4e 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-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,9 +18,11 @@
 
 */
 
+
 #ifndef DCPOMATIC_PLAYER_VIDEO_H
 #define DCPOMATIC_PLAYER_VIDEO_H
 
+
 #include "types.h"
 #include "position.h"
 #include "dcpomatic_time.h"
@@ -29,14 +31,15 @@
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
-#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
  *  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.
@@ -45,37 +48,43 @@ class PlayerVideo
 {
 public:
 	PlayerVideo (
-		boost::shared_ptr<const ImageProxy>,
-		Crop,
-		boost::optional<double>,
-		dcp::Size,
-		dcp::Size,
-		Eyes,
-		Part,
-		boost::optional<ColourConversion>,
-		boost::weak_ptr<Content>,
-		boost::optional<Frame>
+		std::shared_ptr<const ImageProxy> image,
+		Crop crop,
+		boost::optional<double> fade,
+		dcp::Size inter_size,
+		dcp::Size out_size,
+		Eyes eyes,
+		Part part,
+		boost::optional<ColourConversion> colour_conversion,
+		VideoRange video_range,
+		std::weak_ptr<Content> content,
+		boost::optional<Frame> video_frame,
+		bool error
 		);
 
-	PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>);
+	PlayerVideo (std::shared_ptr<cxml::Node>, std::shared_ptr<Socket>);
 
-	boost::shared_ptr<PlayerVideo> shallow_copy () const;
+	PlayerVideo (PlayerVideo const&) = delete;
+	PlayerVideo& operator= (PlayerVideo const&) = delete;
+
+	std::shared_ptr<PlayerVideo> shallow_copy () const;
 
 	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;
+	void prepare (std::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool aligned, bool fast, bool proxy_only);
+	std::shared_ptr<Image> image (std::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool aligned, bool fast) const;
+	std::shared_ptr<Image> raw_image () 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 (std::shared_ptr<Socket> socket) const;
 
-	bool reset_metadata (boost::shared_ptr<const Film> film, dcp::Size video_container_size, dcp::Size film_frame_size);
+	bool reset_metadata (std::shared_ptr<const Film> film, dcp::Size player_video_container_size);
 
 	bool has_j2k () const;
-	dcp::Data j2k () const;
+	std::shared_ptr<const dcp::Data> j2k () const;
 
 	Eyes eyes () const {
 		return _eyes;
@@ -97,18 +106,22 @@ public:
 		return _inter_size;
 	}
 
-	bool same (boost::shared_ptr<const PlayerVideo> other) const;
+	bool same (std::shared_ptr<const PlayerVideo> other) const;
 
 	size_t memory_used () const;
 
-	boost::weak_ptr<Content> content () const {
+	std::weak_ptr<Content> content () const {
 		return _content;
 	}
 
+	bool error () const {
+		return _error;
+	}
+
 private:
-	void make_image (boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const;
+	void make_image (std::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool aligned, bool fast) const;
 
-	boost::shared_ptr<const ImageProxy> _in;
+	std::shared_ptr<const ImageProxy> _in;
 	Crop _crop;
 	boost::optional<double> _fade;
 	dcp::Size _inter_size;
@@ -116,18 +129,26 @@ 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.
-	 */
-	boost::weak_ptr<Content> _content;
+	/** Content that we came from.  This is so that reset_metadata() can work. */
+	std::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 std::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;
+	/** true if there was an error when decoding our image */
+	mutable bool _error;
 };
 
+
 #endif