X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fplayer_video.cc;h=bd643af60c4c248d777bb2e16b59c526c29b981b;hb=3b31d2d8a129ae6d8d267427bd6b5bc444b40b2a;hp=e36eb1984438add8e0ca4ac98f4d4daf7276b1dd;hpb=306e2f021410d2184a3945b1e374b563104b3ea8;p=dcpomatic.git

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index e36eb1984..bd643af60 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);
@@ -129,31 +132,29 @@ PlayerVideo::make_image (function<AVPixelFormat (AVPixelFormat)> pixel_format, b
 	_image_out_size = _out_size;
 	_image_fade = _fade;
 
-	pair<shared_ptr<Image>, int> prox = _in->image (_inter_size);
-	shared_ptr<Image> im = prox.first;
-	int const reduce = prox.second;
+	ImageProxy::Result prox = _in->image (_inter_size);
 
 	Crop total_crop = _crop;
 	switch (_part) {
 	case PART_LEFT_HALF:
-		total_crop.right += im->size().width / 2;
+		total_crop.right += prox.image->size().width / 2;
 		break;
 	case PART_RIGHT_HALF:
-		total_crop.left += im->size().width / 2;
+		total_crop.left += prox.image->size().width / 2;
 		break;
 	case PART_TOP_HALF:
-		total_crop.bottom += im->size().height / 2;
+		total_crop.bottom += prox.image->size().height / 2;
 		break;
 	case PART_BOTTOM_HALF:
-		total_crop.top += im->size().height / 2;
+		total_crop.top += prox.image->size().height / 2;
 		break;
 	default:
 		break;
 	}
 
-	if (reduce > 0) {
+	if (prox.log2_scaling > 0) {
 		/* Scale the crop down to account for the scaling that has already happened in ImageProxy::image */
-		int const r = pow(2, reduce);
+		int const r = pow(2, prox.log2_scaling);
 		total_crop.left /= r;
 		total_crop.right /= r;
 		total_crop.top /= r;
@@ -165,8 +166,8 @@ PlayerVideo::make_image (function<AVPixelFormat (AVPixelFormat)> pixel_format, b
 		yuv_to_rgb = _colour_conversion.get().yuv_to_rgb();
 	}
 
-	_image = im->crop_scale_window (
-		total_crop, _inter_size, _out_size, yuv_to_rgb, pixel_format (im->pixel_format()), aligned, fast
+	_image = prox.image->crop_scale_window (
+		total_crop, _inter_size, _out_size, yuv_to_rgb, _video_range, pixel_format (prox.image->pixel_format()), aligned, fast
 		);
 
 	if (_text) {
@@ -192,6 +193,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);
 	}
@@ -249,7 +251,8 @@ PlayerVideo::same (shared_ptr<const PlayerVideo> other) const
 	    _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;
 	}
 
@@ -310,13 +313,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
@@ -332,6 +336,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;
 }