X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimage_test.cc;h=9d07f8a0a75d969eda6fe3bdc721b28288614df3;hb=f9d8d9fcac87fa45517cebb0bb1d5c5c1ffc39ee;hp=67daaa509e13ffa768462f00d410416a2f8c40a3;hpb=d80e5a10e99b81bb4c19a8c776769b99fa927b4e;p=dcpomatic.git

diff --git a/test/image_test.cc b/test/image_test.cc
index 67daaa509..9d07f8a0a 100644
--- a/test/image_test.cc
+++ b/test/image_test.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -25,9 +25,8 @@
  */
 
 #include "lib/image.h"
-#include "lib/magick_image_proxy.h"
+#include "lib/ffmpeg_image_proxy.h"
 #include "test.h"
-#include <Magick++.h>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
 
@@ -138,17 +137,17 @@ BOOST_AUTO_TEST_CASE (compact_image_test)
 void
 alpha_blend_test_one (AVPixelFormat format, string suffix)
 {
-	shared_ptr<MagickImageProxy> proxy (new MagickImageProxy (private_data / "prophet_frame.tiff"));
-	shared_ptr<Image> raw = proxy->image();
+	shared_ptr<FFmpegImageProxy> proxy (new FFmpegImageProxy (private_data / "prophet_frame.tiff"));
+	shared_ptr<Image> raw = proxy->image().first;
 	shared_ptr<Image> background = raw->convert_pixel_format (dcp::YUV_TO_RGB_REC709, format, true, false);
 
-	shared_ptr<Image> overlay (new Image (AV_PIX_FMT_RGBA, raw->size(), true));
+	shared_ptr<Image> overlay (new Image (AV_PIX_FMT_BGRA, dcp::Size(431, 891), true));
 	overlay->make_transparent ();
 
 	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 * 4 + 2] = 255;
 			p[x * 4 + 3] = 255;
 		}
 	}
@@ -164,12 +163,12 @@ alpha_blend_test_one (AVPixelFormat format, string suffix)
 	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] = 255;
 			p[x * 4 + 3] = 255;
 		}
 	}
 
-	background->alpha_blend (overlay, Position<int> (0, 0));
+	background->alpha_blend (overlay, Position<int> (13, 17));
 
 	shared_ptr<Image> save = background->convert_pixel_format (dcp::YUV_TO_RGB_REC709, AV_PIX_FMT_RGB24, false, false);
 
@@ -185,7 +184,8 @@ BOOST_AUTO_TEST_CASE (alpha_blend_test)
 	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");
+	alpha_blend_test_one (AV_PIX_FMT_YUV420P10, "yuv420p10");
+	alpha_blend_test_one (AV_PIX_FMT_YUV422P10LE, "yuv422p10le");
 }
 
 /** Test merge (list<PositionImage>) with a single image */
@@ -193,14 +193,14 @@ 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));
+	shared_ptr<Image> A (new Image (AV_PIX_FMT_BGRA, 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 */
+			/* blue */
 			p[x * 4] = 255;
 			/* opaque */
 			p[x * 4 + 3] = 255;
@@ -218,21 +218,21 @@ BOOST_AUTO_TEST_CASE (merge_test1)
 /** 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));
+	shared_ptr<Image> A (new Image (AV_PIX_FMT_BGRA, dcp::Size (48, 1), false));
 	A->make_transparent ();
 	uint8_t* a = A->data()[0];
 	for (int x = 0; x < 16; ++x) {
-		/* red */
+		/* blue */
 		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));
+	shared_ptr<Image> B (new Image (AV_PIX_FMT_BGRA, dcp::Size (48, 1), false));
 	B->make_transparent ();
 	uint8_t* b = B->data()[0];
 	for (int x = 0; x < 16; ++x) {
-		/* blue */
+		/* red */
 		b[(x + 32) * 4 + 2] = 255;
 		/* opaque */
 		b[(x + 32) * 4 + 3] = 255;
@@ -259,8 +259,8 @@ BOOST_AUTO_TEST_CASE (merge_test2)
 /** Test Image::crop_scale_window with YUV420P and some windowing */
 BOOST_AUTO_TEST_CASE (crop_scale_window_test)
 {
-	shared_ptr<MagickImageProxy> proxy(new MagickImageProxy("test/data/flat_red.png"));
-	shared_ptr<Image> raw = proxy->image();
+	shared_ptr<FFmpegImageProxy> proxy(new FFmpegImageProxy("test/data/flat_red.png"));
+	shared_ptr<Image> raw = proxy->image().first;
 	shared_ptr<Image> out = raw->crop_scale_window(Crop(), dcp::Size(1998, 836), dcp::Size(1998, 1080), dcp::YUV_TO_RGB_REC709, AV_PIX_FMT_YUV420P, true, false);
 	shared_ptr<Image> save = out->scale(dcp::Size(1998, 1080), dcp::YUV_TO_RGB_REC709, AV_PIX_FMT_RGB24, false, false);
 	write_image(save, "build/test/crop_scale_window_test.png", "RGB");