X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimage_test.cc;h=59000918a0155722a3842324ec9ae72b52b2bcd6;hb=c180f317d5a8b27dd191c1f2228ceb6fc4039393;hp=59b35a96bb876c54331da85589b9f12fa3a3ac1b;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git

diff --git a/test/image_test.cc b/test/image_test.cc
index 59b35a96b..59000918a 100644
--- a/test/image_test.cc
+++ b/test/image_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -19,22 +19,22 @@
 */
 
 /** @file  test/image_test.cc
- *  @brief Tests of the Image class.
- *
+ *  @brief Test Image class.
+ *  @ingroup selfcontained
  *  @see test/make_black_test.cc, test/pixel_formats_test.cc
  */
 
-#include <Magick++.h>
 #include "lib/image.h"
+#include "lib/magick_image_proxy.h"
+#include "test.h"
+#include <Magick++.h>
 #include <boost/test/unit_test.hpp>
-#include <boost/make_shared.hpp>
 #include <iostream>
 
 using std::string;
 using std::list;
 using std::cout;
 using boost::shared_ptr;
-using boost::make_shared;
 
 BOOST_AUTO_TEST_CASE (aligned_image_test)
 {
@@ -135,58 +135,57 @@ BOOST_AUTO_TEST_CASE (compact_image_test)
 	delete u;
 }
 
-/** Test Image::alpha_blend */
-BOOST_AUTO_TEST_CASE (alpha_blend_test)
+void
+alpha_blend_test_one (AVPixelFormat format, string suffix)
 {
-	int const stride = 48 * 4;
+	shared_ptr<MagickImageProxy> proxy (new MagickImageProxy (private_data / "prophet_frame.tiff"));
+	shared_ptr<Image> raw = proxy->image();
+	shared_ptr<Image> background = raw->scale (raw->size(), dcp::YUV_TO_RGB_REC709, format, true, false);
 
-	shared_ptr<Image> A = make_shared<Image> (AV_PIX_FMT_RGBA, dcp::Size (48, 48), false);
-	A->make_black ();
-	uint8_t* a = A->data()[0];
+	shared_ptr<Image> overlay (new Image (AV_PIX_FMT_RGBA, raw->size(), true));
+	overlay->make_transparent ();
 
-	for (int y = 0; y < 48; ++y) {
-		uint8_t* p = a + y * stride;
-		for (int x = 0; x < 16; ++x) {
+	for (int y = 0; y < 128; ++y) {
+		uint8_t* p = overlay->data()[0] + y * overlay->stride()[0];
+		for (int x = 0; x < 128; ++x) {
 			p[x * 4] = 255;
-			p[(x + 16) * 4 + 1] = 255;
-			p[(x + 32) * 4 + 2] = 255;
+			p[x * 4 + 3] = 255;
 		}
 	}
 
-	shared_ptr<Image> B = make_shared<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;
+	for (int y = 128; y < 256; ++y) {
+		uint8_t* p = overlay->data()[0] + y * overlay->stride()[0];
+		for (int x = 0; x < 128; ++x) {
 			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 = 256; y < 384; ++y) {
+		uint8_t* p = overlay->data()[0] + y * overlay->stride()[0];
+		for (int x = 0; x < 128; ++x) {
+			p[x * 4 + 2] = 255;
+			p[x * 4 + 3] = 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);
-		}
-	}
+	background->alpha_blend (overlay, Position<int> (0, 0));
+
+	shared_ptr<Image> save = background->scale (background->size(), dcp::YUV_TO_RGB_REC709, AV_PIX_FMT_RGB24, false, false);
+
+	write_image (save, "build/test/image_test_" + suffix + ".png", "RGB");
+	check_image ("build/test/image_test_" + suffix + ".png", private_data / ("image_test_" + suffix + ".png"));
+}
+
+/** Test Image::alpha_blend */
+BOOST_AUTO_TEST_CASE (alpha_blend_test)
+{
+	alpha_blend_test_one (AV_PIX_FMT_RGB24, "rgb24");
+	alpha_blend_test_one (AV_PIX_FMT_BGRA, "bgra");
+	alpha_blend_test_one (AV_PIX_FMT_RGBA, "rgba");
+	alpha_blend_test_one (AV_PIX_FMT_RGB48LE, "rgb48le");
+	alpha_blend_test_one (AV_PIX_FMT_YUV420P, "yuv420p");
+	alpha_blend_test_one (AV_PIX_FMT_YUV420P10LE, "yuv420p10le");
 }
 
 /** Test merge (list<PositionImage>) with a single image */
@@ -194,7 +193,7 @@ BOOST_AUTO_TEST_CASE (merge_test1)
 {
 	int const stride = 48 * 4;
 
-	shared_ptr<Image> A = make_shared<Image> (AV_PIX_FMT_RGBA, dcp::Size (48, 48), false);
+	shared_ptr<Image> A (new Image (AV_PIX_FMT_RGBA, dcp::Size (48, 48), false));
 	A->make_transparent ();
 	uint8_t* a = A->data()[0];
 
@@ -219,7 +218,7 @@ BOOST_AUTO_TEST_CASE (merge_test1)
 /** Test merge (list<PositionImage>) with two images */
 BOOST_AUTO_TEST_CASE (merge_test2)
 {
-	shared_ptr<Image> A = make_shared<Image> (AV_PIX_FMT_RGBA, dcp::Size (48, 1), false);
+	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) {
@@ -229,7 +228,7 @@ BOOST_AUTO_TEST_CASE (merge_test2)
 		a[x * 4 + 3] = 255;
 	}
 
-	shared_ptr<Image> B = make_shared<Image> (AV_PIX_FMT_RGBA, dcp::Size (48, 1), false);
+	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) {