From bf6eadb7b8dc4073a940cdf9327323366b9e11e2 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 22 Apr 2015 13:58:04 +0100 Subject: Various changes to colour conversion specification to use chromaticities. --- src/lib/colour_conversion.cc | 82 +++++++++++++++++++++++++++++++------------- src/lib/config.cc | 3 ++ src/lib/j2k_image_proxy.cc | 4 +-- 3 files changed, 64 insertions(+), 25 deletions(-) (limited to 'src/lib') diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc index 4bf84281d..3c076b030 100644 --- a/src/lib/colour_conversion.cc +++ b/src/lib/colour_conversion.cc @@ -22,6 +22,7 @@ #include "util.h" #include "md5_digester.h" #include "raw_convert.h" +#include #include #include #include @@ -61,10 +62,9 @@ ColourConversion::ColourConversion (cxml::NodePtr node, int version) cxml::ConstNodePtr in_node = node->node_child ("InputTransferFunction"); string in_type = in_node->string_child ("Type"); if (in_type == "Gamma") { - _in.reset (new dcp::GammaTransferFunction (false, in_node->number_child ("Gamma"))); + _in.reset (new dcp::GammaTransferFunction (in_node->number_child ("Gamma"))); } else if (in_type == "ModifiedGamma") { _in.reset (new dcp::ModifiedGammaTransferFunction ( - false, in_node->number_child ("Power"), in_node->number_child ("Threshold"), in_node->number_child ("A"), @@ -77,20 +77,46 @@ ColourConversion::ColourConversion (cxml::NodePtr node, int version) /* Version 1.x */ if (node->bool_child ("InputGammaLinearised")) { - _in.reset (new dcp::ModifiedGammaTransferFunction (false, node->number_child ("InputGamma"), 0.04045, 0.055, 12.92)); + _in.reset (new dcp::ModifiedGammaTransferFunction (node->number_child ("InputGamma"), 0.04045, 0.055, 12.92)); } else { - _in.reset (new dcp::GammaTransferFunction (false, node->number_child ("InputGamma"))); + _in.reset (new dcp::GammaTransferFunction (node->number_child ("InputGamma"))); } } + _yuv_to_rgb = static_cast (node->optional_number_child("YUVToRGB").get_value_or (dcp::YUV_TO_RGB_REC601)); + list m = node->node_children ("Matrix"); - for (list::iterator i = m.begin(); i != m.end(); ++i) { - int const ti = (*i)->number_attribute ("i"); - int const tj = (*i)->number_attribute ("j"); - _matrix(ti, tj) = raw_convert ((*i)->content ()); - } + if (!m.empty ()) { + /* Read in old nodes and convert them to chromaticities */ + boost::numeric::ublas::matrix C (3, 3); + for (list::iterator i = m.begin(); i != m.end(); ++i) { + int const ti = (*i)->number_attribute ("i"); + int const tj = (*i)->number_attribute ("j"); + C(ti, tj) = raw_convert ((*i)->content ()); + } + + double const rd = C(0, 0) + C(1, 0) + C(2, 0); + _red = dcp::Chromaticity (C(0, 0) / rd, C(1, 0) / rd); + double const gd = C(0, 1) + C(1, 1) + C(2, 1); + _green = dcp::Chromaticity (C(0, 1) / gd, C(1, 1) / gd); + double const bd = C(0, 2) + C(1, 2) + C(2, 2); + _blue = dcp::Chromaticity (C(0, 2) / bd, C(1, 2) / bd); + double const wd = C(0, 0) + C(0, 1) + C(0, 2) + C(1, 0) + C(1, 1) + C(1, 2) + C(2, 0) + C(2, 1) + C(2, 2); + _white = dcp::Chromaticity ((C(0, 0) + C(0, 1) + C(0, 2)) / wd, (C(1, 0) + C(1, 1) + C(1, 2)) / wd); + } else { + /* New-style chromaticities */ + _red = dcp::Chromaticity (node->number_child ("RedX"), node->number_child ("RedY")); + _green = dcp::Chromaticity (node->number_child ("GreenX"), node->number_child ("GreenY")); + _blue = dcp::Chromaticity (node->number_child ("BlueX"), node->number_child ("BlueY")); + _white = dcp::Chromaticity (node->number_child ("WhiteX"), node->number_child ("WhiteY")); + if (node->optional_node_child ("AdjustedWhiteX")) { + _adjusted_white = dcp::Chromaticity ( + node->number_child ("AdjustedWhiteX"), node->number_child ("AdjustedWhiteY") + ); + } + } - _out.reset (new dcp::GammaTransferFunction (true, node->number_child ("OutputGamma"))); + _out.reset (new dcp::GammaTransferFunction (node->number_child ("OutputGamma"))); } boost::optional @@ -120,14 +146,17 @@ ColourConversion::as_xml (xmlpp::Node* node) const in_node->add_child("B")->add_child_text (raw_convert (tf->B ())); } - boost::numeric::ublas::matrix matrix = _matrix; - for (int i = 0; i < 3; ++i) { - for (int j = 0; j < 3; ++j) { - xmlpp::Element* m = node->add_child("Matrix"); - m->set_attribute ("i", raw_convert (i)); - m->set_attribute ("j", raw_convert (j)); - m->add_child_text (raw_convert (matrix (i, j))); - } + node->add_child("RedX")->add_child_text (raw_convert (_red.x)); + node->add_child("RedY")->add_child_text (raw_convert (_red.y)); + node->add_child("GreenX")->add_child_text (raw_convert (_green.x)); + node->add_child("GreenY")->add_child_text (raw_convert (_green.y)); + node->add_child("BlueX")->add_child_text (raw_convert (_blue.x)); + node->add_child("BlueY")->add_child_text (raw_convert (_blue.y)); + node->add_child("WhiteX")->add_child_text (raw_convert (_white.x)); + node->add_child("WhiteY")->add_child_text (raw_convert (_white.y)); + if (_adjusted_white) { + node->add_child("AdjustedWhiteX")->add_child_text (raw_convert (_adjusted_white.get().x)); + node->add_child("AdjustedWhiteY")->add_child_text (raw_convert (_adjusted_white.get().y)); } node->add_child("OutputGamma")->add_child_text (raw_convert (dynamic_pointer_cast (_out)->gamma ())); @@ -165,11 +194,18 @@ ColourConversion::identifier () const digester.add (tf->B ()); } - boost::numeric::ublas::matrix matrix = _matrix; - for (int i = 0; i < 3; ++i) { - for (int j = 0; j < 3; ++j) { - digester.add (matrix (i, j)); - } + digester.add (_red.x); + digester.add (_red.y); + digester.add (_green.x); + digester.add (_green.y); + digester.add (_blue.x); + digester.add (_blue.y); + digester.add (_white.x); + digester.add (_white.y); + + if (_adjusted_white) { + digester.add (_adjusted_white.get().x); + digester.add (_adjusted_white.get().y); } digester.add (dynamic_pointer_cast (_out)->gamma ()); diff --git a/src/lib/config.cc b/src/lib/config.cc index c75eaa0f5..4d24d676b 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -83,6 +83,7 @@ Config::set_defaults () _win32_console = false; #endif + _allowed_dcp_frame_rates.clear (); _allowed_dcp_frame_rates.push_back (24); _allowed_dcp_frame_rates.push_back (25); _allowed_dcp_frame_rates.push_back (30); @@ -90,7 +91,9 @@ Config::set_defaults () _allowed_dcp_frame_rates.push_back (50); _allowed_dcp_frame_rates.push_back (60); + _colour_conversions.clear (); _colour_conversions.push_back (PresetColourConversion (_("sRGB"), dcp::ColourConversion::srgb_to_xyz ())); + _colour_conversions.push_back (PresetColourConversion (_("Rec. 601"), dcp::ColourConversion::rec601_to_xyz ())); _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), dcp::ColourConversion::rec709_to_xyz ())); set_kdm_email_to_default (); diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc index 16b886169..59106098a 100644 --- a/src/lib/j2k_image_proxy.cc +++ b/src/lib/j2k_image_proxy.cc @@ -82,9 +82,9 @@ J2KImageProxy::image (optional note) const shared_ptr image (new Image (PIX_FMT_RGB48LE, _size, true)); if (_mono) { - dcp::xyz_to_rgb (_mono->xyz_image (), dcp::ColourConversion::xyz_to_srgb(), image->data()[0], image->stride()[0], note); + dcp::xyz_to_rgb (_mono->xyz_image (), dcp::ColourConversion::srgb_to_xyz(), image->data()[0], image->stride()[0], note); } else { - dcp::xyz_to_rgb (_stereo->xyz_image (_eye.get ()), dcp::ColourConversion::xyz_to_srgb(), image->data()[0], image->stride()[0], note); + dcp::xyz_to_rgb (_stereo->xyz_image (_eye.get ()), dcp::ColourConversion::srgb_to_xyz(), image->data()[0], image->stride()[0], note); } return image; -- cgit v1.2.3 From 9c9890b9ff89af710db21145c03a09993c629e3e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 22 Apr 2015 15:35:34 +0100 Subject: 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(-) (limited to 'src/lib') 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) { -- cgit v1.2.3 From 20a733fe6782eff04622b5bd189417f391b9cfb9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 22 Apr 2015 15:59:36 +0100 Subject: Add P3 colour conversion preset. --- ChangeLog | 2 ++ cscript | 2 +- src/lib/config.cc | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src/lib') diff --git a/ChangeLog b/ChangeLog index 104a99a00..183ebc341 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2015-04-22 c.hetherington + * Add P3 colour conversion preset. + * Hand-apply all changes relating to colour specification as chromaticity. diff --git a/cscript b/cscript index 0ea227edd..f3387e78a 100644 --- a/cscript +++ b/cscript @@ -156,7 +156,7 @@ def make_control(debian_version, bits, filename, debug): def dependencies(target): return (('ffmpeg-cdist', 'f69bb08'), - ('libdcp', 'b223c57'), + ('libdcp', 'fa1dddf'), ('libsub', 'f66b11f')) def build(target, options): diff --git a/src/lib/config.cc b/src/lib/config.cc index 4d24d676b..ab57c1afc 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -95,6 +95,7 @@ Config::set_defaults () _colour_conversions.push_back (PresetColourConversion (_("sRGB"), dcp::ColourConversion::srgb_to_xyz ())); _colour_conversions.push_back (PresetColourConversion (_("Rec. 601"), dcp::ColourConversion::rec601_to_xyz ())); _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), dcp::ColourConversion::rec709_to_xyz ())); + _colour_conversions.push_back (PresetColourConversion (_("P3 (from SMPTE RP 431-2)"), dcp::ColourConversion::p3_to_xyz ())); set_kdm_email_to_default (); } -- cgit v1.2.3