Add video waveform viewer.

[dcpomatic.git] / test / colour_conversion_test.cc

diff --git a/test/colour_conversion_test.cc b/test/colour_conversion_test.cc
index 3b6a0e19870a2c0bf7dc55b312aa50f8b913481b..da6600f08abc58b042b16ea357dcbb48852dc45b 100644 (file)
--- 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
@@ -36,7 +36,7 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test1)
        ColourConversion B (dcp::ColourConversion::rec709_to_xyz ());
 
        BOOST_CHECK_EQUAL (A.identifier(), "9840c601d2775bf1b3847254bbaa36a9");
-       BOOST_CHECK_EQUAL (B.identifier(), "0778fbc5c87470f58820604a66992579");
+       BOOST_CHECK_EQUAL (B.identifier(), "58151ac92fdf333663a62c9a8ba5c5f4");
 }
 
 BOOST_AUTO_TEST_CASE (colour_conversion_test2)
@@ -56,6 +56,7 @@ BOOST_AUTO_TEST_CASE (colour_conversion_test2)
                "    <A>0.055</A>\n"
                "    <B>12.92</B>\n"
                "  </InputTransferFunction>\n"
+               "  <YUVToRGB>0</YUVToRGB>\n"
                "  <RedX>0.64</RedX>\n"
                "  <RedY>0.33</RedY>\n"
                "  <GreenX>0.3</GreenX>\n"
@@ -80,12 +81,10 @@ 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"
+               "  <YUVToRGB>1</YUVToRGB>\n"
                "  <RedX>0.64</RedX>\n"
                "  <RedY>0.33</RedY>\n"
                "  <GreenX>0.3</GreenX>\n"