X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimage_test.cc;h=4df4f9125a6889a1cfce4931f9af34fb6b023288;hb=HEAD;hp=899961f50cd8869cad3cc6cf75a2e43391aea3a9;hpb=81dc813cda9ace9951e0aabb835bdfff098da2de;p=dcpomatic.git

diff --git a/test/image_test.cc b/test/image_test.cc
index 899961f50..4df4f9125 100644
--- a/test/image_test.cc
+++ b/test/image_test.cc
@@ -203,7 +203,7 @@ alpha_blend_test_rgba64be_onto(AVPixelFormat format, string suffix)
 	for (int y = 0; y < 128; ++y) {
 		auto p = reinterpret_cast<uint16_t*>(overlay->data()[0] + y * overlay->stride()[0]);
 		for (int x = 0; x < 128; ++x) {
-			p[x * 4 + 2] = 65535;
+			p[x * 4 + 0] = 65535;
 			p[x * 4 + 3] = 65535;
 		}
 	}
@@ -219,7 +219,7 @@ alpha_blend_test_rgba64be_onto(AVPixelFormat format, string suffix)
 	for (int y = 256; y < 384; ++y) {
 		auto p = reinterpret_cast<uint16_t*>(overlay->data()[0] + y * overlay->stride()[0]);
 		for (int x = 0; x < 128; ++x) {
-			p[x * 4] = 65535;
+			p[x * 4 + 2] = 65535;
 			p[x * 4 + 3] = 65535;
 		}
 	}
@@ -242,8 +242,10 @@ BOOST_AUTO_TEST_CASE (alpha_blend_test)
 	alpha_blend_test_bgra_onto(AV_PIX_FMT_RGB48LE, "rgb48le");
 	alpha_blend_test_bgra_onto(AV_PIX_FMT_YUV420P, "yuv420p");
 	alpha_blend_test_bgra_onto(AV_PIX_FMT_YUV420P10, "yuv420p10");
-	alpha_blend_test_bgra_onto(AV_PIX_FMT_YUV422P10LE, "yuv422p9le");
+	alpha_blend_test_bgra_onto(AV_PIX_FMT_YUV422P9LE, "yuv422p9le");
 	alpha_blend_test_bgra_onto(AV_PIX_FMT_YUV422P10LE, "yuv422p10le");
+	alpha_blend_test_bgra_onto(AV_PIX_FMT_YUV444P9LE, "yuv444p9le");
+	alpha_blend_test_bgra_onto(AV_PIX_FMT_YUV444P10LE, "yuv444p10le");
 
 	alpha_blend_test_rgba64be_onto(AV_PIX_FMT_RGB24, "rgb24");
 	alpha_blend_test_rgba64be_onto(AV_PIX_FMT_BGRA, "bgra");
@@ -251,8 +253,10 @@ BOOST_AUTO_TEST_CASE (alpha_blend_test)
 	alpha_blend_test_rgba64be_onto(AV_PIX_FMT_RGB48LE, "rgb48le");
 	alpha_blend_test_rgba64be_onto(AV_PIX_FMT_YUV420P, "yuv420p");
 	alpha_blend_test_rgba64be_onto(AV_PIX_FMT_YUV420P10, "yuv420p10");
-	alpha_blend_test_rgba64be_onto(AV_PIX_FMT_YUV422P10LE, "yuv422p9le");
+	alpha_blend_test_rgba64be_onto(AV_PIX_FMT_YUV422P9LE, "yuv422p9le");
 	alpha_blend_test_rgba64be_onto(AV_PIX_FMT_YUV422P10LE, "yuv422p10le");
+	alpha_blend_test_rgba64be_onto(AV_PIX_FMT_YUV444P9LE, "yuv444p9le");
+	alpha_blend_test_rgba64be_onto(AV_PIX_FMT_YUV444P10LE, "yuv444p10le");
 }
 
 
@@ -654,7 +658,6 @@ BOOST_AUTO_TEST_CASE (make_black_test)
 		AV_PIX_FMT_RGB555LE, // 46
 	};
 
-	int N = 0;
 	for (auto i: pix_fmts) {
 		auto foo = make_shared<Image>(i, in_size, Image::Alignment::PADDED);
 		foo->make_black ();
@@ -671,8 +674,6 @@ BOOST_AUTO_TEST_CASE (make_black_test)
 			}
 			p += bar->stride()[0];
 		}
-
-		++N;
 	}
 }
 
@@ -698,7 +699,6 @@ BOOST_AUTO_TEST_CASE (make_part_black_test)
 		{ 128, 64 },
 	};
 
-	int N = 0;
 	for (auto i: pix_fmts) {
 		for (auto j: positions) {
 			auto foo = original->convert_pixel_format(dcp::YUVToRGB::REC601, i, Image::Alignment::PADDED, false);
@@ -731,8 +731,6 @@ BOOST_AUTO_TEST_CASE (make_part_black_test)
 				}
 				p += bar->stride()[0];
 			}
-
-			++N;
 		}
 	}
 }