summaryrefslogtreecommitdiff
path: root/src/lib/player_video.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-04-22 15:35:34 +0100
committerCarl Hetherington <cth@carlh.net>2015-04-22 15:35:34 +0100
commit9c9890b9ff89af710db21145c03a09993c629e3e (patch)
tree9e96f24e230c7d75a3d0adeff4137e6d8305c710 /src/lib/player_video.cc
parent78c599cd7447ecfa33cc9f223d4fc6ba8b3879af (diff)
Actually use YUV->RGB setting when converting.
Diffstat (limited to 'src/lib/player_video.cc')
-rw-r--r--src/lib/player_video.cc7
1 files changed, 6 insertions, 1 deletions
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);