X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fcolour_conversion_test.cc;h=eb4b79ef892b52d6050009b6f66d7163de994b3f;hb=b9842263a402b5ce1d2f85a1346ca11a419f816e;hp=8c22eeda380f7421d129a79fe0b8f13b534f1b54;hpb=b0ef8e7bb7f8c91f26aca94caf3abc49f2a51af7;p=dcpomatic.git

diff --git a/test/colour_conversion_test.cc b/test/colour_conversion_test.cc
index 8c22eeda3..eb4b79ef8 100644
--- a/test/colour_conversion_test.cc
+++ b/test/colour_conversion_test.cc
@@ -1,5 +1,5 @@
 /*
-    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
     it under the terms of the GNU General Public License as published by
@@ -22,10 +22,12 @@
  */
 
 #include "lib/colour_conversion.h"
+#include "lib/film.h"
 #include <dcp/colour_matrix.h>
 #include <dcp/gamma_transfer_function.h>
 #include <libxml++/libxml++.h>
 #include <boost/test/unit_test.hpp>
+#include <boost/foreach.hpp>
 
 using std::cout;
 using boost::shared_ptr;
@@ -35,8 +37,8 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test1)
 	ColourConversion A (dcp::ColourConversion::srgb_to_xyz ());
 	ColourConversion B (dcp::ColourConversion::rec709_to_xyz ());
 
-	BOOST_CHECK_EQUAL (A.identifier(), "751dd37378fb52502d356ec334a104c8");
-	BOOST_CHECK_EQUAL (B.identifier(), "621cf5bdd8de7e8adc3f4b8d77dc708a");
+	BOOST_CHECK_EQUAL (A.identifier(), "9840c601d2775bf1b3847254bbaa36a9");
+	BOOST_CHECK_EQUAL (B.identifier(), "58151ac92fdf333663a62c9a8ba5c5f4");
 }
 
 BOOST_AUTO_TEST_CASE (colour_conversion_test2)
@@ -56,15 +58,15 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test2)
 		"    <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"
+		"  <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"
 		);
@@ -81,22 +83,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.222222222222222</Power>\n"
-		"    <Threshold>0.081</Threshold>\n"
-		"    <A>0.099</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"
+		"  <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);
+	}
+}