Various changes to colour conversion specification to use chromaticities.

5 files changed, 318 insertions, 63 deletions

diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index 4bf84281d..3c076b030 100644
--- a/src/lib/colour_conversion.cc
+++ b/src/lib/colour_conversion.cc
@@ -22,6 +22,7 @@
 #include "util.h"
 #include "md5_digester.h"
 #include "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>
@@ -61,10 +62,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<double> ("Gamma")));
+			_in.reset (new dcp::GammaTransferFunction (in_node->number_child<double> ("Gamma")));
 		} else if (in_type == "ModifiedGamma") {
 			_in.reset (new dcp::ModifiedGammaTransferFunction (
-					   false,
 					   in_node->number_child<double> ("Power"),
 					   in_node->number_child<double> ("Threshold"),
 					   in_node->number_child<double> ("A"),
@@ -77,20 +77,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<float> ("InputGamma"), 0.04045, 0.055, 12.92));
+			_in.reset (new dcp::ModifiedGammaTransferFunction (node->number_child<float> ("InputGamma"), 0.04045, 0.055, 12.92));
 		} else {
-			_in.reset (new dcp::GammaTransferFunction (false, node->number_child<float> ("InputGamma")));
+			_in.reset (new dcp::GammaTransferFunction (node->number_child<float> ("InputGamma")));
 		}
 	}
 
+	_yuv_to_rgb = static_cast<dcp::YUVToRGB> (node->optional_number_child<int>("YUVToRGB").get_value_or (dcp::YUV_TO_RGB_REC601));
+	
 	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 ());
-	}
+	if (!m.empty ()) {
+		/* Read in old <Matrix> nodes and convert them to chromaticities */
+		boost::numeric::ublas::matrix<double> C (3, 3);
+		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");
+			C(ti, tj) = raw_convert<double> ((*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<double> ("RedX"), node->number_child<double> ("RedY"));
+		_green = dcp::Chromaticity (node->number_child<double> ("GreenX"), node->number_child<double> ("GreenY"));
+		_blue = dcp::Chromaticity (node->number_child<double> ("BlueX"), node->number_child<double> ("BlueY"));
+		_white = dcp::Chromaticity (node->number_child<double> ("WhiteX"), node->number_child<double> ("WhiteY"));
+		if (node->optional_node_child ("AdjustedWhiteX")) {
+			_adjusted_white = dcp::Chromaticity (
+				node->number_child<double> ("AdjustedWhiteX"), node->number_child<double> ("AdjustedWhiteY")
+				);
+		}
+	}	
 	
-	_out.reset (new dcp::GammaTransferFunction (true, node->number_child<double> ("OutputGamma")));
+	_out.reset (new dcp::GammaTransferFunction (node->number_child<double> ("OutputGamma")));
 }
 
 boost::optional<ColourConversion>
@@ -120,14 +146,17 @@ ColourConversion::as_xml (xmlpp::Node* node) const
 		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");
-			m->set_attribute ("i", raw_convert<string> (i));
-			m->set_attribute ("j", raw_convert<string> (j));
-			m->add_child_text (raw_convert<string> (matrix (i, j)));
-		}
+	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));
+	node->add_child("GreenY")->add_child_text (raw_convert<string> (_green.y));
+	node->add_child("BlueX")->add_child_text (raw_convert<string> (_blue.x));
+	node->add_child("BlueY")->add_child_text (raw_convert<string> (_blue.y));
+	node->add_child("WhiteX")->add_child_text (raw_convert<string> (_white.x));
+	node->add_child("WhiteY")->add_child_text (raw_convert<string> (_white.y));
+	if (_adjusted_white) {
+		node->add_child("AdjustedWhiteX")->add_child_text (raw_convert<string> (_adjusted_white.get().x));
+		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 ()));
@@ -165,11 +194,18 @@ ColourConversion::identifier () const
 		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 (_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<const dcp::GammaTransferFunction> (_out)->gamma ());
diff --git a/src/lib/config.cc b/src/lib/config.cc
index c75eaa0f5..4d24d676b 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -83,6 +83,7 @@ Config::set_defaults ()
 	_win32_console = false;
 #endif	  
 
+	_allowed_dcp_frame_rates.clear ();
 	_allowed_dcp_frame_rates.push_back (24);
 	_allowed_dcp_frame_rates.push_back (25);
 	_allowed_dcp_frame_rates.push_back (30);
@@ -90,7 +91,9 @@ Config::set_defaults ()
 	_allowed_dcp_frame_rates.push_back (50);
 	_allowed_dcp_frame_rates.push_back (60);
 
+	_colour_conversions.clear ();
 	_colour_conversions.push_back (PresetColourConversion (_("sRGB"), dcp::ColourConversion::srgb_to_xyz ()));
+	_colour_conversions.push_back (PresetColourConversion (_("Rec. 601"), dcp::ColourConversion::rec601_to_xyz ()));
 	_colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), dcp::ColourConversion::rec709_to_xyz ()));
 
 	set_kdm_email_to_default ();
diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index 16b886169..59106098a 100644
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -82,9 +82,9 @@ J2KImageProxy::image (optional<dcp::NoteHandler> note) const
 	shared_ptr<Image> image (new Image (PIX_FMT_RGB48LE, _size, true));
 
 	if (_mono) {
-		dcp::xyz_to_rgb (_mono->xyz_image (), dcp::ColourConversion::xyz_to_srgb(), image->data()[0], image->stride()[0], note);
+		dcp::xyz_to_rgb (_mono->xyz_image (), dcp::ColourConversion::srgb_to_xyz(), image->data()[0], image->stride()[0], note);
 	} else {
-		dcp::xyz_to_rgb (_stereo->xyz_image (_eye.get ()), dcp::ColourConversion::xyz_to_srgb(), image->data()[0], image->stride()[0], note);
+		dcp::xyz_to_rgb (_stereo->xyz_image (_eye.get ()), dcp::ColourConversion::srgb_to_xyz(), image->data()[0], image->stride()[0], note);
 	}
 
 	return image;
diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc
index 3ea144e1d..482e40309 100644
--- a/src/wx/colour_conversion_editor.cc
+++ b/src/wx/colour_conversion_editor.cc
@@ -45,6 +45,8 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent)
 
 	int r = 0;
 
+	subhead (table, this, _("Input gamma correction"), r);
+
 	_input_gamma_linearised = new wxCheckBox (this, wxID_ANY, _("Linearise input gamma curve for low values"));
 	table->Add (_input_gamma_linearised, wxGBPosition (r, 0), wxGBSpan (1, 2));
 	++r;
@@ -88,17 +90,99 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent)
 
         validator.SetIncludes (list);
 
-	add_label_to_grid_bag_sizer (table, this, _("Matrix"), true, wxGBPosition (r, 0));
-	wxFlexGridSizer* matrix_sizer = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+
+	/* YUV to RGB conversion */
+
+	subhead (table, this, _("YUV to RGB conversion"), r);
+	
+	add_label_to_grid_bag_sizer (table, this, _("YUV to RGB matrix"), true, wxGBPosition (r, 0));
+	_yuv_to_rgb = new wxChoice (this, wxID_ANY);
+	_yuv_to_rgb->Append (_("Rec. 601"));
+	_yuv_to_rgb->Append (_("Rec. 709"));
+	table->Add (_yuv_to_rgb, wxGBPosition (r, 1));
+	++r;
+
+	/* RGB to XYZ conversion */
+
+	subhead (table, this, _("RGB to XYZ conversion"), r);
+
+	add_label_to_grid_bag_sizer (table, this, _("x"), false, wxGBPosition (r, 1));
+	add_label_to_grid_bag_sizer (table, this, _("y"), false, wxGBPosition (r, 2));
+	add_label_to_grid_bag_sizer (table, this, _("Matrix"), false, wxGBPosition (r, 3));
+	++r;
+
+	add_label_to_grid_bag_sizer (table, this, _("Red chromaticity"), true, wxGBPosition (r, 0));
+	_red_x = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
+	table->Add (_red_x, wxGBPosition (r, 1));
+	_red_y = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
+	table->Add (_red_y, wxGBPosition (r, 2));
+	++r;
+
+	add_label_to_grid_bag_sizer (table, this, _("Green chromaticity"), true, wxGBPosition (r, 0));
+	_green_x = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
+	table->Add (_green_x, wxGBPosition (r, 1));
+	_green_y = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
+	table->Add (_green_y, wxGBPosition (r, 2));
+	++r;
+
+	add_label_to_grid_bag_sizer (table, this, _("Blue chromaticity"), true, wxGBPosition (r, 0));
+	_blue_x = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
+	table->Add (_blue_x, wxGBPosition (r, 1));
+	_blue_y = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
+	table->Add (_blue_y, wxGBPosition (r, 2));
+	++r;
+
+	add_label_to_grid_bag_sizer (table, this, _("White point"), true, wxGBPosition (r, 0));
+	_white_x = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
+	table->Add (_white_x, wxGBPosition (r, 1));
+	_white_y = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
+	table->Add (_white_y, wxGBPosition (r, 2));
+	++r;
+
+        size = dc.GetTextExtent (wxT ("0.12345678"));
+        size.SetHeight (-1);
+	
+	wxFlexGridSizer* rgb_to_xyz_sizer = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 	for (int i = 0; i < 3; ++i) {
 		for (int j = 0; j < 3; ++j) {
-			_matrix[i][j] = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
-			matrix_sizer->Add (_matrix[i][j]);
+			_rgb_to_xyz[i][j] = new wxStaticText (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0);
+			rgb_to_xyz_sizer->Add (_rgb_to_xyz[i][j]);
 		}
 	}
-	table->Add (matrix_sizer, wxGBPosition (r, 1));
+	table->Add (rgb_to_xyz_sizer, wxGBPosition (r - 4, 3), wxGBSpan (4, 1));
+
+	/* White point adjustment */
+
+        size = dc.GetTextExtent (wxT ("-0.12345678901"));
+        size.SetHeight (-1);
+
+	subhead (table, this, _("White point adjustment"), r);
+
+	_adjust_white = new wxCheckBox (this, wxID_ANY, _("Adjust white point to"));
+	table->Add (_adjust_white, wxGBPosition (r, 0));
+	_adjusted_white_x = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
+	table->Add (_adjusted_white_x, wxGBPosition (r, 1));
+	_adjusted_white_y = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0, validator);
+	table->Add (_adjusted_white_y, wxGBPosition (r, 2));
+	++r;
+
+	add_label_to_grid_bag_sizer (table, this, wxT (""), false, wxGBPosition (r, 0));
 	++r;
 
+        size = dc.GetTextExtent (wxT ("0.12345678"));
+        size.SetHeight (-1);
+	
+	wxFlexGridSizer* bradford_sizer = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+	for (int i = 0; i < 3; ++i) {
+		for (int j = 0; j < 3; ++j) {
+			_bradford[i][j] = new wxStaticText (this, wxID_ANY, wxT (""), wxDefaultPosition, size, 0);
+			bradford_sizer->Add (_bradford[i][j]);
+		}
+	}
+	table->Add (bradford_sizer, wxGBPosition (r - 2, 3), wxGBSpan (2, 1));
+
+	subhead (table, this, _("Output gamma correction"), r);
+	
 	add_label_to_grid_bag_sizer (table, this, _("Output gamma"), true, wxGBPosition (r, 0));
 	wxBoxSizer* output_sizer = new wxBoxSizer (wxHORIZONTAL);
 	/// TRANSLATORS: this means the mathematical reciprocal operation, i.e. we are dividing 1 by the control that
@@ -106,7 +190,7 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent)
 	add_label_to_sizer (output_sizer, this, _("1 / "), false);
 	_output_gamma = new wxSpinCtrlDouble (this);
 	output_sizer->Add (_output_gamma);
-	table->Add (output_sizer, wxGBPosition (r, 1));
+	table->Add (output_sizer, wxGBPosition (r, 1), wxGBSpan (1, 2));
 	++r;
 
 	_input_gamma->SetRange (0.1, 4.0);
@@ -125,15 +209,31 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent)
 	_input_threshold->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::changed, this));
 	_input_A->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::changed, this));
 	_input_B->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::changed, this));
-	for (int i = 0; i < 3; ++i) {
-		for (int j = 0; j < 3; ++j) {
-			_matrix[i][j]->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::changed, this));
-		}
-	}
+	_red_x->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::chromaticity_changed, this));
+	_red_y->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::chromaticity_changed, this));
+	_green_x->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::chromaticity_changed, this));
+	_green_y->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::chromaticity_changed, this));
+	_blue_x->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::chromaticity_changed, this));
+	_blue_y->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::chromaticity_changed, this));
+	_white_x->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::chromaticity_changed, this));
+	_white_y->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::chromaticity_changed, this));
+	_adjust_white->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&ColourConversionEditor::adjusted_white_changed, this));
+	_adjusted_white_x->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::adjusted_white_changed, this));
+	_adjusted_white_y->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::adjusted_white_changed, this));
+	_yuv_to_rgb->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&ColourConversionEditor::changed, this));
 	_output_gamma->Bind (wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, boost::bind (&ColourConversionEditor::changed, this, _output_gamma));
 }
 
 void
+ColourConversionEditor::subhead (wxGridBagSizer* sizer, wxWindow* parent, wxString text, int& row) const
+{
+	wxStaticText* m = new wxStaticText (parent, wxID_ANY, wxT (""));
+	m->SetLabelMarkup ("<b>" + text + "</b>");
+	sizer->Add (m, wxGBPosition (row, 0), wxGBSpan (1, 3), wxALIGN_CENTER_VERTICAL | wxTOP, 12);
+	++row;
+}
+
+void
 ColourConversionEditor::set (ColourConversion conversion)
 {
 	if (dynamic_pointer_cast<const dcp::GammaTransferFunction> (conversion.in ())) {
@@ -142,7 +242,7 @@ ColourConversionEditor::set (ColourConversion conversion)
 		set_spin_ctrl (_input_gamma, tf->gamma ());
 	} else if (dynamic_pointer_cast<const dcp::ModifiedGammaTransferFunction> (conversion.in ())) {
 		shared_ptr<const dcp::ModifiedGammaTransferFunction> tf = dynamic_pointer_cast<const dcp::ModifiedGammaTransferFunction> (conversion.in ());
-		/* Arbitrary default */
+		/* Arbitrary default; not used in this case (greyed out) */
 		_input_gamma->SetValue (2.2);
 		_input_gamma_linearised->SetValue (true);
 		set_spin_ctrl (_input_power, tf->power ());
@@ -151,12 +251,57 @@ ColourConversionEditor::set (ColourConversion conversion)
 		set_text_ctrl (_input_B, tf->B ());
 	}
 
-	boost::numeric::ublas::matrix<double> matrix = conversion.matrix ();
-	for (int i = 0; i < 3; ++i) {
-		for (int j = 0; j < 3; ++j) {
-			set_text_ctrl (_matrix[i][j], matrix(i, j));
-		}
+	_yuv_to_rgb->SetSelection (conversion.yuv_to_rgb ());
+
+	SafeStringStream s;
+	s.setf (std::ios::fixed, std::ios::floatfield);
+	s.precision (6);
+
+	s << conversion.red().x;
+	_red_x->SetValue (std_to_wx (s.str ()));
+
+	s.str ("");
+	s << conversion.red().y;
+	_red_y->SetValue (std_to_wx (s.str ()));
+
+	s.str ("");
+	s << conversion.green().x;
+	_green_x->SetValue (std_to_wx (s.str ()));
+
+	s.str ("");
+	s << conversion.green().y;
+	_green_y->SetValue (std_to_wx (s.str ()));
+
+	s.str ("");
+	s << conversion.blue().x;
+	_blue_x->SetValue (std_to_wx (s.str ()));
+
+	s.str ("");
+	s << conversion.blue().y;
+	_blue_y->SetValue (std_to_wx (s.str ()));
+
+	s.str ("");
+	s << conversion.white().x;
+	_white_x->SetValue (std_to_wx (s.str ()));
+
+	s.str ("");
+	s << conversion.white().y;
+	_white_y->SetValue (std_to_wx (s.str ()));
+
+	if (conversion.adjusted_white ()) {
+		_adjust_white->SetValue (true);
+		s.str ("");
+		s << conversion.adjusted_white().get().x;
+		_adjusted_white_x->SetValue (std_to_wx (s.str ()));
+		s.str ("");
+		s << conversion.adjusted_white().get().y;
+		_adjusted_white_y->SetValue (std_to_wx (s.str ()));
+	} else {
+		_adjust_white->SetValue (false);
 	}
+
+	update_rgb_to_xyz ();
+	update_bradford ();
 	
 	set_spin_ctrl (_output_gamma, dynamic_pointer_cast<const dcp::GammaTransferFunction> (conversion.out ())->gamma ());
 }
@@ -170,7 +315,6 @@ ColourConversionEditor::get () const
 		conversion.set_in (
 			shared_ptr<dcp::ModifiedGammaTransferFunction> (
 				new dcp::ModifiedGammaTransferFunction (
-					false,
 					_input_power->GetValue (),
 					raw_convert<double> (wx_to_std (_input_threshold->GetValue ())),
 					raw_convert<double> (wx_to_std (_input_A->GetValue ())),
@@ -180,30 +324,37 @@ ColourConversionEditor::get () const
 			);
 	} else {
 		conversion.set_in (
-			shared_ptr<dcp::GammaTransferFunction> (
-				new dcp::GammaTransferFunction (
-					false,
-					_input_gamma->GetValue ()
-					)
-				)
+			shared_ptr<dcp::GammaTransferFunction> (new dcp::GammaTransferFunction (_input_gamma->GetValue ()))
 			);
 	}
 
-	boost::numeric::ublas::matrix<double> matrix (3, 3);
-	for (int i = 0; i < 3; ++i) {
-		for (int j = 0; j < 3; ++j) {
-			string const v = wx_to_std (_matrix[i][j]->GetValue ());
-			if (v.empty ()) {
-				matrix (i, j) = 0;
-			} else {
-				matrix (i, j) = raw_convert<double> (v);
-			}
-		}
+	conversion.set_yuv_to_rgb (static_cast<dcp::YUVToRGB> (_yuv_to_rgb->GetSelection ()));
+
+	conversion.set_red (
+		dcp::Chromaticity (raw_convert<double> (wx_to_std (_red_x->GetValue ())), raw_convert<double> (wx_to_std (_red_y->GetValue ())))
+		);
+	conversion.set_green (
+		dcp::Chromaticity (raw_convert<double> (wx_to_std (_green_x->GetValue ())), raw_convert<double> (wx_to_std (_green_y->GetValue ())))
+		);
+	conversion.set_blue (
+		dcp::Chromaticity (raw_convert<double> (wx_to_std (_blue_x->GetValue ())), raw_convert<double> (wx_to_std (_blue_y->GetValue ())))
+		);
+	conversion.set_white (
+		dcp::Chromaticity (raw_convert<double> (wx_to_std (_white_x->GetValue ())), raw_convert<double> (wx_to_std (_white_y->GetValue ())))
+		);
+
+	if (_adjust_white->GetValue ()) {
+		conversion.set_adjusted_white (
+			dcp::Chromaticity (
+				raw_convert<double> (wx_to_std (_adjusted_white_x->GetValue ())),
+				raw_convert<double> (wx_to_std (_adjusted_white_y->GetValue ()))
+				)
+			);
+	} else {
+		conversion.unset_adjusted_white ();
 	}
 
-	conversion.set_matrix (matrix);
-
-	conversion.set_out (shared_ptr<dcp::GammaTransferFunction> (new dcp::GammaTransferFunction (true, _output_gamma->GetValue ())));
+	conversion.set_out (shared_ptr<dcp::GammaTransferFunction> (new dcp::GammaTransferFunction (_output_gamma->GetValue ())));
 
 	return conversion;
 }
@@ -222,6 +373,53 @@ ColourConversionEditor::changed ()
 }
 
 void
+ColourConversionEditor::chromaticity_changed ()
+{
+	update_rgb_to_xyz ();
+	changed ();
+}
+
+void
+ColourConversionEditor::adjusted_white_changed ()
+{
+	update_bradford ();
+	changed ();
+}
+
+void
+ColourConversionEditor::update_bradford ()
+{
+	_adjusted_white_x->Enable (_adjust_white->GetValue ());
+	_adjusted_white_y->Enable (_adjust_white->GetValue ());
+	
+	boost::numeric::ublas::matrix<double> m = get().bradford ();
+	for (int i = 0; i < 3; ++i) {
+		for (int j = 0; j < 3; ++j) {
+			SafeStringStream s;
+			s.setf (std::ios::fixed, std::ios::floatfield);
+			s.precision (7);
+			s << m (i, j);
+			_bradford[i][j]->SetLabel (std_to_wx (s.str ()));
+		}
+	}
+}
+
+void
+ColourConversionEditor::update_rgb_to_xyz ()
+{
+	boost::numeric::ublas::matrix<double> m = get().rgb_to_xyz ();
+	for (int i = 0; i < 3; ++i) {
+		for (int j = 0; j < 3; ++j) {
+			SafeStringStream s;
+			s.setf (std::ios::fixed, std::ios::floatfield);
+			s.precision (7);
+			s << m (i, j);
+			_rgb_to_xyz[i][j]->SetLabel (std_to_wx (s.str ()));
+		}
+	}
+}
+
+void
 ColourConversionEditor::changed (wxSpinCtrlDouble* sc)
 {
 	/* On OS X, it seems that in some cases when a wxSpinCtrlDouble loses focus
diff --git a/src/wx/colour_conversion_editor.h b/src/wx/colour_conversion_editor.h
index 317171aa4..b7467a70a 100644
--- a/src/wx/colour_conversion_editor.h
+++ b/src/wx/colour_conversion_editor.h
@@ -39,6 +39,11 @@ public:
 private:
 	void changed ();
 	void changed (wxSpinCtrlDouble *);
+	void chromaticity_changed ();
+	void adjusted_white_changed ();
+	void update_rgb_to_xyz ();
+	void update_bradford ();
+	void subhead (wxGridBagSizer* sizer, wxWindow* parent, wxString text, int& row) const;
 
 	void set_text_ctrl (wxTextCtrl *, double);
 	void set_spin_ctrl (wxSpinCtrlDouble *, double);
@@ -51,7 +56,20 @@ private:
 	wxTextCtrl* _input_A;
 	wxTextCtrl* _input_B;
 	wxCheckBox* _input_gamma_linearised;
-	wxTextCtrl* _matrix[3][3];
+	wxChoice* _yuv_to_rgb;
+	wxTextCtrl* _red_x;
+	wxTextCtrl* _red_y;
+	wxTextCtrl* _green_x;
+	wxTextCtrl* _green_y;
+	wxTextCtrl* _blue_x;
+	wxTextCtrl* _blue_y;
+	wxTextCtrl* _white_x;
+	wxTextCtrl* _white_y;
+	wxCheckBox* _adjust_white;
+	wxTextCtrl* _adjusted_white_x;
+	wxTextCtrl* _adjusted_white_y;
+	wxStaticText* _rgb_to_xyz[3][3];
+	wxStaticText* _bradford[3][3];
 	wxSpinCtrlDouble* _output_gamma;
 };