X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.cc;h=8e6fcd5f3524f8baf4e00c54f791cc92bf4778a7;hb=cb990adba9c57e5107ef2aa9716cf0a26c1df83d;hp=aab90a806c59116cea62f149cd155e302bb7ea20;hpb=88065ad7e9070c7c6a0f9b15202c392084e9e8ba;p=dcpomatic.git

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index aab90a806..8e6fcd5f3 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -34,6 +34,7 @@ PlayerVideo::PlayerVideo (
 	shared_ptr<const ImageProxy> in,
 	DCPTime time,
 	Crop crop,
+	boost::optional<float> fade,
 	dcp::Size inter_size,
 	dcp::Size out_size,
 	Scaler const * scaler,
@@ -44,6 +45,7 @@ PlayerVideo::PlayerVideo (
 	: _in (in)
 	, _time (time)
 	, _crop (crop)
+	, _fade (fade)
 	, _inter_size (inter_size)
 	, _out_size (out_size)
 	, _scaler (scaler)
@@ -58,6 +60,7 @@ PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket
 {
 	_time = DCPTime (node->number_child<DCPTime::Type> ("Time"));
 	_crop = Crop (node);
+	_fade = node->optional_number_child<float> ("Fade");
 
 	_inter_size = dcp::Size (node->number_child<int> ("InterWidth"), node->number_child<int> ("InterHeight"));
 	_out_size = dcp::Size (node->number_child<int> ("OutWidth"), node->number_child<int> ("OutHeight"));
@@ -87,7 +90,7 @@ PlayerVideo::set_subtitle (PositionImage image)
 }
 
 shared_ptr<Image>
-PlayerVideo::image (bool burn_subtitle) const
+PlayerVideo::image (AVPixelFormat pixel_format, bool burn_subtitle) const
 {
 	shared_ptr<Image> im = _in->image ();
 	
@@ -109,12 +112,16 @@ PlayerVideo::image (bool burn_subtitle) const
 		break;
 	}
 		
-	shared_ptr<Image> out = im->crop_scale_window (total_crop, _inter_size, _out_size, _scaler, PIX_FMT_RGB24, true);
+	shared_ptr<Image> out = im->crop_scale_window (total_crop, _inter_size, _out_size, _scaler, pixel_format, true);
 
 	if (burn_subtitle && _subtitle.image) {
 		out->alpha_blend (_subtitle.image, _subtitle.position);
 	}
 
+	if (_fade) {
+		out->fade (_fade.get ());
+	}
+
 	return out;
 }
 
@@ -123,6 +130,9 @@ PlayerVideo::add_metadata (xmlpp::Node* node, bool send_subtitles) const
 {
 	node->add_child("Time")->add_child_text (raw_convert<string> (_time.get ()));
 	_crop.as_xml (node);
+	if (_fade) {
+		node->add_child("Fade")->add_child_text (raw_convert<string> (_fade.get ()));
+	}
 	_in->add_metadata (node->add_child ("In"));
 	node->add_child("InterWidth")->add_child_text (raw_convert<string> (_inter_size.width));
 	node->add_child("InterHeight")->add_child_text (raw_convert<string> (_inter_size.height));
@@ -184,6 +194,7 @@ PlayerVideo::same (shared_ptr<const PlayerVideo> other) const
 {
 	if (_in != other->_in ||
 	    _crop != other->_crop ||
+	    _fade.get_value_or(0) != other->_fade.get_value_or(0) ||
 	    _inter_size != other->_inter_size ||
 	    _out_size != other->_out_size ||
 	    _scaler != other->_scaler ||