X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.h;h=faf5d6832637f12be510028a78568615f3275a27;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hp=0a6a9da67858cff0e97d9fb30921b5f901422976;hpb=4ab86ef0295bcd6bb9297996a06006f371d22bae;p=dcpomatic.git

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 0a6a9da67..faf5d6832 100644
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -29,9 +29,8 @@
 extern "C" {
 #include <libavutil/pixfmt.h>
 }
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
 #include <boost/thread/mutex.hpp>
+#include <boost/noncopyable.hpp>
 
 class Image;
 class ImageProxy;
@@ -42,11 +41,11 @@ 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 (
-		boost::shared_ptr<const ImageProxy>,
+		std::shared_ptr<const ImageProxy>,
 		Crop,
 		boost::optional<double>,
 		dcp::Size,
@@ -55,30 +54,30 @@ public:
 		Part,
 		boost::optional<ColourConversion>,
 		VideoRange video_range,
-		boost::weak_ptr<Content>,
+		std::weak_ptr<Content>,
 		boost::optional<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;
+	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 (boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, bool aligned, bool fast);
+	std::shared_ptr<Image> image (boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, VideoRange video_range, 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 (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;
@@ -100,11 +99,11 @@ 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;
 	}
 
@@ -113,9 +112,9 @@ public:
 	}
 
 private:
-	void make_image (boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const;
+	void make_image (boost::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;
@@ -125,15 +124,13 @@ private:
 	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;
+	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 */