X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcolour_conversion.cc;h=6603e21e68b2e13ef0c35c073c925feda928eec6;hp=73ee722490eaa33a7b46c1182459f9ea0164d67a;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=308488324dbc4d8b709d3fb1dc9fee0479346c21 diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc index 73ee72249..6603e21e6 100644 --- a/src/lib/colour_conversion.cc +++ b/src/lib/colour_conversion.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,13 +17,19 @@ */ -#include -#include -#include -#include #include "config.h" #include "colour_conversion.h" #include "util.h" +#include "md5_digester.h" +#include "raw_convert.h" +#include +#include +#include +#include +#include +#include +#include +#include #include "i18n.h" @@ -33,80 +39,140 @@ using std::cout; using std::vector; using boost::shared_ptr; using boost::optional; -using dcp::raw_convert; +using boost::dynamic_pointer_cast; + +vector PresetColourConversion::_presets; ColourConversion::ColourConversion () - : input_gamma (2.4) - , input_gamma_linearised (true) - , matrix (3, 3) - , output_gamma (2.6) + : dcp::ColourConversion (dcp::ColourConversion::srgb_to_xyz ()) { - for (int i = 0; i < 3; ++i) { - for (int j = 0; j < 3; ++j) { - matrix (i, j) = dcp::colour_matrix::srgb_to_xyz[i][j]; - } - } + } -ColourConversion::ColourConversion (double i, bool il, double const m[3][3], double o) - : input_gamma (i) - , input_gamma_linearised (il) - , matrix (3, 3) - , output_gamma (o) +ColourConversion::ColourConversion (dcp::ColourConversion conversion_) + : dcp::ColourConversion (conversion_) { - for (int i = 0; i < 3; ++i) { - for (int j = 0; j < 3; ++j) { - matrix (i, j) = m[i][j]; - } - } + } -ColourConversion::ColourConversion (cxml::NodePtr node) - : matrix (3, 3) +ColourConversion::ColourConversion (cxml::NodePtr node, int version) { - input_gamma = node->number_child ("InputGamma"); - input_gamma_linearised = node->bool_child ("InputGammaLinearised"); + shared_ptr in; + + if (version >= 32) { + + /* Version 2.x */ + + 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 (in_node->number_child ("Gamma"))); + } else if (in_type == "ModifiedGamma") { + _in.reset (new dcp::ModifiedGammaTransferFunction ( + in_node->number_child ("Power"), + in_node->number_child ("Threshold"), + in_node->number_child ("A"), + in_node->number_child ("B") + )); + } + + } else { - for (int i = 0; i < 3; ++i) { - for (int j = 0; j < 3; ++j) { - matrix (i, j) = 0; + /* Version 1.x */ + + if (node->bool_child ("InputGammaLinearised")) { + _in.reset (new dcp::ModifiedGammaTransferFunction (node->number_child ("InputGamma"), 0.04045, 0.055, 12.92)); + } else { + _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") + ); + } } - output_gamma = node->number_child ("OutputGamma"); + _out.reset (new dcp::GammaTransferFunction (node->number_child ("OutputGamma"))); +} + +boost::optional +ColourConversion::from_xml (cxml::NodePtr node, int version) +{ + if (!node->optional_node_child ("InputTransferFunction")) { + return boost::optional (); + } + + return ColourConversion (node, version); } void ColourConversion::as_xml (xmlpp::Node* node) const { - node->add_child("InputGamma")->add_child_text (raw_convert (input_gamma)); - node->add_child("InputGammaLinearised")->add_child_text (input_gamma_linearised ? "1" : "0"); - - 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))); - } + xmlpp::Node* in_node = node->add_child ("InputTransferFunction"); + if (dynamic_pointer_cast (_in)) { + shared_ptr 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); + 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 ())); } - node->add_child("OutputGamma")->add_child_text (raw_convert (output_gamma)); + node->add_child("YUVToRGB")->add_child_text (raw_convert (_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 ())); } optional ColourConversion::preset () const { - vector presets = Config::instance()->colour_conversions (); + vector presets = PresetColourConversion::all (); size_t i = 0; - while (i < presets.size() && (presets[i].conversion != *this)) { + while (i < presets.size() && presets[i].conversion != *this) { ++i; } @@ -120,21 +186,36 @@ ColourConversion::preset () const string ColourConversion::identifier () const { - double numbers[12]; - - int n = 0; - numbers[n++] = input_gamma; - numbers[n++] = input_gamma_linearised; - for (int i = 0; i < 3; ++i) { - for (int j = 0; j < 3; ++j) { - numbers[n++] = matrix (i, j); - } + MD5Digester digester; + + if (dynamic_pointer_cast (_in)) { + shared_ptr tf = dynamic_pointer_cast (_in); + digester.add (tf->gamma ()); + } else if (dynamic_pointer_cast (_in)) { + shared_ptr tf = dynamic_pointer_cast (_in); + digester.add (tf->power ()); + digester.add (tf->threshold ()); + digester.add (tf->A ()); + digester.add (tf->B ()); } - numbers[n++] = output_gamma; - assert (n == 12); + 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); + } - return md5_digest (numbers, 12 * sizeof (double)); + digester.add (dynamic_pointer_cast (_out)->gamma ()); + + return digester.get (); } PresetColourConversion::PresetColourConversion () @@ -143,56 +224,56 @@ PresetColourConversion::PresetColourConversion () } -PresetColourConversion::PresetColourConversion (string n, double i, bool il, double const m[3][3], double o) - : name (n) - , conversion (i, il, m, o) +PresetColourConversion::PresetColourConversion (string n, string i, dcp::ColourConversion conversion_) + : conversion (conversion_) + , name (n) + , id (i) { } -PresetColourConversion::PresetColourConversion (cxml::NodePtr node) - : conversion (node) +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 +bool +operator== (ColourConversion const & a, ColourConversion const & b) { - conversion.as_xml (node); - node->add_child("Name")->add_child_text (name); + return a.about_equal (b, 1e-6); } -static bool -about_equal (double a, double b) +bool +operator!= (ColourConversion const & a, ColourConversion const & b) { - static const double eps = 1e-6; - return fabs (a - b) < eps; + return !(a == b); } bool -operator== (ColourConversion const & a, ColourConversion const & b) +operator== (PresetColourConversion const & a, PresetColourConversion const & b) { - if ( - !about_equal (a.input_gamma, b.input_gamma) || - a.input_gamma_linearised != b.input_gamma_linearised || - !about_equal (a.output_gamma, b.output_gamma)) { - return false; - } - - for (int i = 0; i < 3; ++i) { - for (int j = 0; j < 3; ++j) { - if (!about_equal (a.matrix (i, j), b.matrix (i, j))) { - return false; - } - } - } + return a.name == b.name && a.conversion == b.conversion; +} - return true; +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 ())); } -bool -operator!= (ColourConversion const & a, ColourConversion const & b) +PresetColourConversion +PresetColourConversion::from_id (string s) { - return !(a == b); + BOOST_FOREACH (PresetColourConversion const& i, _presets) { + if (i.id == s) { + return i; + } + } + + DCPOMATIC_ASSERT (false); }