Merge branch '2.0' of git.carlh.net:git/dcpomatic into 2.0

4 files changed, 264 insertions, 39 deletions

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 2c84b7e35..54cbb090c 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -92,6 +92,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	written_by.Add (wxT ("Terrence Meiczinger"));
 	written_by.Add (wxT ("Ole Laursen"));
 	written_by.Add (wxT ("Brecht Sanders"));
+	written_by.Add (wxT ("Jianguo Huang"));
 	add_section (_("Written by"), written_by);
 
 	wxArrayString translated_by;
@@ -131,6 +132,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	supported_by.Add (wxT ("Alexey Derevyanko"));
 	supported_by.Add (wxT ("Unwana Essien"));
 	supported_by.Add (wxT ("Maxime Estoppey"));
+	supported_by.Add (wxT ("Frechen-Film e.V."));
 	supported_by.Add (wxT ("Jose Angel Velasco Fernandez"));
 	supported_by.Add (wxT ("Andres Fink"));
 	supported_by.Add (wxT ("Evan Freeze"));
@@ -172,6 +174,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	supported_by.Add (wxT ("Bruce Taylor"));
 	supported_by.Add (wxT ("Lawrence Towers"));
 	supported_by.Add (wxT ("Richard Turner"));
+	supported_by.Add (wxT ("Raoul Walzer"));
 	supported_by.Add (wxT ("Frank Wenz"));
 	supported_by.Add (wxT ("Roland Wirtz"));
 	supported_by.Add (wxT ("Wolfgang Woehl"));
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;
 };
 
diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc
index 26f135d48..a1cc5dfc4 100644
--- a/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@ -180,7 +180,13 @@ FilmViewer::get (DCPTime p, bool accurate)
 	if (!pvf.empty ()) {
 		try {
 			_frame = pvf.front()->image (PIX_FMT_RGB24, true, boost::bind (&Log::dcp_log, _film->log().get(), _1, _2));
-			_frame = _frame->scale (_frame->size(), PIX_FMT_RGB24, false);
+
+			dcp::YUVToRGB yuv_to_rgb = dcp::YUV_TO_RGB_REC601;
+			if (pvf.front()->colour_conversion()) {
+				yuv_to_rgb = pvf.front()->colour_conversion().get().yuv_to_rgb();
+			}
+			
+			_frame = _frame->scale (_frame->size(), yuv_to_rgb, PIX_FMT_RGB24, false);
 			_position = pvf.front()->time ();
 			_inter_position = pvf.front()->inter_position ();
 			_inter_size = pvf.front()->inter_size ();