X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcolour_conversion.cc;h=ad09458f98a2ec4338b4ce7f97c1d476966b70b8;hb=dace9781f5fbd7d409f55887c0e04e0cc0ff06d2;hp=95d267a8c9e26afa3443eac4250a7ffe4dff489b;hpb=39960754026821775e6753a83f6934b8befa0dc2;p=dcpomatic.git diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc index 95d267a8c..ad09458f9 100644 --- a/src/lib/colour_conversion.cc +++ b/src/lib/colour_conversion.cc @@ -17,13 +17,16 @@ */ -#include -#include -#include -#include #include "config.h" #include "colour_conversion.h" #include "util.h" +#include "md5_digester.h" +#include +#include +#include +#include +#include +#include #include "i18n.h" @@ -32,77 +35,103 @@ using std::string; using std::cout; using std::vector; using boost::shared_ptr; -using boost::lexical_cast; using boost::optional; +using boost::dynamic_pointer_cast; +using dcp::raw_convert; 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) = libdcp::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 (shared_ptr node) - : matrix (3, 3) +ColourConversion::ColourConversion (cxml::NodePtr node, int version) { - LocaleGuard lg; - - 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 (false, 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") + )); + } - for (int i = 0; i < 3; ++i) { - for (int j = 0; j < 3; ++j) { - matrix (i, j) = 0; + } 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)); + } else { + _in.reset (new dcp::GammaTransferFunction (false, node->number_child ("InputGamma"))); } } - list > m = node->node_children ("Matrix"); - for (list >::iterator i = m.begin(); i != m.end(); ++i) { + 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) = lexical_cast ((*i)->content ()); + _matrix(ti, tj) = raw_convert ((*i)->content ()); } + + _out.reset (new dcp::GammaTransferFunction (true, node->number_child ("OutputGamma"))); +} - output_gamma = 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 { - LocaleGuard lg; - - node->add_child("InputGamma")->add_child_text (lexical_cast (input_gamma)); - node->add_child("InputGammaLinearised")->add_child_text (input_gamma_linearised ? "1" : "0"); + 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 ())); + } + 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", lexical_cast (i)); - m->set_attribute ("j", lexical_cast (j)); - m->add_child_text (lexical_cast (matrix (i, j))); + 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("OutputGamma")->add_child_text (lexical_cast (output_gamma)); + node->add_child("OutputGamma")->add_child_text (raw_convert (dynamic_pointer_cast (_out)->gamma ())); } optional @@ -124,21 +153,29 @@ ColourConversion::preset () const string ColourConversion::identifier () const { - double numbers[12]; + 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 ()); + } - int n = 0; - numbers[n++] = input_gamma; - numbers[n++] = input_gamma_linearised; + boost::numeric::ublas::matrix matrix = _matrix; for (int i = 0; i < 3; ++i) { for (int j = 0; j < 3; ++j) { - numbers[n++] = matrix (i, j); + digester.add (matrix (i, j)); } } - numbers[n++] = output_gamma; - - assert (n == 12); - return md5_digest (numbers, 12 * sizeof (double)); + digester.add (dynamic_pointer_cast (_out)->gamma ()); + + return digester.get (); } PresetColourConversion::PresetColourConversion () @@ -147,15 +184,15 @@ PresetColourConversion::PresetColourConversion () } -PresetColourConversion::PresetColourConversion (string n, double i, bool il, double const m[3][3], double o) +PresetColourConversion::PresetColourConversion (string n, dcp::ColourConversion conversion_) : name (n) - , conversion (i, il, m, o) + , conversion (conversion_) { } -PresetColourConversion::PresetColourConversion (shared_ptr node) - : conversion (node) +PresetColourConversion::PresetColourConversion (cxml::NodePtr node, int version) + : conversion (node, version) { name = node->string_child ("Name"); } @@ -167,32 +204,10 @@ PresetColourConversion::as_xml (xmlpp::Node* node) const node->add_child("Name")->add_child_text (name); } -static bool -about_equal (double a, double b) -{ - static const double eps = 1e-6; - return fabs (a - b) < eps; -} - bool operator== (ColourConversion const & a, ColourConversion 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 true; + return a.about_equal (b, 1e-6); } bool