X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.cc;h=75479136f0682bea3be97bf9e1debc8bf4bb390b;hb=1679c3dc40262733f46dda9f4151367bf93f2b76;hp=1df8fb3e8745f370974b8c09740204a37d7da089;hpb=51bdd082283e39ebeca5150995d98cdade189fe1;p=dcpomatic.git

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index 1df8fb3e8..75479136f 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -52,6 +52,7 @@ PlayerVideo::PlayerVideo (
 	Eyes eyes,
 	Part part,
 	optional<ColourConversion> colour_conversion,
+	VideoRange video_range,
 	weak_ptr<Content> content,
 	optional<Frame> video_frame
 	)
@@ -63,6 +64,7 @@ PlayerVideo::PlayerVideo (
 	, _eyes (eyes)
 	, _part (part)
 	, _colour_conversion (colour_conversion)
+	, _video_range (video_range)
 	, _content (content)
 	, _video_frame (video_frame)
 {
@@ -78,6 +80,7 @@ PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket
 	_out_size = dcp::Size (node->number_child<int> ("OutWidth"), node->number_child<int> ("OutHeight"));
 	_eyes = (Eyes) node->number_child<int> ("Eyes");
 	_part = (Part) node->number_child<int> ("Part");
+	_video_range = (VideoRange) node->number_child<int>("VideoRange");
 
 	/* Assume that the ColourConversion uses the current state version */
 	_colour_conversion = ColourConversion::from_xml (node, Film::current_state_version);
@@ -105,10 +108,10 @@ PlayerVideo::set_text (PositionImage image)
 shared_ptr<Image>
 PlayerVideo::image (function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const
 {
-	/* XXX: this assumes that image() and prepare() are only ever called with the same parameters (except crop) */
+	/* XXX: this assumes that image() and prepare() are only ever called with the same parameters (except crop, inter size, out size, fade) */
 
 	boost::mutex::scoped_lock lm (_mutex);
-	if (!_image || _crop != _image_crop) {
+	if (!_image || _crop != _image_crop || _inter_size != _image_inter_size || _out_size != _image_out_size || _fade != _image_fade) {
 		make_image (pixel_format, aligned, fast);
 	}
 	return _image;
@@ -125,6 +128,9 @@ void
 PlayerVideo::make_image (function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const
 {
 	_image_crop = _crop;
+	_image_inter_size = _inter_size;
+	_image_out_size = _out_size;
+	_image_fade = _fade;
 
 	pair<shared_ptr<Image>, int> prox = _in->image (_inter_size);
 	shared_ptr<Image> im = prox.first;
@@ -163,7 +169,7 @@ PlayerVideo::make_image (function<AVPixelFormat (AVPixelFormat)> pixel_format, b
 	}
 
 	_image = im->crop_scale_window (
-		total_crop, _inter_size, _out_size, yuv_to_rgb, pixel_format (im->pixel_format()), aligned, fast
+		total_crop, _inter_size, _out_size, yuv_to_rgb, _video_range, pixel_format (im->pixel_format()), aligned, fast
 		);
 
 	if (_text) {
@@ -189,6 +195,7 @@ PlayerVideo::add_metadata (xmlpp::Node* node) const
 	node->add_child("OutHeight")->add_child_text (raw_convert<string> (_out_size.height));
 	node->add_child("Eyes")->add_child_text (raw_convert<string> (static_cast<int> (_eyes)));
 	node->add_child("Part")->add_child_text (raw_convert<string> (static_cast<int> (_part)));
+	node->add_child("VideoRange")->add_child_text(raw_convert<string>(static_cast<int>(_video_range)));
 	if (_colour_conversion) {
 		_colour_conversion.get().as_xml (node);
 	}
@@ -241,12 +248,13 @@ bool
 PlayerVideo::same (shared_ptr<const PlayerVideo> other) const
 {
 	if (_crop != other->_crop ||
-	    _fade.get_value_or(0) != other->_fade.get_value_or(0) ||
+	    _fade != other->_fade ||
 	    _inter_size != other->_inter_size ||
 	    _out_size != other->_out_size ||
 	    _eyes != other->_eyes ||
 	    _part != other->_part ||
-	    _colour_conversion != other->_colour_conversion) {
+	    _colour_conversion != other->_colour_conversion ||
+	    _video_range != other->_video_range) {
 		return false;
 	}
 
@@ -307,13 +315,14 @@ PlayerVideo::shallow_copy () const
 			_eyes,
 			_part,
 			_colour_conversion,
+			_video_range,
 			_content,
 			_video_frame
 			)
 		);
 }
 
-/** Re-read crop, fade, inter/out size and colour conversion from our content.
+/** Re-read crop, fade, inter/out size, colour conversion and video range from our content.
  *  @return true if this was possible, false if not.
  */
 bool
@@ -329,6 +338,7 @@ PlayerVideo::reset_metadata (shared_ptr<const Film> film, dcp::Size video_contai
 	_inter_size = content->video->scale().size(content->video, video_container_size, film_frame_size);
 	_out_size = video_container_size;
 	_colour_conversion = content->video->colour_conversion();
+	_video_range = content->video->range();
 
 	return true;
 }