X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.h;h=f4bf2a47165be5dbc58b35a3f95e752db7e81ab6;hb=6e6ebf3122333b38333482bce64df3e6e61e64c4;hp=a5ca9b865705648bc298db707166d3614968873a;hpb=e11276a822289d7d7d91a4f431f386ad28ef16dd;p=dcpomatic.git

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index a5ca9b865..f4bf2a471 100644
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -18,6 +18,9 @@
 
 */
 
+#ifndef DCPOMATIC_PLAYER_VIDEO_H
+#define DCPOMATIC_PLAYER_VIDEO_H
+
 #include "types.h"
 #include "position.h"
 #include "dcpomatic_time.h"
@@ -27,6 +30,7 @@ extern "C" {
 #include <libavutil/pixfmt.h>
 }
 #include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
 
 class Image;
 class ImageProxy;
@@ -41,20 +45,24 @@ class PlayerVideo
 public:
 	PlayerVideo (
 		boost::shared_ptr<const ImageProxy>,
-		DCPTime,
 		Crop,
 		boost::optional<double>,
 		dcp::Size,
 		dcp::Size,
 		Eyes,
 		Part,
-		boost::optional<ColourConversion>
+		boost::optional<ColourConversion>,
+		boost::weak_ptr<Content>,
+		boost::optional<Frame>
 		);
 
 	PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>);
 
+	boost::shared_ptr<PlayerVideo> shallow_copy () const;
+
 	void set_subtitle (PositionImage);
 
+	void prepare ();
 	boost::shared_ptr<Image> image (dcp::NoteHandler note, boost::function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const;
 
 	static AVPixelFormat always_rgb (AVPixelFormat);
@@ -63,13 +71,11 @@ 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 has_j2k () const;
 	dcp::Data j2k () const;
 
-	DCPTime time () const {
-		return _time;
-	}
-
 	Eyes eyes () const {
 		return _eyes;
 	}
@@ -92,11 +98,10 @@ public:
 
 	bool same (boost::shared_ptr<const PlayerVideo> other) const;
 
-	boost::shared_ptr<PlayerVideo> clone (DCPTime time) const;
+	size_t memory_used () const;
 
 private:
 	boost::shared_ptr<const ImageProxy> _in;
-	DCPTime _time;
 	Crop _crop;
 	boost::optional<double> _fade;
 	dcp::Size _inter_size;
@@ -105,4 +110,10 @@ private:
 	Part _part;
 	boost::optional<ColourConversion> _colour_conversion;
 	boost::optional<PositionImage> _subtitle;
+	/** Content that we came from.  This is so that reset_metadata() can work */
+	boost::weak_ptr<Content> _content;
+	/** Video frame that we came from.  Again, this is for reset_metadata() */
+	boost::optional<Frame> _video_frame;
 };
+
+#endif