Basic adaptations for changes to libdcp1 colour conversion handling.

5 files changed, 73 insertions, 103 deletions

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 <dcp/colour_matrix.h>
 #include <dcp/raw_convert.h>
+#include <dcp/gamma_transfer_function.h>
+#include <dcp/modified_gamma_transfer_function.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
 
@@ -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<double> ("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<dcp::TransferFunction> 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<double> ("Gamma")));
+	} else if (in_type == "ModifiedGamma") {
+		_in.reset (new dcp::ModifiedGammaTransferFunction (
+				  in_node->number_child<double> ("Power"),
+				  in_node->number_child<double> ("Threshold"),
+				  in_node->number_child<double> ("A"),
+				  in_node->number_child<double> ("B")
+				  ));
 	}
 
 	list<cxml::NodePtr> m = node->node_children ("Matrix");
 	for (list<cxml::NodePtr>::iterator i = m.begin(); i != m.end(); ++i) {
 		int const ti = (*i)->number_attribute<int> ("i");
 		int const tj = (*i)->number_attribute<int> ("j");
-		matrix(ti, tj) = raw_convert<double> ((*i)->content ());
+		_matrix(ti, tj) = raw_convert<double> ((*i)->content ());
 	}
 
-	output_gamma = node->number_child<double> ("OutputGamma");
+	_out.reset (new dcp::GammaTransferFunction (node->number_child<double> ("OutputGamma")));
 }
 
 boost::optional<ColourConversion>
 ColourConversion::from_xml (cxml::NodePtr node)
 {
-	if (!node->optional_node_child ("InputGamma")) {
+	if (!node->optional_node_child ("InputTransferFunction")) {
 		return boost::optional<ColourConversion> ();
 	}
 
@@ -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<string> (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<const dcp::GammaTransferFunction> (_in)) {
+		shared_ptr<const dcp::GammaTransferFunction> tf = dynamic_pointer_cast<const dcp::GammaTransferFunction> (_in);
+		in_node->add_child("Type")->add_child_text ("Gamma");
+		in_node->add_child("Gamma")->add_child_text (raw_convert<string> (tf->gamma ()));
+	} else if (dynamic_pointer_cast<const dcp::ModifiedGammaTransferFunction> (_in)) {
+		shared_ptr<const dcp::ModifiedGammaTransferFunction> tf = dynamic_pointer_cast<const dcp::ModifiedGammaTransferFunction> (_in);
+		in_node->add_child("Type")->add_child_text ("ModifiedGamma");
+		in_node->add_child("Power")->add_child_text (raw_convert<string> (tf->power ()));
+		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 ()));
+	}
 
+	boost::numeric::ublas::matrix<double> 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<string> (output_gamma));
+	node->add_child("OutputGamma")->add_child_text (raw_convert<string> (dynamic_pointer_cast<const dcp::GammaTransferFunction> (_out)->gamma ()));
 }
 
 optional<size_t>
@@ -132,15 +138,26 @@ string
 ColourConversion::identifier () const
 {
 	MD5Digester digester;
-	
-	digester.add (input_gamma);
-	digester.add (input_gamma_linearised);
+
+	if (dynamic_pointer_cast<const dcp::GammaTransferFunction> (_in)) {
+		shared_ptr<const dcp::GammaTransferFunction> tf = dynamic_pointer_cast<const dcp::GammaTransferFunction> (_in);
+		digester.add (tf->gamma ());
+	} else if (dynamic_pointer_cast<const dcp::ModifiedGammaTransferFunction> (_in)) {
+		shared_ptr<const dcp::ModifiedGammaTransferFunction> tf = dynamic_pointer_cast<const dcp::ModifiedGammaTransferFunction> (_in);
+		digester.add (tf->power ());
+		digester.add (tf->threshold ());
+		digester.add (tf->A ());
+		digester.add (tf->B ());
+	}
+
+	boost::numeric::ublas::matrix<double> 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<const dcp::GammaTransferFunction> (_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
diff --git a/src/lib/colour_conversion.h b/src/lib/colour_conversion.h
index dbc6c9d9d..bf883a07c 100644
--- a/src/lib/colour_conversion.h
+++ b/src/lib/colour_conversion.h
@@ -25,20 +25,19 @@
 #undef check
 #endif
 
+#include <dcp/colour_conversion.h>
 #include <libcxml/cxml.h>
 #include <boost/utility.hpp>
-#include <boost/optional.hpp>
-#include <boost/numeric/ublas/matrix.hpp>
 
 namespace xmlpp {
 	class Node;
 }
 
-class ColourConversion
+class ColourConversion : public dcp::ColourConversion
 {
 public:
 	ColourConversion ();
-	ColourConversion (double, bool, double const matrix[3][3], double);
+	ColourConversion (dcp::ColourConversion);
 	ColourConversion (cxml::NodePtr);
 
 	virtual void as_xml (xmlpp::Node *) const;
@@ -47,18 +46,13 @@ public:
 	boost::optional<size_t> preset () const;
 
 	static boost::optional<ColourConversion> from_xml (cxml::NodePtr);
-
-	double input_gamma;
-	bool input_gamma_linearised;
-	boost::numeric::ublas::matrix<double> matrix;
-	double output_gamma;
 };
 
 class PresetColourConversion
 {
 public:
 	PresetColourConversion ();
-	PresetColourConversion (std::string, double, bool, double const matrix[3][3], double);
+	PresetColourConversion (std::string, dcp::ColourConversion);
 	PresetColourConversion (cxml::NodePtr);
 
 	void as_xml (xmlpp::Node *) const;
diff --git a/src/lib/config.cc b/src/lib/config.cc
index c571376f0..485ecbad7 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -85,9 +85,8 @@ Config::Config ()
 	_allowed_dcp_frame_rates.push_back (50);
 	_allowed_dcp_frame_rates.push_back (60);
 
-	_colour_conversions.push_back (PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6));
-	_colour_conversions.push_back (PresetColourConversion (_("sRGB non-linearised"), 2.4, false, dcp::colour_matrix::srgb_to_xyz, 2.6));
-	_colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, dcp::colour_matrix::rec709_to_xyz, 2.6));
+	_colour_conversions.push_back (PresetColourConversion (_("sRGB"), dcp::ColourConversion::srgb_to_xyz));
+	_colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), dcp::ColourConversion::rec709_to_xyz));
 
 	reset_kdm_email ();
 }
@@ -177,16 +176,15 @@ Config::read ()
 	if (!cc.empty ()) {
 		_colour_conversions.clear ();
 	}
-	
-	for (list<cxml::NodePtr>::iterator i = cc.begin(); i != cc.end(); ++i) {
-		_colour_conversions.push_back (PresetColourConversion (*i));
-	}
 
-	if (!version) {
-		/* Loading version 0 (before Rec. 709 was added as a preset).
-		   Add it in.
-		*/
-		_colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, dcp::colour_matrix::rec709_to_xyz, 2.6));
+	try {
+		for (list<cxml::NodePtr>::iterator i = cc.begin(); i != cc.end(); ++i) {
+			_colour_conversions.push_back (PresetColourConversion (*i));
+		}
+	} catch (cxml::Error) {
+		/* Probably failed to load an old-style ColourConversion tag; just give up */
+		_colour_conversions.push_back (PresetColourConversion (_("sRGB"), dcp::ColourConversion::srgb_to_xyz));
+		_colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), dcp::ColourConversion::rec709_to_xyz));
 	}
 
 	list<cxml::NodePtr> cin = f.node_children ("Cinema");
diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index 62340a468..cca199b05 100644
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -41,7 +41,6 @@
 #include "player_video.h"
 #include "encoded_data.h"
 #include <libcxml/cxml.h>
-#include <dcp/gamma_lut.h>
 #include <dcp/xyz_frame.h>
 #include <dcp/rgb_xyz.h>
 #include <dcp/colour_matrix.h>
@@ -114,25 +113,9 @@ DCPVideo::encode_locally ()
 	shared_ptr<dcp::XYZFrame> xyz;
 
 	if (_frame->colour_conversion()) {
-		ColourConversion conversion = _frame->colour_conversion().get ();
-		shared_ptr<dcp::GammaLUT> in_lut = dcp::GammaLUT::cache.get (
-			12, conversion.input_gamma, conversion.input_gamma_linearised
-			);
-		
-		/* XXX: dcp should probably use boost */
-		
-		double matrix[3][3];
-		for (int i = 0; i < 3; ++i) {
-			for (int j = 0; j < 3; ++j) {
-				matrix[i][j] = conversion.matrix (i, j);
-			}
-		}
-		
 		xyz = dcp::rgb_to_xyz (
 			_frame->image (AV_PIX_FMT_RGB48LE, _burn_subtitles),
-			in_lut,
-			dcp::GammaLUT::cache.get (16, 1 / conversion.output_gamma, false),
-			matrix
+			_frame->colour_conversion().get()
 			);
 	} else {
 		xyz = dcp::xyz_to_xyz (_frame->image (AV_PIX_FMT_RGB48LE, _burn_subtitles));
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 1a03c2af2..5cf4704ea 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -208,7 +208,7 @@ VideoContent::set_default_colour_conversion (bool signal)
 {
 	{
 		boost::mutex::scoped_lock lm (_mutex);
-		_colour_conversion = PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6).conversion;
+		_colour_conversion = ColourConversion (dcp::ColourConversion::srgb_to_xyz);
 	}
 
 	if (signal) {