X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcolour_conversion.cc;h=a966963af309a8851b5ab8dba05d4c987cb24f1c;hb=351942d335db261ac6fe54f2f8a3f439fef22d47;hp=6603e21e68b2e13ef0c35c073c925feda928eec6;hpb=1858190cff2f960f3d1f0a5cc02c69da86088f5b;p=dcpomatic.git

diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index 6603e21e6..a966963af 100644
--- a/src/lib/colour_conversion.cc
+++ b/src/lib/colour_conversion.cc
@@ -1,31 +1,33 @@
 /*
     Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
 
-    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 <http://www.gnu.org/licenses/>.
 
 */
 
 #include "config.h"
 #include "colour_conversion.h"
 #include "util.h"
-#include "md5_digester.h"
-#include "raw_convert.h"
+#include "digester.h"
+#include <dcp/raw_convert.h>
 #include <dcp/chromaticity.h>
-#include <dcp/colour_matrix.h>
 #include <dcp/gamma_transfer_function.h>
 #include <dcp/modified_gamma_transfer_function.h>
+#include <dcp/identity_transfer_function.h>
+#include <dcp/s_gamut3_transfer_function.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 #include <boost/foreach.hpp>
@@ -40,6 +42,7 @@ using std::vector;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
+using dcp::raw_convert;
 
 vector<PresetColourConversion> PresetColourConversion::_presets;
 
@@ -74,6 +77,8 @@ ColourConversion::ColourConversion (cxml::NodePtr node, int version)
 					   in_node->number_child<double> ("A"),
 					   in_node->number_child<double> ("B")
 					   ));
+		} else if (in_type == "SGamut3") {
+			_in.reset (new dcp::SGamut3TransferFunction ());
 		}
 
 	} else {
@@ -81,9 +86,9 @@ ColourConversion::ColourConversion (cxml::NodePtr node, int version)
 		/* Version 1.x */
 
 		if (node->bool_child ("InputGammaLinearised")) {
-			_in.reset (new dcp::ModifiedGammaTransferFunction (node->number_child<float> ("InputGamma"), 0.04045, 0.055, 12.92));
+			_in.reset (new dcp::ModifiedGammaTransferFunction (node->number_child<double> ("InputGamma"), 0.04045, 0.055, 12.92));
 		} else {
-			_in.reset (new dcp::GammaTransferFunction (node->number_child<float> ("InputGamma")));
+			_in.reset (new dcp::GammaTransferFunction (node->number_child<double> ("InputGamma")));
 		}
 	}
 
@@ -120,7 +125,12 @@ ColourConversion::ColourConversion (cxml::NodePtr node, int version)
 		}
 	}
 
-	_out.reset (new dcp::GammaTransferFunction (node->number_child<double> ("OutputGamma")));
+	optional<double> gamma = node->optional_number_child<double> ("OutputGamma");
+	if (gamma) {
+		_out.reset (new dcp::GammaTransferFunction (node->number_child<double> ("OutputGamma")));
+	} else {
+		_out.reset (new dcp::IdentityTransferFunction ());
+	}
 }
 
 boost::optional<ColourConversion>
@@ -148,9 +158,11 @@ ColourConversion::as_xml (xmlpp::Node* node) const
 		in_node->add_child("Threshold")->add_child_text (raw_convert<string> (tf->threshold ()));
 		in_node->add_child("A")->add_child_text (raw_convert<string> (tf->A ()));
 		in_node->add_child("B")->add_child_text (raw_convert<string> (tf->B ()));
+	} else if (dynamic_pointer_cast<const dcp::SGamut3TransferFunction> (_in)) {
+		in_node->add_child("Type")->add_child_text ("SGamut3");
 	}
 
-	node->add_child("YUVToRGB")->add_child_text (raw_convert<string> (_yuv_to_rgb));
+	node->add_child("YUVToRGB")->add_child_text (raw_convert<string> (static_cast<int> (_yuv_to_rgb)));
 	node->add_child("RedX")->add_child_text (raw_convert<string> (_red.x));
 	node->add_child("RedY")->add_child_text (raw_convert<string> (_red.y));
 	node->add_child("GreenX")->add_child_text (raw_convert<string> (_green.x));
@@ -164,7 +176,10 @@ ColourConversion::as_xml (xmlpp::Node* node) const
 		node->add_child("AdjustedWhiteY")->add_child_text (raw_convert<string> (_adjusted_white.get().y));
 	}
 
-	node->add_child("OutputGamma")->add_child_text (raw_convert<string> (dynamic_pointer_cast<const dcp::GammaTransferFunction> (_out)->gamma ()));
+	if (dynamic_pointer_cast<const dcp::GammaTransferFunction> (_out)) {
+		shared_ptr<const dcp::GammaTransferFunction> gf = dynamic_pointer_cast<const dcp::GammaTransferFunction> (_out);
+		node->add_child("OutputGamma")->add_child_text (raw_convert<string> (gf->gamma ()));
+	}
 }
 
 optional<size_t>
@@ -186,7 +201,7 @@ ColourConversion::preset () const
 string
 ColourConversion::identifier () const
 {
-	MD5Digester digester;
+	Digester digester;
 
 	if (dynamic_pointer_cast<const dcp::GammaTransferFunction> (_in)) {
 		shared_ptr<const dcp::GammaTransferFunction> tf = dynamic_pointer_cast<const dcp::GammaTransferFunction> (_in);
@@ -213,7 +228,10 @@ ColourConversion::identifier () const
 		digester.add (_adjusted_white.get().y);
 	}
 
-	digester.add (dynamic_pointer_cast<const dcp::GammaTransferFunction> (_out)->gamma ());
+	shared_ptr<const dcp::GammaTransferFunction> gf = dynamic_pointer_cast<const dcp::GammaTransferFunction> (_out);
+	if (gf) {
+		digester.add (gf->gamma ());
+	}
 
 	return digester.get ();
 }
@@ -264,6 +282,9 @@ PresetColourConversion::setup_colour_conversion_presets ()
 	_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