X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.h;h=610a7526cb26090d582e647fff99ca3518a9d035;hb=b6c780d3107557d452c6612d715d01e2be52dbda;hp=59894a22780b6bbe36c3286cc0859087f0cdf1f3;hpb=3e12c68dc0451e73b5bc1a84d1d70f4999f7b4b5;p=dcpomatic.git

diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index 59894a227..610a7526c 100644
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -18,6 +18,9 @@
 */
 
 #include <boost/shared_ptr.hpp>
+extern "C" {
+#include <libavutil/pixfmt.h>
+}
 #include "types.h"
 #include "position.h"
 #include "colour_conversion.h"
@@ -37,12 +40,24 @@ class EncodedData;
 class PlayerVideo
 {
 public:
-	PlayerVideo (boost::shared_ptr<const ImageProxy>, DCPTime, Crop, dcp::Size, dcp::Size, Scaler const *, Eyes, Part, ColourConversion);
+	PlayerVideo (
+		boost::shared_ptr<const ImageProxy>,
+		DCPTime,
+		Crop,
+		boost::optional<float>,
+		dcp::Size,
+		dcp::Size,
+		Scaler const *,
+		Eyes,
+		Part,
+		boost::optional<ColourConversion>
+		);
+	
 	PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>, boost::shared_ptr<Log>);
 
 	void set_subtitle (PositionImage);
 	
-	boost::shared_ptr<Image> image (bool burn_subtitle) const;
+	boost::shared_ptr<Image> image (AVPixelFormat pix_fmt, bool burn_subtitle) const;
 
 	void add_metadata (xmlpp::Node* node, bool send_subtitles) const;
 	void send_binary (boost::shared_ptr<Socket> socket, bool send_subtitles) const;
@@ -58,7 +73,7 @@ public:
 		return _eyes;
 	}
 
-	ColourConversion colour_conversion () const {
+	boost::optional<ColourConversion> colour_conversion () const {
 		return _colour_conversion;
 	}
 
@@ -76,11 +91,12 @@ private:
 	boost::shared_ptr<const ImageProxy> _in;
 	DCPTime _time;
 	Crop _crop;
+	boost::optional<float> _fade;
 	dcp::Size _inter_size;
 	dcp::Size _out_size;
 	Scaler const * _scaler;
 	Eyes _eyes;
 	Part _part;
-	ColourConversion _colour_conversion;
+	boost::optional<ColourConversion> _colour_conversion;
 	PositionImage _subtitle;
 };