From 9c9890b9ff89af710db21145c03a09993c629e3e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 22 Apr 2015 15:35:34 +0100 Subject: [PATCH] Actually use YUV->RGB setting when converting. --- src/lib/image.cc | 32 ++++++++++++++++++++++++++++++-- src/lib/image.h | 6 +++--- src/lib/player.cc | 1 + src/lib/player_video.cc | 7 ++++++- src/wx/film_viewer.cc | 8 +++++++- test/image_test.cc | 6 +++--- test/make_black_test.cc | 2 +- 7 files changed, 51 insertions(+), 11 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::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::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 extern "C" { #include #include @@ -57,10 +58,9 @@ public: int line_factor (int) const; int lines (int) const; - boost::shared_ptr scale (dcp::Size, AVPixelFormat, bool aligned) const; + boost::shared_ptr scale (dcp::Size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat, bool aligned) const; boost::shared_ptr crop (Crop c, bool aligned) const; - - boost::shared_ptr crop_scale_window (Crop c, dcp::Size, dcp::Size, AVPixelFormat, bool aligned) const; + boost::shared_ptr 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 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 out = im->crop_scale_window (total_crop, _inter_size, _out_size, pixel_format, true); + shared_ptr 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); diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 26f135d48..a1cc5dfc4 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -180,7 +180,13 @@ FilmViewer::get (DCPTime p, bool accurate) if (!pvf.empty ()) { try { _frame = pvf.front()->image (PIX_FMT_RGB24, true, boost::bind (&Log::dcp_log, _film->log().get(), _1, _2)); - _frame = _frame->scale (_frame->size(), PIX_FMT_RGB24, false); + + dcp::YUVToRGB yuv_to_rgb = dcp::YUV_TO_RGB_REC601; + if (pvf.front()->colour_conversion()) { + yuv_to_rgb = pvf.front()->colour_conversion().get().yuv_to_rgb(); + } + + _frame = _frame->scale (_frame->size(), yuv_to_rgb, PIX_FMT_RGB24, false); _position = pvf.front()->time (); _inter_position = pvf.front()->inter_position (); _inter_size = pvf.front()->inter_size (); diff --git a/test/image_test.cc b/test/image_test.cc index b622b250d..9aca9878d 100644 --- a/test/image_test.cc +++ b/test/image_test.cc @@ -156,7 +156,7 @@ BOOST_AUTO_TEST_CASE (crop_image_test2) image = image->crop (crop, true); /* Convert it back to RGB to make comparison to black easier */ - image = image->scale (image->size(), PIX_FMT_RGB24, true); + image = image->scale (image->size(), dcp::YUV_TO_RGB_REC601, PIX_FMT_RGB24, true); /* Check that its still black after the crop */ uint8_t* p = image->data()[0]; @@ -250,13 +250,13 @@ crop_scale_window_single (AVPixelFormat in_format, dcp::Size in_size, Crop crop, /* Convert using separate methods */ boost::shared_ptr sep = test->crop (crop, true); - sep = sep->scale (inter_size, PIX_FMT_RGB24, true); + sep = sep->scale (inter_size, dcp::YUV_TO_RGB_REC601, PIX_FMT_RGB24, true); boost::shared_ptr sep_container (new Image (PIX_FMT_RGB24, out_size, true)); sep_container->make_black (); sep_container->copy (sep, Position ((out_size.width - inter_size.width) / 2, (out_size.height - inter_size.height) / 2)); /* Convert using the all-in-one method */ - shared_ptr all = test->crop_scale_window (crop, inter_size, out_size, PIX_FMT_RGB24, true); + shared_ptr all = test->crop_scale_window (crop, inter_size, out_size, dcp::YUV_TO_RGB_REC601, PIX_FMT_RGB24, true); /* Compare */ BOOST_CHECK_EQUAL (sep_container->size().width, all->size().width); diff --git a/test/make_black_test.cc b/test/make_black_test.cc index 913b6da10..b0243310b 100644 --- a/test/make_black_test.cc +++ b/test/make_black_test.cc @@ -80,7 +80,7 @@ BOOST_AUTO_TEST_CASE (make_black_test) for (list::const_iterator i = pix_fmts.begin(); i != pix_fmts.end(); ++i) { boost::shared_ptr foo (new Image (*i, in_size, true)); foo->make_black (); - boost::shared_ptr bar = foo->scale (out_size, PIX_FMT_RGB24, true); + boost::shared_ptr bar = foo->scale (out_size, dcp::YUV_TO_RGB_REC601, PIX_FMT_RGB24, true); uint8_t* p = bar->data()[0]; for (int y = 0; y < bar->size().height; ++y) { -- 2.30.2