Various playlist editor developments and fixes.

[dcpomatic.git] / test / colour_conversion_test.cc

diff --git a/test/colour_conversion_test.cc b/test/colour_conversion_test.cc
index 35beed519507ac6269f9d2b8a5a4add1ad9aabed..94284f879aea0bb99959278454286ad8ccbb9541 100644 (file)
--- a/test/colour_conversion_test.cc
+++ b/test/colour_conversion_test.cc
@@ -1,31 +1,35 @@
 /*
-    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;
@@ -35,8 +39,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(), "149bc864d969ad7446fa18d62d1690b2");
+       BOOST_CHECK_EQUAL (A.identifier(), "9840c601d2775bf1b3847254bbaa36a9");
+       BOOST_CHECK_EQUAL (B.identifier(), "58151ac92fdf333663a62c9a8ba5c5f4");
 }
 
 BOOST_AUTO_TEST_CASE (colour_conversion_test2)
@@ -56,15 +60,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 +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.4</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);
+       }
+}