X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fcolour_conversion_test.cc;h=94284f879aea0bb99959278454286ad8ccbb9541;hp=eb3e3c294f2432f19a1dce31384c920e422b1510;hb=54af50c3b8e9082f9751e809d63540c51197a4a1;hpb=6154d5f85664a26e9490c9120bef5e742af94490

diff --git a/test/colour_conversion_test.cc b/test/colour_conversion_test.cc
index eb3e3c294..94284f879 100644
--- a/test/colour_conversion_test.cc
+++ b/test/colour_conversion_test.cc
@@ -1,47 +1,51 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    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/>.
 
 */
 
 /** @file  test/colour_conversion_test.cc
- *  @brief Various tests of ColourConversion.
+ *  @brief Test ColourConversion class.
+ *  @ingroup selfcontained
  */
 
 #include "lib/colour_conversion.h"
-#include <dcp/colour_matrix.h>
+#include "lib/film.h"
 #include <dcp/gamma_transfer_function.h>
 #include <libxml++/libxml++.h>
 #include <boost/test/unit_test.hpp>
+#include <boost/foreach.hpp>
+#include <iostream>
 
 using std::cout;
 using boost::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (colour_conversion_test1)
 {
-	ColourConversion A (dcp::ColourConversion::srgb_to_xyz);
-	ColourConversion B (dcp::ColourConversion::rec709_to_xyz);
+	ColourConversion A (dcp::ColourConversion::srgb_to_xyz ());
+	ColourConversion B (dcp::ColourConversion::rec709_to_xyz ());
 
-	BOOST_CHECK_EQUAL (A.identifier(), "8b5a265a7c63c22a6a8fc871c64d6116");
-	BOOST_CHECK_EQUAL (B.identifier(), "bc82e69f700d0426f2ae1848d05ed006");
+	BOOST_CHECK_EQUAL (A.identifier(), "9840c601d2775bf1b3847254bbaa36a9");
+	BOOST_CHECK_EQUAL (B.identifier(), "58151ac92fdf333663a62c9a8ba5c5f4");
 }
 
 BOOST_AUTO_TEST_CASE (colour_conversion_test2)
 {
-	ColourConversion A (dcp::ColourConversion::srgb_to_xyz);
+	ColourConversion A (dcp::ColourConversion::srgb_to_xyz ());
 	xmlpp::Document doc;
 	xmlpp::Element* root = doc.create_root_node ("Test");
 	A.as_xml (root);
@@ -51,28 +55,28 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test2)
 		"<Test>\n"
 		"  <InputTransferFunction>\n"
 		"    <Type>ModifiedGamma</Type>\n"
-		"    <Power>2.400000095367432</Power>\n"
-		"    <Threshold>0.04044999927282333</Threshold>\n"
-		"    <A>0.05499999970197678</A>\n"
-		"    <B>12.92000007629395</B>\n"
+		"    <Power>2.4</Power>\n"
+		"    <Threshold>0.04045</Threshold>\n"
+		"    <A>0.055</A>\n"
+		"    <B>12.92</B>\n"
 		"  </InputTransferFunction>\n"
-		"  <Matrix i=\"0\" j=\"0\">0.4124564</Matrix>\n"
-		"  <Matrix i=\"0\" j=\"1\">0.3575761</Matrix>\n"
-		"  <Matrix i=\"0\" j=\"2\">0.1804375</Matrix>\n"
-		"  <Matrix i=\"1\" j=\"0\">0.2126729</Matrix>\n"
-		"  <Matrix i=\"1\" j=\"1\">0.7151522</Matrix>\n"
-		"  <Matrix i=\"1\" j=\"2\">0.072175</Matrix>\n"
-		"  <Matrix i=\"2\" j=\"0\">0.0193339</Matrix>\n"
-		"  <Matrix i=\"2\" j=\"1\">0.119192</Matrix>\n"
-		"  <Matrix i=\"2\" j=\"2\">0.9503041</Matrix>\n"
-		"  <OutputGamma>2.599999904632568</OutputGamma>\n"
+		"  <YUVToRGB>0</YUVToRGB>\n"
+		"  <RedX>0.64</RedX>\n"
+		"  <RedY>0.33</RedY>\n"
+		"  <GreenX>0.3</GreenX>\n"
+		"  <GreenY>0.6</GreenY>\n"
+		"  <BlueX>0.15</BlueX>\n"
+		"  <BlueY>0.06</BlueY>\n"
+		"  <WhiteX>0.3127</WhiteX>\n"
+		"  <WhiteY>0.329</WhiteY>\n"
+		"  <OutputGamma>2.6</OutputGamma>\n"
 		"</Test>\n"
 		);
 }
 
 BOOST_AUTO_TEST_CASE (colour_conversion_test3)
 {
-	ColourConversion A (dcp::ColourConversion::rec709_to_xyz);
+	ColourConversion A (dcp::ColourConversion::rec709_to_xyz ());
 	xmlpp::Document doc;
 	xmlpp::Element* root = doc.create_root_node ("Test");
 	A.as_xml (root);
@@ -81,22 +85,32 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test3)
 		"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
 		"<Test>\n"
 		"  <InputTransferFunction>\n"
-		"    <Type>ModifiedGamma</Type>\n"
-		"    <Power>2.400000095367432</Power>\n"
-		"    <Threshold>0.08100000023841858</Threshold>\n"
-		"    <A>0.0989999994635582</A>\n"
-		"    <B>4.5</B>\n"
+		"    <Type>Gamma</Type>\n"
+		"    <Gamma>2.2</Gamma>\n"
 		"  </InputTransferFunction>\n"
-		"  <Matrix i=\"0\" j=\"0\">0.4124564</Matrix>\n"
-		"  <Matrix i=\"0\" j=\"1\">0.3575761</Matrix>\n"
-		"  <Matrix i=\"0\" j=\"2\">0.1804375</Matrix>\n"
-		"  <Matrix i=\"1\" j=\"0\">0.2126729</Matrix>\n"
-		"  <Matrix i=\"1\" j=\"1\">0.7151522</Matrix>\n"
-		"  <Matrix i=\"1\" j=\"2\">0.072175</Matrix>\n"
-		"  <Matrix i=\"2\" j=\"0\">0.0193339</Matrix>\n"
-		"  <Matrix i=\"2\" j=\"1\">0.119192</Matrix>\n"
-		"  <Matrix i=\"2\" j=\"2\">0.9503041</Matrix>\n"
-		"  <OutputGamma>2.599999904632568</OutputGamma>\n"
+		"  <YUVToRGB>1</YUVToRGB>\n"
+		"  <RedX>0.64</RedX>\n"
+		"  <RedY>0.33</RedY>\n"
+		"  <GreenX>0.3</GreenX>\n"
+		"  <GreenY>0.6</GreenY>\n"
+		"  <BlueX>0.15</BlueX>\n"
+		"  <BlueY>0.06</BlueY>\n"
+		"  <WhiteX>0.3127</WhiteX>\n"
+		"  <WhiteY>0.329</WhiteY>\n"
+		"  <OutputGamma>2.6</OutputGamma>\n"
 		"</Test>\n"
 		);
 }
+
+/** Test a round trip via the XML representation */
+BOOST_AUTO_TEST_CASE (colour_conversion_test4)
+{
+	BOOST_FOREACH (PresetColourConversion const & i, PresetColourConversion::all ()) {
+		xmlpp::Document out;
+		xmlpp::Element* out_root = out.create_root_node ("Test");
+		i.conversion.as_xml (out_root);
+		shared_ptr<cxml::Document> in (new cxml::Document ("Test"));
+		in->read_string (out.write_to_string ("UTF-8"));
+		BOOST_CHECK (ColourConversion::from_xml (in, Film::current_state_version).get () == i.conversion);
+	}
+}