X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fimage_test.cc;h=5561f021c5a57afb3c489910a6de6213a9778ce3;hp=82ebe0b1ff5e6825c0db29bbd92f8fc2495092f8;hb=c5c0e55b2d2ec97a8dd96f4d3e93f85d13cc9d84;hpb=373f010a7f04add1f49169cbaa60cb7ae5f508d4

diff --git a/test/image_test.cc b/test/image_test.cc
index 82ebe0b1f..5561f021c 100644
--- a/test/image_test.cc
+++ b/test/image_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 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
@@ -17,15 +17,24 @@
 
 */
 
+/** @file  test/image_test.cc
+ *  @brief Tests of the Image class.
+ *
+ *  @see test/make_black_test.cc, test/pixel_formats_test.cc
+ */
+
 #include <boost/test/unit_test.hpp>
+#include <Magick++.h>
 #include "lib/image.h"
-#include "lib/scaler.h"
 
+using std::string;
+using std::list;
+using std::cout;
 using boost::shared_ptr;
 
 BOOST_AUTO_TEST_CASE (aligned_image_test)
 {
-	Image* s = new Image (PIX_FMT_RGB24, libdcp::Size (50, 50), true);
+	Image* s = new Image (PIX_FMT_RGB24, dcp::Size (50, 50), true);
 	BOOST_CHECK_EQUAL (s->components(), 1);
 	/* 160 is 150 aligned to the nearest 32 bytes */
 	BOOST_CHECK_EQUAL (s->stride()[0], 160);
@@ -47,12 +56,12 @@ BOOST_AUTO_TEST_CASE (aligned_image_test)
 	BOOST_CHECK (t->data() != s->data());
 	BOOST_CHECK (t->data()[0] != s->data()[0]);
 	BOOST_CHECK (t->line_size() != s->line_size());
-	BOOST_CHECK (t->line_size()[0] == s->line_size()[0]);
+	BOOST_CHECK_EQUAL (t->line_size()[0], s->line_size()[0]);
 	BOOST_CHECK (t->stride() != s->stride());
-	BOOST_CHECK (t->stride()[0] == s->stride()[0]);
+	BOOST_CHECK_EQUAL (t->stride()[0], s->stride()[0]);
 
 	/* assignment operator */
-	Image* u = new Image (PIX_FMT_YUV422P, libdcp::Size (150, 150), false);
+	Image* u = new Image (PIX_FMT_YUV422P, dcp::Size (150, 150), false);
 	*u = *s;
 	BOOST_CHECK_EQUAL (u->components(), 1);
 	BOOST_CHECK_EQUAL (u->stride()[0], 160);
@@ -64,9 +73,9 @@ BOOST_AUTO_TEST_CASE (aligned_image_test)
 	BOOST_CHECK (u->data() != s->data());
 	BOOST_CHECK (u->data()[0] != s->data()[0]);
 	BOOST_CHECK (u->line_size() != s->line_size());
-	BOOST_CHECK (u->line_size()[0] == s->line_size()[0]);
+	BOOST_CHECK_EQUAL (u->line_size()[0], s->line_size()[0]);
 	BOOST_CHECK (u->stride() != s->stride());
-	BOOST_CHECK (u->stride()[0] == s->stride()[0]);
+	BOOST_CHECK_EQUAL (u->stride()[0], s->stride()[0]);
 
 	delete s;
 	delete t;
@@ -75,7 +84,7 @@ BOOST_AUTO_TEST_CASE (aligned_image_test)
 
 BOOST_AUTO_TEST_CASE (compact_image_test)
 {
-	Image* s = new Image (PIX_FMT_RGB24, libdcp::Size (50, 50), false);
+	Image* s = new Image (PIX_FMT_RGB24, dcp::Size (50, 50), false);
 	BOOST_CHECK_EQUAL (s->components(), 1);
 	BOOST_CHECK_EQUAL (s->stride()[0], 50 * 3);
 	BOOST_CHECK_EQUAL (s->line_size()[0], 50 * 3);
@@ -96,12 +105,12 @@ BOOST_AUTO_TEST_CASE (compact_image_test)
 	BOOST_CHECK (t->data() != s->data());
 	BOOST_CHECK (t->data()[0] != s->data()[0]);
 	BOOST_CHECK (t->line_size() != s->line_size());
-	BOOST_CHECK (t->line_size()[0] == s->line_size()[0]);
+	BOOST_CHECK_EQUAL (t->line_size()[0], s->line_size()[0]);
 	BOOST_CHECK (t->stride() != s->stride());
-	BOOST_CHECK (t->stride()[0] == s->stride()[0]);
+	BOOST_CHECK_EQUAL (t->stride()[0], s->stride()[0]);
 
 	/* assignment operator */
-	Image* u = new Image (PIX_FMT_YUV422P, libdcp::Size (150, 150), true);
+	Image* u = new Image (PIX_FMT_YUV422P, dcp::Size (150, 150), true);
 	*u = *s;
 	BOOST_CHECK_EQUAL (u->components(), 1);
 	BOOST_CHECK_EQUAL (u->stride()[0], 50 * 3);
@@ -113,9 +122,9 @@ BOOST_AUTO_TEST_CASE (compact_image_test)
 	BOOST_CHECK (u->data() != s->data());
 	BOOST_CHECK (u->data()[0] != s->data()[0]);
 	BOOST_CHECK (u->line_size() != s->line_size());
-	BOOST_CHECK (u->line_size()[0] == s->line_size()[0]);
+	BOOST_CHECK_EQUAL (u->line_size()[0], s->line_size()[0]);
 	BOOST_CHECK (u->stride() != s->stride());
-	BOOST_CHECK (u->stride()[0] == s->stride()[0]);
+	BOOST_CHECK_EQUAL (u->stride()[0], s->stride()[0]);
 
 	delete s;
 	delete t;
@@ -125,7 +134,7 @@ BOOST_AUTO_TEST_CASE (compact_image_test)
 BOOST_AUTO_TEST_CASE (crop_image_test)
 {
 	/* This was to check out a bug with valgrind, and is probably not very useful */
-	shared_ptr<Image> image (new Image (PIX_FMT_YUV420P, libdcp::Size (16, 16), true));
+	shared_ptr<Image> image (new Image (PIX_FMT_YUV420P, dcp::Size (16, 16), true));
 	image->make_black ();
 	Crop crop;
 	crop.top = 3;
@@ -138,7 +147,7 @@ BOOST_AUTO_TEST_CASE (crop_image_test)
 BOOST_AUTO_TEST_CASE (crop_image_test2)
 {
 	/* Here's a 1998 x 1080 image which is black */
-	shared_ptr<Image> image (new Image (PIX_FMT_YUV420P, libdcp::Size (1998, 1080), true));
+	shared_ptr<Image> image (new Image (PIX_FMT_YUV420P, dcp::Size (1998, 1080), true));
 	image->make_black ();
 
 	/* Crop it by 1 pixel */
@@ -147,7 +156,7 @@ BOOST_AUTO_TEST_CASE (crop_image_test2)
 	image = image->crop (crop, true);
 
 	/* Convert it back to RGB to make comparison to black easier */
-	image = image->scale (image->size(), Scaler::from_id ("bicubic"), PIX_FMT_RGB24, true);
+	image = image->scale (image->size(), dcp::YUV_TO_RGB_REC601, PIX_FMT_RGB24, true);
 
 	/* Check that its still black after the crop */
 	uint8_t* p = image->data()[0];
@@ -161,3 +170,185 @@ BOOST_AUTO_TEST_CASE (crop_image_test2)
 		p += image->stride()[0];
 	}
 }
+
+static
+void
+crop_scale_window_single (AVPixelFormat in_format, dcp::Size in_size, Crop crop, dcp::Size inter_size, dcp::Size out_size)
+{
+	/* Set up our test image */
+	shared_ptr<Image> test (new Image (in_format, in_size, true));
+	uint8_t n = 0;
+	for (int c = 0; c < test->components(); ++c) {
+		uint8_t* p = test->data()[c];
+		for (int y = 0; y < test->lines(c); ++y) {
+			for (int x = 0; x < test->stride()[c]; ++x) {
+				*p++ = n++;
+			}
+		}
+	}
+				
+	/* Convert using separate methods */
+	boost::shared_ptr<Image> sep = test->crop (crop, true);
+	sep = sep->scale (inter_size, dcp::YUV_TO_RGB_REC601, PIX_FMT_RGB24, true);
+	boost::shared_ptr<Image> sep_container (new Image (PIX_FMT_RGB24, out_size, true));
+	sep_container->make_black ();
+	sep_container->copy (sep, Position<int> ((out_size.width - inter_size.width) / 2, (out_size.height - inter_size.height) / 2));
+
+	/* Convert using the all-in-one method */
+	shared_ptr<Image> all = test->crop_scale_window (crop, inter_size, out_size, dcp::YUV_TO_RGB_REC601, PIX_FMT_RGB24, true);
+
+	/* Compare */
+	BOOST_CHECK_EQUAL (sep_container->size().width, all->size().width);
+	BOOST_CHECK_EQUAL (sep_container->size().height, all->size().height);
+
+	/* Assuming RGB on these */
+	BOOST_CHECK_EQUAL (sep_container->components(), 1);
+	BOOST_CHECK_EQUAL (all->components(), 1);
+
+	uint8_t* p = sep_container->data()[0];
+	uint8_t* q = all->data()[0];
+	for (int y = 0; y < all->size().height; ++y) {
+		uint8_t* pp = p;
+		uint8_t* qq = q;
+		for (int x = 0; x < all->size().width * 3; ++x) {
+			BOOST_CHECK_EQUAL (*pp++, *qq++);
+		}
+		p += sep_container->stride()[0];
+		q += all->stride()[0];
+	}
+}
+
+/** Test Image::crop_scale_window against separate calls to crop/scale/copy */
+BOOST_AUTO_TEST_CASE (crop_scale_window_test)
+{
+	crop_scale_window_single (AV_PIX_FMT_YUV422P, dcp::Size (640, 480), Crop (), dcp::Size (640, 480), dcp::Size (640, 480));
+	crop_scale_window_single (AV_PIX_FMT_YUV422P, dcp::Size (640, 480), Crop (2, 4, 6, 8), dcp::Size (640, 480), dcp::Size (640, 480));
+	crop_scale_window_single (AV_PIX_FMT_YUV422P, dcp::Size (640, 480), Crop (2, 4, 6, 8), dcp::Size (1920, 1080), dcp::Size (1998, 1080));
+	crop_scale_window_single (AV_PIX_FMT_YUV422P, dcp::Size (640, 480), Crop (1, 4, 6, 8), dcp::Size (1920, 1080), dcp::Size (1998, 1080));
+	crop_scale_window_single (AV_PIX_FMT_YUV420P, dcp::Size (640, 480), Crop (16, 16, 0, 0), dcp::Size (1920, 1080), dcp::Size (1998, 1080));
+	crop_scale_window_single (AV_PIX_FMT_YUV420P, dcp::Size (640, 480), Crop (16, 3, 3, 0), dcp::Size (1920, 1080), dcp::Size (1998, 1080));
+	crop_scale_window_single (AV_PIX_FMT_RGB24, dcp::Size (1000, 800), Crop (0, 0, 0, 0), dcp::Size (1920, 1080), dcp::Size (1998, 1080));
+	crop_scale_window_single (AV_PIX_FMT_RGB24, dcp::Size (1000, 800), Crop (55, 0, 1, 9), dcp::Size (1920, 1080), dcp::Size (1998, 1080));
+}
+
+/** Test Image::alpha_blend */
+BOOST_AUTO_TEST_CASE (alpha_blend_test)
+{
+	int const stride = 48 * 4;
+	
+	shared_ptr<Image> A (new Image (AV_PIX_FMT_RGBA, dcp::Size (48, 48), false));
+	A->make_black ();
+	uint8_t* a = A->data()[0];
+
+	for (int y = 0; y < 48; ++y) {
+		uint8_t* p = a + y * stride;
+		for (int x = 0; x < 16; ++x) {
+			p[x * 4] = 255;
+			p[(x + 16) * 4 + 1] = 255;
+			p[(x + 32) * 4 + 2] = 255;
+		}
+	}
+
+	shared_ptr<Image> B (new Image (AV_PIX_FMT_RGBA, dcp::Size (48, 48), true));
+	B->make_transparent ();
+	uint8_t* b = B->data()[0];
+
+	for (int y = 32; y < 48; ++y) {
+		uint8_t* p = b + y * stride;
+		for (int x = 0; x < 48; ++x) {
+			p[x * 4] = 255;
+			p[x * 4 + 1] = 255;
+			p[x * 4 + 2] = 255;
+			p[x * 4 + 3] = 255;
+		}
+	}
+
+	A->alpha_blend (B, Position<int> (0, 0));
+
+	for (int y = 0; y < 32; ++y) {
+		uint8_t* p = a + y * stride;
+		for (int x = 0; x < 16; ++x) {
+			BOOST_CHECK_EQUAL (p[x * 4], 255);
+			BOOST_CHECK_EQUAL (p[(x + 16) * 4 + 1], 255);
+			BOOST_CHECK_EQUAL (p[(x + 32) * 4 + 2], 255);
+		}
+	}
+
+	for (int y = 32; y < 48; ++y) {
+		uint8_t* p = a + y * stride;
+		for (int x = 0; x < 48; ++x) {
+			BOOST_CHECK_EQUAL (p[x * 4], 255);
+			BOOST_CHECK_EQUAL (p[x * 4 + 1], 255);
+			BOOST_CHECK_EQUAL (p[x * 4 + 2], 255);
+			BOOST_CHECK_EQUAL (p[x * 4 + 3], 255);
+		}
+	}
+}
+
+/** Test merge (list<PositionImage>) with a single image */
+BOOST_AUTO_TEST_CASE (merge_test1)
+{
+	int const stride = 48 * 4;
+	
+	shared_ptr<Image> A (new Image (AV_PIX_FMT_RGBA, dcp::Size (48, 48), false));
+	A->make_transparent ();
+	uint8_t* a = A->data()[0];
+
+	for (int y = 0; y < 48; ++y) {
+		uint8_t* p = a + y * stride;
+		for (int x = 0; x < 16; ++x) {
+			/* red */
+			p[x * 4] = 255;
+			/* opaque */
+			p[x * 4 + 3] = 255;
+		}
+	}
+
+	list<PositionImage> all;
+	all.push_back (PositionImage (A, Position<int> (0, 0)));
+	PositionImage merged = merge (all);
+
+	BOOST_CHECK (merged.position == Position<int> (0, 0));
+	BOOST_CHECK_EQUAL (memcmp (merged.image->data()[0], A->data()[0], stride * 48), 0);
+}
+
+/** Test merge (list<PositionImage>) with two images */
+BOOST_AUTO_TEST_CASE (merge_test2)
+{
+	shared_ptr<Image> A (new Image (AV_PIX_FMT_RGBA, dcp::Size (48, 1), false));
+	A->make_transparent ();
+	uint8_t* a = A->data()[0];
+	for (int x = 0; x < 16; ++x) {
+		/* red */
+		a[x * 4] = 255;
+		/* opaque */
+		a[x * 4 + 3] = 255;
+	}
+
+	shared_ptr<Image> B (new Image (AV_PIX_FMT_RGBA, dcp::Size (48, 1), false));
+	B->make_transparent ();
+	uint8_t* b = B->data()[0];
+	for (int x = 0; x < 16; ++x) {
+		/* blue */
+		b[(x + 32) * 4 + 2] = 255;
+		/* opaque */
+		b[(x + 32) * 4 + 3] = 255;
+	}
+
+	list<PositionImage> all;
+	all.push_back (PositionImage (A, Position<int> (0, 0)));
+	all.push_back (PositionImage (B, Position<int> (0, 0)));
+	PositionImage merged = merge (all);
+
+	BOOST_CHECK (merged.position == Position<int> (0, 0));
+
+	uint8_t* m = merged.image->data()[0];
+
+	for (int x = 0; x < 16; ++x) {
+		BOOST_CHECK_EQUAL (m[x * 4], 255);
+		BOOST_CHECK_EQUAL (m[x * 4 + 3], 255);
+		BOOST_CHECK_EQUAL (m[(x + 16) * 4 + 3], 0);
+		BOOST_CHECK_EQUAL (m[(x + 32) * 4 + 2], 255);
+		BOOST_CHECK_EQUAL (m[(x + 32) * 4 + 3], 255);
+	}
+}