X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcolour_conversion.cc;h=cb3a92c1a428ffa4988356b7eb06c1bfb4551a4e;hb=5229b795b9d7cafe174496fbc6bca8d62f4a3ff0;hp=028912f2b482b2c00d281671724094cab834b407;hpb=a112eeb4d052b1212f94e95efd83a215213da691;p=dcpomatic.git diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc index 028912f2b..cb3a92c1a 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 @@ -21,12 +21,14 @@ #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" @@ -37,7 +39,8 @@ using std::vector; using boost::shared_ptr; using boost::optional; using boost::dynamic_pointer_cast; -using dcp::raw_convert; + +vector PresetColourConversion::_presets; ColourConversion::ColourConversion () : dcp::ColourConversion (dcp::ColourConversion::srgb_to_xyz ()) @@ -62,10 +65,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"), @@ -78,20 +80,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 @@ -121,14 +149,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 ())); @@ -137,7 +168,7 @@ ColourConversion::as_xml (xmlpp::Node* node) const 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)) { ++i; @@ -166,11 +197,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 ()); @@ -185,8 +223,8 @@ PresetColourConversion::PresetColourConversion () } PresetColourConversion::PresetColourConversion (string n, dcp::ColourConversion conversion_) - : name (n) - , conversion (conversion_) + : conversion (conversion_) + , name (n) { } @@ -198,13 +236,6 @@ PresetColourConversion::PresetColourConversion (cxml::NodePtr node, int version) } -void -PresetColourConversion::as_xml (xmlpp::Node* node) const -{ - conversion.as_xml (node); - node->add_child("Name")->add_child_text (name); -} - bool operator== (ColourConversion const & a, ColourConversion const & b) { @@ -216,3 +247,18 @@ 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"), dcp::ColourConversion::srgb_to_xyz ())); + _presets.push_back (PresetColourConversion (_("Rec. 601"), dcp::ColourConversion::rec601_to_xyz ())); + _presets.push_back (PresetColourConversion (_("Rec. 709"), dcp::ColourConversion::rec709_to_xyz ())); + _presets.push_back (PresetColourConversion (_("P3"), dcp::ColourConversion::p3_to_xyz ())); +}