X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Frgb_xyz_test.cc;h=007879389bf0b7376967f5b69c52739825a98505;hb=refs%2Fheads%2F2507-thumbprint;hp=af79b1e3c49c34ea8c136e50ff7d0d023d048a87;hpb=d39880eef211a296fa8ef4712cdef5945d08527c;p=libdcp.git

diff --git a/test/rgb_xyz_test.cc b/test/rgb_xyz_test.cc
index af79b1e3..00787938 100644
--- a/test/rgb_xyz_test.cc
+++ b/test/rgb_xyz_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,23 +31,31 @@
     files in the program, then also delete it here.
 */
 
-#include "rgb_xyz.h"
-#include "openjpeg_image.h"
+
 #include "colour_conversion.h"
-#include <boost/test/unit_test.hpp>
+#include "openjpeg_image.h"
+#include "piecewise_lut.h"
+#include "rgb_xyz.h"
+#include "stream_operators.h"
 #include <boost/bind.hpp>
+#include <boost/random.hpp>
 #include <boost/scoped_array.hpp>
+#include <boost/test/unit_test.hpp>
+
 
-using std::max;
-using std::list;
-using std::string;
 using std::cout;
+using std::list;
+using std::make_shared;
+using std::max;
 using std::shared_ptr;
+using std::string;
 using boost::optional;
 using boost::scoped_array;
 
-/** Convert a test image from sRGB to XYZ and check that the transforms are right */
-BOOST_AUTO_TEST_CASE (rgb_xyz_test)
+
+static
+void
+rgb_xyz_test_case (std::function<void (uint16_t*)> write_pixel)
 {
 	srand (0);
 	dcp::Size const size (640, 480);
@@ -56,15 +64,12 @@ BOOST_AUTO_TEST_CASE (rgb_xyz_test)
 	for (int y = 0; y < size.height; ++y) {
 		uint16_t* p = reinterpret_cast<uint16_t*> (rgb.get() + y * size.width * 6);
 		for (int x = 0; x < size.width; ++x) {
-			/* Write a 12-bit random number for each component */
-			for (int c = 0; c < 3; ++c) {
-				*p = (rand () & 0xfff) << 4;
-				++p;
-			}
+			write_pixel (p);
+			p += 3;
 		}
 	}
 
-	shared_ptr<dcp::OpenJPEGImage> xyz = dcp::rgb_to_xyz (rgb.get(), size, size.width * 6, dcp::ColourConversion::srgb_to_xyz ());
+	auto xyz = dcp::rgb_to_xyz (rgb.get(), size, size.width * 6, dcp::ColourConversion::srgb_to_xyz());
 
 	for (int y = 0; y < size.height; ++y) {
 		uint16_t* p = reinterpret_cast<uint16_t*> (rgb.get() + y * size.width * 6);
@@ -119,19 +124,57 @@ BOOST_AUTO_TEST_CASE (rgb_xyz_test)
 	}
 }
 
+
+/** Convert a test image from sRGB to XYZ and check that the transforms are right */
+BOOST_AUTO_TEST_CASE (rgb_xyz_test)
+{
+	{
+		int counter = 0;
+		rgb_xyz_test_case ([&counter](uint16_t* p) {
+			p[0] = p[1] = p[2] = (counter << 4);
+			++counter;
+			if (counter >= 4096) {
+				counter = 0;
+			}
+		});
+	}
+
+	boost::random::mt19937 rng(1);
+	boost::random::uniform_int_distribution<> dist(0, 4095);
+
+	rgb_xyz_test_case ([&rng, &dist](uint16_t* p) {
+			   p[0] = dist(rng) << 4;
+			   p[1] = dist(rng) << 4;
+			   p[2] = dist(rng) << 4;
+			   });
+}
+
+
+/** Check the piecewise LUT that is used for inverse gamma calculation */
+BOOST_AUTO_TEST_CASE (rgb_xyz_lut_test)
+{
+	auto conversion = dcp::ColourConversion::rec709_to_xyz();
+	auto lut = dcp::make_inverse_gamma_lut(conversion.out());
+
+	for (double x = 0; x < 1; x += 0.000001) {
+		BOOST_CHECK(std::abs(lrint(lut.lookup(x) * 4095) - lrint(pow(x, 1 / 2.6) * 4095)) < 2);
+	}
+}
+
+
 static list<string> notes;
 
 static void
 note_handler (dcp::NoteType n, string s)
 {
-	BOOST_REQUIRE_EQUAL (n, dcp::DCP_NOTE);
+	BOOST_REQUIRE_EQUAL (n, dcp::NoteType::NOTE);
 	notes.push_back (s);
 }
 
 /** Check that xyz_to_rgb clamps XYZ values correctly */
 BOOST_AUTO_TEST_CASE (xyz_rgb_range_test)
 {
-	shared_ptr<dcp::OpenJPEGImage> xyz (new dcp::OpenJPEGImage (dcp::Size (2, 2)));
+	auto xyz = make_shared<dcp::OpenJPEGImage>(dcp::Size(2, 2));
 
 	xyz->data(0)[0] = -4;
 	xyz->data(0)[1] = 6901;
@@ -154,8 +197,8 @@ BOOST_AUTO_TEST_CASE (xyz_rgb_range_test)
 		);
 
 	/* The 6 out-of-range samples should have been noted */
-	BOOST_REQUIRE_EQUAL (notes.size(), 6);
-	list<string>::const_iterator i = notes.begin ();
+	BOOST_REQUIRE_EQUAL (notes.size(), 6U);
+	auto i = notes.begin ();
 	BOOST_REQUIRE_EQUAL (*i++, "XYZ value -4 out of range");
 	BOOST_REQUIRE_EQUAL (*i++, "XYZ value -4 out of range");
 	BOOST_REQUIRE_EQUAL (*i++, "XYZ value -4 out of range");
@@ -167,7 +210,7 @@ BOOST_AUTO_TEST_CASE (xyz_rgb_range_test)
 	   as inputs at the extremes (0 and 4095).
 	*/
 
-	uint16_t* buffer = reinterpret_cast<uint16_t*> (rgb.get ());
+	auto buffer = reinterpret_cast<uint16_t*> (rgb.get ());
 	BOOST_REQUIRE_EQUAL (buffer[0 * 3 + 0], buffer[2 * 3 + 1]);
 	BOOST_REQUIRE_EQUAL (buffer[0 * 3 + 1], buffer[2 * 3 + 1]);
 	BOOST_REQUIRE_EQUAL (buffer[0 * 3 + 2], buffer[2 * 3 + 2]);