Actually use YUV->RGB setting when converting.

4 files changed, 40 insertions, 6 deletions

diff --git a/src/lib/image.cc b/src/lib/image.cc
index 177219813..bba5eeda1 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -87,7 +87,9 @@ Image::components () const
 
 /** Crop this image, scale it to `inter_size' and then place it in a black frame of `out_size' */
 shared_ptr<Image>
-Image::crop_scale_window (Crop crop, dcp::Size inter_size, dcp::Size out_size, AVPixelFormat out_format, bool out_aligned) const
+Image::crop_scale_window (
+	Crop crop, dcp::Size inter_size, dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool out_aligned
+	) const
 {
 	/* Empirical testing suggests that sws_scale() will crash if
 	   the input image is not aligned.
@@ -115,6 +117,19 @@ Image::crop_scale_window (Crop crop, dcp::Size inter_size, dcp::Size out_size, A
 		throw StringError (N_("Could not allocate SwsContext"));
 	}
 
+	DCPOMATIC_ASSERT (yuv_to_rgb < dcp::YUV_TO_RGB_COUNT);
+	int const lut[dcp::YUV_TO_RGB_COUNT] = {
+		SWS_CS_ITU601,
+		SWS_CS_ITU709
+	};
+
+	sws_setColorspaceDetails (
+		scale_context,
+		sws_getCoefficients (lut[yuv_to_rgb]), 0,
+		sws_getCoefficients (lut[yuv_to_rgb]), 0,
+		0, 1 << 16, 1 << 16
+		);
+	
 	/* Prepare input data pointers with crop */
 	uint8_t* scale_in_data[components()];
 	for (int c = 0; c < components(); ++c) {
@@ -142,7 +157,7 @@ Image::crop_scale_window (Crop crop, dcp::Size inter_size, dcp::Size out_size, A
 }
 
 shared_ptr<Image>
-Image::scale (dcp::Size out_size, AVPixelFormat out_format, bool out_aligned) const
+Image::scale (dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_format, bool out_aligned) const
 {
 	/* Empirical testing suggests that sws_scale() will crash if
 	   the input image is not aligned.
@@ -157,6 +172,19 @@ Image::scale (dcp::Size out_size, AVPixelFormat out_format, bool out_aligned) co
 		SWS_BICUBIC, 0, 0, 0
 		);
 
+	DCPOMATIC_ASSERT (yuv_to_rgb < dcp::YUV_TO_RGB_COUNT);
+	int const lut[dcp::YUV_TO_RGB_COUNT] = {
+		SWS_CS_ITU601,
+		SWS_CS_ITU709
+	};
+
+	sws_setColorspaceDetails (
+		scale_context,
+		sws_getCoefficients (lut[yuv_to_rgb]), 0,
+		sws_getCoefficients (lut[yuv_to_rgb]), 0,
+		0, 1 << 16, 1 << 16
+		);
+	
 	sws_scale (
 		scale_context,
 		data(), stride(),
diff --git a/src/lib/image.h b/src/lib/image.h
index 2e90a89e9..5c3931102 100644
--- a/src/lib/image.h
+++ b/src/lib/image.h
@@ -27,6 +27,7 @@
 #include "position.h"
 #include "position_image.h"
 #include "types.h"
+#include <dcp/colour_conversion.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavfilter/avfilter.h>
@@ -57,10 +58,9 @@ public:
 	int line_factor (int) const;
 	int lines (int) const;
 
-	boost::shared_ptr<Image> scale (dcp::Size, AVPixelFormat, bool aligned) const;
+	boost::shared_ptr<Image> scale (dcp::Size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat, bool aligned) const;
 	boost::shared_ptr<Image> crop (Crop c, bool aligned) const;
-
-	boost::shared_ptr<Image> crop_scale_window (Crop c, dcp::Size, dcp::Size, AVPixelFormat, bool aligned) const;
+	boost::shared_ptr<Image> crop_scale_window (Crop c, dcp::Size, dcp::Size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat, bool aligned) const;
 	
 	void make_black ();
 	void make_transparent ();
diff --git a/src/lib/player.cc b/src/lib/player.cc
index e3c85ee56..495d20533 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -280,6 +280,7 @@ Player::transform_image_subtitles (list<ImageSubtitle> subs) const
 			PositionImage (
 				i->image->scale (
 					scaled_size,
+					dcp::YUV_TO_RGB_REC601,
 					i->image->pixel_format (),
 					true
 					),
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index aad75889f..81e01329a 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -110,8 +110,13 @@ PlayerVideo::image (AVPixelFormat pixel_format, bool burn_subtitle, dcp::NoteHan
 	default:
 		break;
 	}
+
+	dcp::YUVToRGB yuv_to_rgb = dcp::YUV_TO_RGB_REC601;
+	if (_colour_conversion) {
+		yuv_to_rgb = _colour_conversion.get().yuv_to_rgb();
+	}
 		
-	shared_ptr<Image> out = im->crop_scale_window (total_crop, _inter_size, _out_size, pixel_format, true);
+	shared_ptr<Image> out = im->crop_scale_window (total_crop, _inter_size, _out_size, yuv_to_rgb, pixel_format, true);
 
 	if (burn_subtitle && _subtitle.image) {
 		out->alpha_blend (_subtitle.image, _subtitle.position);