X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcolour_conversion.cc;h=6cf4ed646a6b9625e269f3eed5ccfd2b6dcd8357;hp=ad09458f98a2ec4338b4ce7f97c1d476966b70b8;hb=da44da6f31f97d39ca91c35955e573e76371f2c2;hpb=f7642b4e1384156e3ce4f689474331ea7b958cbb diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc index ad09458f9..6cf4ed646 100644 --- a/src/lib/colour_conversion.cc +++ b/src/lib/colour_conversion.cc @@ -1,32 +1,39 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2021 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ #include "config.h" #include "colour_conversion.h" #include "util.h" -#include "md5_digester.h" -#include +#include "digester.h" +#include "warnings.h" #include +#include #include #include +#include +#include #include +DCPOMATIC_DISABLE_WARNINGS #include +DCPOMATIC_ENABLE_WARNINGS +#include #include "i18n.h" @@ -34,21 +41,24 @@ using std::list; using std::string; using std::cout; using std::vector; -using boost::shared_ptr; +using std::make_shared; +using std::shared_ptr; using boost::optional; -using boost::dynamic_pointer_cast; +using std::dynamic_pointer_cast; using dcp::raw_convert; +vector PresetColourConversion::_presets; + ColourConversion::ColourConversion () : dcp::ColourConversion (dcp::ColourConversion::srgb_to_xyz ()) { - + } ColourConversion::ColourConversion (dcp::ColourConversion conversion_) : dcp::ColourConversion (conversion_) { - + } ColourConversion::ColourConversion (cxml::NodePtr node, int version) @@ -59,39 +69,71 @@ ColourConversion::ColourConversion (cxml::NodePtr node, int version) /* Version 2.x */ - cxml::ConstNodePtr in_node = node->node_child ("InputTransferFunction"); - string in_type = in_node->string_child ("Type"); + auto in_node = node->node_child ("InputTransferFunction"); + auto in_type = in_node->string_child ("Type"); if (in_type == "Gamma") { - _in.reset (new dcp::GammaTransferFunction (false, in_node->number_child ("Gamma"))); + _in = make_shared(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"), - in_node->number_child ("B") - )); + _in = make_shared( + in_node->number_child("Power"), + in_node->number_child("Threshold"), + in_node->number_child("A"), + in_node->number_child("B") + ); + } else if (in_type == "SGamut3") { + _in = make_shared(); } } else { /* 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"))); } } - 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 ()); + _yuv_to_rgb = static_cast(node->optional_number_child("YUVToRGB").get_value_or(static_cast(dcp::YUVToRGB::REC601))); + + auto m = node->node_children ("Matrix"); + if (!m.empty ()) { + /* Read in old nodes and convert them to chromaticities */ + boost::numeric::ublas::matrix C (3, 3); + for (auto i: m) { + 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") + ); + } + } + + auto gamma = node->optional_number_child("OutputGamma"); + if (gamma) { + _out = make_shared(node->number_child("OutputGamma")); + } else { + _out = make_shared(); } - - _out.reset (new dcp::GammaTransferFunction (true, node->number_child ("OutputGamma"))); } boost::optional @@ -107,44 +149,53 @@ ColourConversion::from_xml (cxml::NodePtr node, int version) void ColourConversion::as_xml (xmlpp::Node* node) const { - xmlpp::Node* in_node = node->add_child ("InputTransferFunction"); + auto in_node = node->add_child ("InputTransferFunction"); if (dynamic_pointer_cast (_in)) { - shared_ptr tf = dynamic_pointer_cast (_in); + auto tf = dynamic_pointer_cast (_in); in_node->add_child("Type")->add_child_text ("Gamma"); in_node->add_child("Gamma")->add_child_text (raw_convert (tf->gamma ())); } else if (dynamic_pointer_cast (_in)) { - shared_ptr tf = dynamic_pointer_cast (_in); + auto tf = dynamic_pointer_cast (_in); in_node->add_child("Type")->add_child_text ("ModifiedGamma"); in_node->add_child("Power")->add_child_text (raw_convert (tf->power ())); in_node->add_child("Threshold")->add_child_text (raw_convert (tf->threshold ())); in_node->add_child("A")->add_child_text (raw_convert (tf->A ())); in_node->add_child("B")->add_child_text (raw_convert (tf->B ())); + } else if (dynamic_pointer_cast (_in)) { + in_node->add_child("Type")->add_child_text ("SGamut3"); } - 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("YUVToRGB")->add_child_text (raw_convert (static_cast (_yuv_to_rgb))); + 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 ())); + if (dynamic_pointer_cast (_out)) { + shared_ptr gf = dynamic_pointer_cast (_out); + node->add_child("OutputGamma")->add_child_text (raw_convert (gf->gamma ())); + } } optional ColourConversion::preset () const { - vector presets = Config::instance()->colour_conversions (); + auto presets = PresetColourConversion::all (); size_t i = 0; - while (i < presets.size() && (presets[i].conversion != *this)) { + while (i < presets.size() && presets[i].conversion != *this) { ++i; } if (i >= presets.size ()) { - return optional (); + return {}; } return i; @@ -153,7 +204,7 @@ ColourConversion::preset () const string ColourConversion::identifier () const { - MD5Digester digester; + Digester digester; if (dynamic_pointer_cast (_in)) { shared_ptr tf = dynamic_pointer_cast (_in); @@ -166,15 +217,25 @@ 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); + } + + auto gf = dynamic_pointer_cast (_out); + if (gf) { + digester.add (gf->gamma ()); } - digester.add (dynamic_pointer_cast (_out)->gamma ()); - return digester.get (); } @@ -184,24 +245,19 @@ PresetColourConversion::PresetColourConversion () } -PresetColourConversion::PresetColourConversion (string n, dcp::ColourConversion conversion_) - : name (n) - , conversion (conversion_) +PresetColourConversion::PresetColourConversion (string n, string i, dcp::ColourConversion conversion_) + : conversion (conversion_) + , name (n) + , id (i) { } PresetColourConversion::PresetColourConversion (cxml::NodePtr node, int version) : conversion (node, version) + , name (node->string_child ("Name")) { - name = node->string_child ("Name"); -} -void -PresetColourConversion::as_xml (xmlpp::Node* node) const -{ - conversion.as_xml (node); - node->add_child("Name")->add_child_text (name); } bool @@ -215,3 +271,33 @@ operator!= (ColourConversion const & a, ColourConversion const & b) { return !(a == b); } + +bool +operator== (PresetColourConversion const & a, PresetColourConversion const & b) +{ + return a.name == b.name && a.conversion == b.conversion; +} + +void +PresetColourConversion::setup_colour_conversion_presets () +{ + _presets.push_back (PresetColourConversion (_("sRGB"), "srgb", dcp::ColourConversion::srgb_to_xyz ())); + _presets.push_back (PresetColourConversion (_("Rec. 601"), "rec601", dcp::ColourConversion::rec601_to_xyz ())); + _presets.push_back (PresetColourConversion (_("Rec. 709"), "rec709", dcp::ColourConversion::rec709_to_xyz ())); + _presets.push_back (PresetColourConversion (_("P3"), "p3", dcp::ColourConversion::p3_to_xyz ())); + _presets.push_back (PresetColourConversion (_("Rec. 1886"), "rec1886", dcp::ColourConversion::rec1886_to_xyz ())); + _presets.push_back (PresetColourConversion (_("Rec. 2020"), "rec2020", dcp::ColourConversion::rec2020_to_xyz ())); + _presets.push_back (PresetColourConversion (_("S-Gamut3/S-Log3"), "sgamut3", dcp::ColourConversion::s_gamut3_to_xyz ())); +} + +PresetColourConversion +PresetColourConversion::from_id (string s) +{ + for (auto const& i: _presets) { + if (i.id == s) { + return i; + } + } + + DCPOMATIC_ASSERT (false); +}