From 6154d5f85664a26e9490c9120bef5e742af94490 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 28 Dec 2014 01:00:25 +0000 Subject: Basic adaptations for changes to libdcp1 colour conversion handling. --- src/lib/colour_conversion.cc | 119 +++++++++++++++++++++---------------------- 1 file changed, 57 insertions(+), 62 deletions(-) (limited to 'src/lib/colour_conversion.cc') diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc index 6dd4ab876..32bc3c1a5 100644 --- a/src/lib/colour_conversion.cc +++ b/src/lib/colour_conversion.cc @@ -23,6 +23,8 @@ #include "md5_digester.h" #include #include +#include +#include #include #include @@ -34,60 +36,52 @@ using std::cout; using std::vector; using boost::shared_ptr; 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) = 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) { - input_gamma = node->number_child ("InputGamma"); - input_gamma_linearised = node->bool_child ("InputGammaLinearised"); - - for (int i = 0; i < 3; ++i) { - for (int j = 0; j < 3; ++j) { - matrix (i, j) = 0; - } + shared_ptr in; + + 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") + )); } 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 ()); + _matrix(ti, tj) = raw_convert ((*i)->content ()); } - output_gamma = node->number_child ("OutputGamma"); + _out.reset (new dcp::GammaTransferFunction (node->number_child ("OutputGamma"))); } boost::optional ColourConversion::from_xml (cxml::NodePtr node) { - if (!node->optional_node_child ("InputGamma")) { + if (!node->optional_node_child ("InputTransferFunction")) { return boost::optional (); } @@ -97,9 +91,21 @@ ColourConversion::from_xml (cxml::NodePtr node) 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"); + 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"); @@ -109,7 +115,7 @@ ColourConversion::as_xml (xmlpp::Node* node) const } } - node->add_child("OutputGamma")->add_child_text (raw_convert (output_gamma)); + node->add_child("OutputGamma")->add_child_text (raw_convert (dynamic_pointer_cast (_out)->gamma ())); } optional @@ -132,15 +138,26 @@ string ColourConversion::identifier () const { MD5Digester digester; - - digester.add (input_gamma); - digester.add (input_gamma_linearised); + + 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 ()); + } + + 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 (output_gamma); + + digester.add (dynamic_pointer_cast (_out)->gamma ()); return digester.get (); } @@ -151,9 +168,9 @@ 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_) { } @@ -171,32 +188,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 -- cgit v1.2.3