X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimage_test.cc;h=cad30813c6da0203b515d892a188d6c706eb4126;hb=9d1d1cea1cdf17b4cc2208800ca22288f979d3ec;hp=bbaf9bd742fa38b8eb08bf4204783ba65892accc;hpb=6041247db96664be4785098f9a190adb279a3f3e;p=dcpomatic.git

diff --git a/test/image_test.cc b/test/image_test.cc
index bbaf9bd74..cad30813c 100644
--- a/test/image_test.cc
+++ b/test/image_test.cc
@@ -30,6 +30,8 @@
 #include "lib/image.h"
 #include "lib/image_content.h"
 #include "lib/image_decoder.h"
+#include "lib/image_jpeg.h"
+#include "lib/image_png.h"
 #include "lib/ffmpeg_image_proxy.h"
 #include "test.h"
 #include <boost/test/unit_test.hpp>
@@ -39,13 +41,12 @@
 using std::cout;
 using std::list;
 using std::make_shared;
-using std::shared_ptr;
 using std::string;
 
 
 BOOST_AUTO_TEST_CASE (aligned_image_test)
 {
-	auto s = new Image (AV_PIX_FMT_RGB24, dcp::Size (50, 50), true);
+	auto s = new Image (AV_PIX_FMT_RGB24, dcp::Size (50, 50), Image::Alignment::PADDED);
 	BOOST_CHECK_EQUAL (s->planes(), 1);
 	/* 192 is 150 aligned to the nearest 64 bytes */
 	BOOST_CHECK_EQUAL (s->stride()[0], 192);
@@ -72,7 +73,7 @@ BOOST_AUTO_TEST_CASE (aligned_image_test)
 	BOOST_CHECK_EQUAL (t->stride()[0], s->stride()[0]);
 
 	/* assignment operator */
-	auto u = new Image (AV_PIX_FMT_YUV422P, dcp::Size (150, 150), false);
+	auto u = new Image (AV_PIX_FMT_YUV422P, dcp::Size (150, 150), Image::Alignment::COMPACT);
 	*u = *s;
 	BOOST_CHECK_EQUAL (u->planes(), 1);
 	BOOST_CHECK_EQUAL (u->stride()[0], 192);
@@ -96,7 +97,7 @@ BOOST_AUTO_TEST_CASE (aligned_image_test)
 
 BOOST_AUTO_TEST_CASE (compact_image_test)
 {
-	auto s = new Image (AV_PIX_FMT_RGB24, dcp::Size (50, 50), false);
+	auto s = new Image (AV_PIX_FMT_RGB24, dcp::Size (50, 50), Image::Alignment::COMPACT);
 	BOOST_CHECK_EQUAL (s->planes(), 1);
 	BOOST_CHECK_EQUAL (s->stride()[0], 50 * 3);
 	BOOST_CHECK_EQUAL (s->line_size()[0], 50 * 3);
@@ -122,7 +123,7 @@ BOOST_AUTO_TEST_CASE (compact_image_test)
 	BOOST_CHECK_EQUAL (t->stride()[0], s->stride()[0]);
 
 	/* assignment operator */
-	auto u = new Image (AV_PIX_FMT_YUV422P, dcp::Size (150, 150), true);
+	auto u = new Image (AV_PIX_FMT_YUV422P, dcp::Size (150, 150), Image::Alignment::PADDED);
 	*u = *s;
 	BOOST_CHECK_EQUAL (u->planes(), 1);
 	BOOST_CHECK_EQUAL (u->stride()[0], 50 * 3);
@@ -144,14 +145,15 @@ BOOST_AUTO_TEST_CASE (compact_image_test)
 }
 
 
+static
 void
-alpha_blend_test_one (AVPixelFormat format, string suffix)
+alpha_blend_test_bgra_onto(AVPixelFormat format, string suffix)
 {
-	auto proxy = make_shared<FFmpegImageProxy>(TestPaths::private_data() / "prophet_frame.tiff", VideoRange::FULL);
-	auto raw = proxy->image().image;
-	auto background = raw->convert_pixel_format (dcp::YUVToRGB::REC709, format, true, false);
+	auto proxy = make_shared<FFmpegImageProxy>(TestPaths::private_data() / "prophet_frame.tiff");
+	auto raw = proxy->image(Image::Alignment::PADDED).image;
+	auto background = raw->convert_pixel_format (dcp::YUVToRGB::REC709, format, Image::Alignment::PADDED, false);
 
-	auto overlay = make_shared<Image>(AV_PIX_FMT_BGRA, dcp::Size(431, 891), true);
+	auto overlay = make_shared<Image>(AV_PIX_FMT_BGRA, dcp::Size(431, 891), Image::Alignment::PADDED);
 	overlay->make_transparent ();
 
 	for (int y = 0; y < 128; ++y) {
@@ -180,23 +182,169 @@ alpha_blend_test_one (AVPixelFormat format, string suffix)
 
 	background->alpha_blend (overlay, Position<int> (13, 17));
 
-	auto save = background->convert_pixel_format (dcp::YUVToRGB::REC709, AV_PIX_FMT_RGB24, false, false);
+	auto save = background->convert_pixel_format (dcp::YUVToRGB::REC709, AV_PIX_FMT_RGB24, Image::Alignment::COMPACT, false);
 
-	write_image (save, "build/test/image_test_" + suffix + ".png");
-	check_image ("build/test/image_test_" + suffix + ".png", TestPaths::private_data() / ("image_test_" + suffix + ".png"));
+	write_image(save, "build/test/image_test_bgra_" + suffix + ".png");
+	check_image("build/test/image_test_bgra_" + suffix + ".png", TestPaths::private_data() / ("image_test_bgra_" + suffix + ".png"));
+}
+
+
+static
+void
+alpha_blend_test_rgba64be_onto(AVPixelFormat format, string suffix)
+{
+	auto proxy = make_shared<FFmpegImageProxy>(TestPaths::private_data() / "prophet_frame.tiff");
+	auto raw = proxy->image(Image::Alignment::PADDED).image;
+	auto background = raw->convert_pixel_format (dcp::YUVToRGB::REC709, format, Image::Alignment::PADDED, false);
+
+	auto overlay = make_shared<Image>(AV_PIX_FMT_RGBA64BE, dcp::Size(431, 891), Image::Alignment::PADDED);
+	overlay->make_transparent();
+
+	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 + 0] = 65535;
+			p[x * 4 + 3] = 65535;
+		}
+	}
+
+	for (int y = 128; y < 256; ++y) {
+		auto p = reinterpret_cast<uint16_t*>(overlay->data()[0] + y * overlay->stride()[0]);
+		for (int x = 0; x < 128; ++x) {
+			p[x * 4 + 1] = 65535;
+			p[x * 4 + 3] = 65535;
+		}
+	}
+
+	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 + 2] = 65535;
+			p[x * 4 + 3] = 65535;
+		}
+	}
+
+	background->alpha_blend(overlay, Position<int>(13, 17));
+
+	auto save = background->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_RGB24, Image::Alignment::COMPACT, false);
+
+	write_image(save, "build/test/image_test_rgba64_" + suffix + ".png");
+	check_image("build/test/image_test_rgba64_" + suffix + ".png", TestPaths::private_data() / ("image_test_rgba64_" + 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_YUV420P10, "yuv420p10");
-	alpha_blend_test_one (AV_PIX_FMT_YUV422P10LE, "yuv422p10le");
+	alpha_blend_test_bgra_onto(AV_PIX_FMT_RGB24, "rgb24");
+	alpha_blend_test_bgra_onto(AV_PIX_FMT_BGRA, "bgra");
+	alpha_blend_test_bgra_onto(AV_PIX_FMT_RGBA, "rgba");
+	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_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");
+	alpha_blend_test_rgba64be_onto(AV_PIX_FMT_RGBA, "rgba");
+	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_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");
+}
+
+
+/** Test Image::alpha_blend when blending RGBA onto XYZ12LE */
+BOOST_AUTO_TEST_CASE(alpha_blend_test_rgba_onto_xyz)
+{
+	Image xyz(AV_PIX_FMT_XYZ12LE, dcp::Size(50, 50), Image::Alignment::PADDED);
+	xyz.make_black();
+
+	auto overlay = make_shared<Image>(AV_PIX_FMT_RGBA, dcp::Size(8, 8), Image::Alignment::PADDED);
+	for (int y = 0; y < 8; ++y) {
+		uint8_t* p = overlay->data()[0] + (y * overlay->stride()[0]);
+		for (int x = 0; x < 8; ++x) {
+			*p++ = 255;
+			*p++ = 0;
+			*p++ = 0;
+			*p++ = 255;
+		}
+	}
+
+	xyz.alpha_blend(overlay, Position<int>(4, 4));
+
+	for (int y = 0; y < 50; ++y) {
+		uint16_t* p = reinterpret_cast<uint16_t*>(xyz.data()[0]) + (y * xyz.stride()[0] / 2);
+		for (int x = 0; x < 50; ++x) {
+			if (4 <= x && x < 12 && 4 <= y && y < 12) {
+				BOOST_REQUIRE_EQUAL(p[0], 45078U);
+				BOOST_REQUIRE_EQUAL(p[1], 34939U);
+				BOOST_REQUIRE_EQUAL(p[2], 13892U);
+			} else {
+				BOOST_REQUIRE_EQUAL(p[0], 0U);
+				BOOST_REQUIRE_EQUAL(p[1], 0U);
+				BOOST_REQUIRE_EQUAL(p[2], 0U);
+			}
+			p += 3;
+		}
+	}
+}
+
+
+/** Test Image::alpha_blend when blending RGBA64BE onto XYZ12LE */
+BOOST_AUTO_TEST_CASE(alpha_blend_test_rgba64be_onto_xyz)
+{
+	Image xyz(AV_PIX_FMT_XYZ12LE, dcp::Size(50, 50), Image::Alignment::PADDED);
+	xyz.make_black();
+
+	auto overlay = make_shared<Image>(AV_PIX_FMT_RGBA64BE, dcp::Size(8, 8), Image::Alignment::PADDED);
+	for (int y = 0; y < 8; ++y) {
+		auto p = reinterpret_cast<uint16_t*>(overlay->data()[0] + (y * overlay->stride()[0]));
+		for (int x = 0; x < 8; ++x) {
+			*p++ = 65535;
+			*p++ = 0;
+			*p++ = 0;
+			*p++ = 65535;
+		}
+	}
+
+	xyz.alpha_blend(overlay, Position<int>(4, 4));
+
+	for (int y = 0; y < 50; ++y) {
+		auto p = reinterpret_cast<uint16_t*>(xyz.data()[0]) + (y * xyz.stride()[0] / 2);
+		for (int x = 0; x < 50; ++x) {
+			if (4 <= x && x < 12 && 4 <= y && y < 12) {
+				BOOST_REQUIRE_EQUAL(p[0], 45078U);
+				BOOST_REQUIRE_EQUAL(p[1], 34939U);
+				BOOST_REQUIRE_EQUAL(p[2], 13892U);
+			} else {
+				BOOST_REQUIRE_EQUAL(p[0], 0U);
+				BOOST_REQUIRE_EQUAL(p[1], 0U);
+				BOOST_REQUIRE_EQUAL(p[2], 0U);
+			}
+			p += 3;
+		}
+	}
+}
+
+
+BOOST_AUTO_TEST_CASE(alpha_blend_text)
+{
+	Image target(AV_PIX_FMT_RGB24, dcp::Size(1998, 1080), Image::Alignment::PADDED);
+	target.make_black();
+
+	FFmpegImageProxy subtitle_proxy(TestPaths::private_data() / "16-bit-sub.png");
+	auto subtitle = subtitle_proxy.image(Image::Alignment::COMPACT);
+
+	target.alpha_blend(subtitle.image, Position<int>(0, 0));
+	write_image(make_shared<Image>(target), "build/test/alpha_blend_text.png");
+	check_image("build/test/alpha_blend_text.png", TestPaths::private_data() / "16-bit-sub-blended.png");
 }
 
 
@@ -205,7 +353,7 @@ BOOST_AUTO_TEST_CASE (merge_test1)
 {
 	int const stride = 48 * 4;
 
-	auto A = make_shared<Image>(AV_PIX_FMT_BGRA, dcp::Size (48, 48), false);
+	auto A = make_shared<Image>(AV_PIX_FMT_BGRA, dcp::Size (48, 48), Image::Alignment::COMPACT);
 	A->make_transparent ();
 	auto a = A->data()[0];
 
@@ -221,7 +369,7 @@ BOOST_AUTO_TEST_CASE (merge_test1)
 
 	list<PositionImage> all;
 	all.push_back (PositionImage (A, Position<int>(0, 0)));
-	auto merged = merge (all);
+	auto merged = merge (all, Image::Alignment::COMPACT);
 
 	BOOST_CHECK (merged.position == Position<int>(0, 0));
 	BOOST_CHECK_EQUAL (memcmp (merged.image->data()[0], A->data()[0], stride * 48), 0);
@@ -231,7 +379,7 @@ BOOST_AUTO_TEST_CASE (merge_test1)
 /** Test merge (list<PositionImage>) with two images */
 BOOST_AUTO_TEST_CASE (merge_test2)
 {
-	auto A = make_shared<Image>(AV_PIX_FMT_BGRA, dcp::Size (48, 1), false);
+	auto A = make_shared<Image>(AV_PIX_FMT_BGRA, dcp::Size (48, 1), Image::Alignment::COMPACT);
 	A->make_transparent ();
 	auto a = A->data()[0];
 	for (int x = 0; x < 16; ++x) {
@@ -241,7 +389,7 @@ BOOST_AUTO_TEST_CASE (merge_test2)
 		a[x * 4 + 3] = 255;
 	}
 
-	auto B = make_shared<Image>(AV_PIX_FMT_BGRA, dcp::Size (48, 1), false);
+	auto B = make_shared<Image>(AV_PIX_FMT_BGRA, dcp::Size (48, 1), Image::Alignment::COMPACT);
 	B->make_transparent ();
 	auto b = B->data()[0];
 	for (int x = 0; x < 16; ++x) {
@@ -254,7 +402,7 @@ BOOST_AUTO_TEST_CASE (merge_test2)
 	list<PositionImage> all;
 	all.push_back (PositionImage(A, Position<int>(0, 0)));
 	all.push_back (PositionImage(B, Position<int>(0, 0)));
-	auto merged = merge (all);
+	auto merged = merge (all, Image::Alignment::COMPACT);
 
 	BOOST_CHECK (merged.position == Position<int>(0, 0));
 
@@ -273,12 +421,12 @@ BOOST_AUTO_TEST_CASE (merge_test2)
 /** Test Image::crop_scale_window with YUV420P and some windowing */
 BOOST_AUTO_TEST_CASE (crop_scale_window_test)
 {
-	auto proxy = make_shared<FFmpegImageProxy>("test/data/flat_red.png", VideoRange::FULL);
-	auto raw = proxy->image().image;
+	auto proxy = make_shared<FFmpegImageProxy>("test/data/flat_red.png");
+	auto raw = proxy->image(Image::Alignment::PADDED).image;
 	auto out = raw->crop_scale_window(
-		Crop(), dcp::Size(1998, 836), dcp::Size(1998, 1080), dcp::YUVToRGB::REC709, VideoRange::FULL, AV_PIX_FMT_YUV420P, VideoRange::FULL, true, false
+		Crop(), dcp::Size(1998, 836), dcp::Size(1998, 1080), dcp::YUVToRGB::REC709, VideoRange::FULL, AV_PIX_FMT_YUV420P, VideoRange::FULL, Image::Alignment::PADDED, false
 		);
-	auto save = out->scale(dcp::Size(1998, 1080), dcp::YUVToRGB::REC709, AV_PIX_FMT_RGB24, false, false);
+	auto save = out->scale(dcp::Size(1998, 1080), dcp::YUVToRGB::REC709, AV_PIX_FMT_RGB24, Image::Alignment::COMPACT, false);
 	write_image(save, "build/test/crop_scale_window_test.png");
 	check_image("test/data/crop_scale_window_test.png", "build/test/crop_scale_window_test.png");
 }
@@ -287,22 +435,22 @@ BOOST_AUTO_TEST_CASE (crop_scale_window_test)
 /** Special cases of Image::crop_scale_window which triggered some valgrind warnings */
 BOOST_AUTO_TEST_CASE (crop_scale_window_test2)
 {
-	auto image = make_shared<Image>(AV_PIX_FMT_XYZ12LE, dcp::Size(2048, 858), true);
+	auto image = make_shared<Image>(AV_PIX_FMT_XYZ12LE, dcp::Size(2048, 858), Image::Alignment::PADDED);
 	image->crop_scale_window (
-		Crop(279, 0, 0, 0), dcp::Size(1069, 448), dcp::Size(1069, 578), dcp::YUVToRGB::REC709, VideoRange::FULL, AV_PIX_FMT_RGB24, VideoRange::FULL, false, false
+		Crop(279, 0, 0, 0), dcp::Size(1069, 448), dcp::Size(1069, 578), dcp::YUVToRGB::REC709, VideoRange::FULL, AV_PIX_FMT_RGB24, VideoRange::FULL, Image::Alignment::COMPACT, false
 		);
 	image->crop_scale_window (
-		Crop(2048, 0, 0, 0), dcp::Size(1069, 448), dcp::Size(1069, 578), dcp::YUVToRGB::REC709, VideoRange::FULL, AV_PIX_FMT_RGB24, VideoRange::FULL, false, false
+		Crop(2048, 0, 0, 0), dcp::Size(1069, 448), dcp::Size(1069, 578), dcp::YUVToRGB::REC709, VideoRange::FULL, AV_PIX_FMT_RGB24, VideoRange::FULL, Image::Alignment::COMPACT, false
 		);
 }
 
 
 BOOST_AUTO_TEST_CASE (crop_scale_window_test3)
 {
-	auto proxy = make_shared<FFmpegImageProxy>(TestPaths::private_data() / "player_seek_test_0.png", VideoRange::FULL);
-	auto xyz = proxy->image().image->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_RGB24, true, false);
+	auto proxy = make_shared<FFmpegImageProxy>(TestPaths::private_data() / "player_seek_test_0.png");
+	auto xyz = proxy->image(Image::Alignment::PADDED).image->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_RGB24, Image::Alignment::PADDED, false);
 	auto cropped = xyz->crop_scale_window(
-		Crop(512, 0, 0, 0), dcp::Size(1486, 1080), dcp::Size(1998, 1080), dcp::YUVToRGB::REC709, VideoRange::FULL, AV_PIX_FMT_RGB24, VideoRange::FULL, false, false
+		Crop(512, 0, 0, 0), dcp::Size(1486, 1080), dcp::Size(1998, 1080), dcp::YUVToRGB::REC709, VideoRange::FULL, AV_PIX_FMT_RGB24, VideoRange::FULL, Image::Alignment::COMPACT, false
 		);
 	write_image(cropped, "build/test/crop_scale_window_test3.png");
 	check_image("test/data/crop_scale_window_test3.png", "build/test/crop_scale_window_test3.png");
@@ -311,22 +459,22 @@ BOOST_AUTO_TEST_CASE (crop_scale_window_test3)
 
 BOOST_AUTO_TEST_CASE (crop_scale_window_test4)
 {
-	auto proxy = make_shared<FFmpegImageProxy>(TestPaths::private_data() / "player_seek_test_0.png", VideoRange::FULL);
-	auto xyz = proxy->image().image->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_RGB24, true, false);
+	auto proxy = make_shared<FFmpegImageProxy>(TestPaths::private_data() / "player_seek_test_0.png");
+	auto xyz = proxy->image(Image::Alignment::PADDED).image->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_RGB24, Image::Alignment::PADDED, false);
 	auto cropped = xyz->crop_scale_window(
-		Crop(512, 0, 0, 0), dcp::Size(1486, 1080), dcp::Size(1998, 1080), dcp::YUVToRGB::REC709, VideoRange::FULL, AV_PIX_FMT_XYZ12LE, VideoRange::FULL, false, false
+		Crop(512, 0, 0, 0), dcp::Size(1486, 1080), dcp::Size(1998, 1080), dcp::YUVToRGB::REC709, VideoRange::FULL, AV_PIX_FMT_XYZ12LE, VideoRange::FULL, Image::Alignment::COMPACT, false
 		);
 	write_image(cropped, "build/test/crop_scale_window_test4.png");
-	check_image("test/data/crop_scale_window_test4.png", "build/test/crop_scale_window_test4.png", 35000);
+	check_image("test/data/crop_scale_window_test4.png", "build/test/crop_scale_window_test4.png");
 }
 
 
 BOOST_AUTO_TEST_CASE (crop_scale_window_test5)
 {
-	auto proxy = make_shared<FFmpegImageProxy>(TestPaths::private_data() / "player_seek_test_0.png", VideoRange::FULL);
-	auto xyz = proxy->image().image->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_XYZ12LE, true, false);
+	auto proxy = make_shared<FFmpegImageProxy>(TestPaths::private_data() / "player_seek_test_0.png");
+	auto xyz = proxy->image(Image::Alignment::PADDED).image->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_XYZ12LE, Image::Alignment::PADDED, false);
 	auto cropped = xyz->crop_scale_window(
-		Crop(512, 0, 0, 0), dcp::Size(1486, 1080), dcp::Size(1998, 1080), dcp::YUVToRGB::REC709, VideoRange::FULL, AV_PIX_FMT_RGB24, VideoRange::FULL, false, false
+		Crop(512, 0, 0, 0), dcp::Size(1486, 1080), dcp::Size(1998, 1080), dcp::YUVToRGB::REC709, VideoRange::FULL, AV_PIX_FMT_RGB24, VideoRange::FULL, Image::Alignment::COMPACT, false
 		);
 	write_image(cropped, "build/test/crop_scale_window_test5.png");
 	check_image("test/data/crop_scale_window_test5.png", "build/test/crop_scale_window_test5.png");
@@ -335,13 +483,13 @@ BOOST_AUTO_TEST_CASE (crop_scale_window_test5)
 
 BOOST_AUTO_TEST_CASE (crop_scale_window_test6)
 {
-	auto proxy = make_shared<FFmpegImageProxy>(TestPaths::private_data() / "player_seek_test_0.png", VideoRange::FULL);
-	auto xyz = proxy->image().image->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_XYZ12LE, true, false);
+	auto proxy = make_shared<FFmpegImageProxy>(TestPaths::private_data() / "player_seek_test_0.png");
+	auto xyz = proxy->image(Image::Alignment::PADDED).image->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_XYZ12LE, Image::Alignment::PADDED, false);
 	auto cropped = xyz->crop_scale_window(
-		Crop(512, 0, 0, 0), dcp::Size(1486, 1080), dcp::Size(1998, 1080), dcp::YUVToRGB::REC709, VideoRange::FULL, AV_PIX_FMT_XYZ12LE, VideoRange::FULL, false, false
+		Crop(512, 0, 0, 0), dcp::Size(1486, 1080), dcp::Size(1998, 1080), dcp::YUVToRGB::REC709, VideoRange::FULL, AV_PIX_FMT_XYZ12LE, VideoRange::FULL, Image::Alignment::COMPACT, false
 		);
 	write_image(cropped, "build/test/crop_scale_window_test6.png");
-	check_image("test/data/crop_scale_window_test6.png", "build/test/crop_scale_window_test6.png", 35000);
+	check_image("test/data/crop_scale_window_test6.png", "build/test/crop_scale_window_test6.png");
 }
 
 
@@ -350,8 +498,8 @@ BOOST_AUTO_TEST_CASE (crop_scale_window_test7)
 {
 	using namespace boost::filesystem;
 	for (int left_crop = 0; left_crop < 8; ++left_crop) {
-		auto proxy = make_shared<FFmpegImageProxy>("test/data/rgb_grey_testcard.png", VideoRange::FULL);
-		auto yuv = proxy->image().image->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_YUV420P, true, false);
+		auto proxy = make_shared<FFmpegImageProxy>("test/data/rgb_grey_testcard.png");
+		auto yuv = proxy->image(Image::Alignment::PADDED).image->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_YUV420P, Image::Alignment::PADDED, false);
 		int rounded = left_crop - (left_crop % 2);
 		auto cropped = yuv->crop_scale_window(
 			Crop(left_crop, 0, 0, 0),
@@ -361,7 +509,7 @@ BOOST_AUTO_TEST_CASE (crop_scale_window_test7)
 			VideoRange::VIDEO,
 			AV_PIX_FMT_RGB24,
 			VideoRange::VIDEO,
-			true,
+			Image::Alignment::PADDED,
 			false
 			);
 		path file = String::compose("crop_scale_window_test7-%1.png", left_crop);
@@ -371,28 +519,58 @@ BOOST_AUTO_TEST_CASE (crop_scale_window_test7)
 }
 
 
+BOOST_AUTO_TEST_CASE (crop_scale_window_test8)
+{
+	using namespace boost::filesystem;
+
+	auto image = make_shared<Image>(AV_PIX_FMT_YUV420P, dcp::Size(800, 600), Image::Alignment::PADDED);
+	memset(image->data()[0], 41, image->stride()[0] * 600);
+	memset(image->data()[1], 240, image->stride()[1] * 300);
+	memset(image->data()[2], 41, image->stride()[2] * 300);
+	auto scaled = image->crop_scale_window(
+		Crop(), dcp::Size(1435, 1080), dcp::Size(1998, 1080), dcp::YUVToRGB::REC709, VideoRange::FULL, AV_PIX_FMT_YUV420P, VideoRange::FULL, Image::Alignment::PADDED, false
+		);
+	auto file = "crop_scale_window_test8.png";
+	write_image(scaled->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_RGB24, Image::Alignment::COMPACT, false), path("build") / "test" / file);
+	check_image(path("test") / "data" / file, path("build") / "test" / file, 10);
+}
+
+
 BOOST_AUTO_TEST_CASE (as_png_test)
 {
-	auto proxy = make_shared<FFmpegImageProxy>("test/data/3d_test/000001.png", VideoRange::FULL);
-	auto image_rgb = proxy->image().image;
-	auto image_bgr = image_rgb->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_BGRA, true, false);
-	image_rgb->as_png().write ("build/test/as_png_rgb.png");
-	image_bgr->as_png().write ("build/test/as_png_bgr.png");
+	auto proxy = make_shared<FFmpegImageProxy>("test/data/3d_test/000001.png");
+	auto image_rgb = proxy->image(Image::Alignment::PADDED).image;
+	auto image_bgr = image_rgb->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_BGRA, Image::Alignment::PADDED, false);
+	image_as_png(image_rgb).write ("build/test/as_png_rgb.png");
+	image_as_png(image_bgr).write ("build/test/as_png_bgr.png");
 
 	check_image ("test/data/3d_test/000001.png", "build/test/as_png_rgb.png");
 	check_image ("test/data/3d_test/000001.png", "build/test/as_png_bgr.png");
 }
 
 
+BOOST_AUTO_TEST_CASE (as_jpeg_test)
+{
+	auto proxy = make_shared<FFmpegImageProxy>("test/data/3d_test/000001.png");
+	auto image_rgb = proxy->image(Image::Alignment::PADDED).image;
+	auto image_bgr = image_rgb->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_BGRA, Image::Alignment::PADDED, false);
+	image_as_jpeg(image_rgb, 60).write("build/test/as_jpeg_rgb.jpeg");
+	image_as_jpeg(image_bgr, 60).write("build/test/as_jpeg_bgr.jpeg");
+
+	check_image ("test/data/as_jpeg_rgb.jpeg", "build/test/as_jpeg_rgb.jpeg");
+	check_image ("test/data/as_jpeg_bgr.jpeg", "build/test/as_jpeg_bgr.jpeg");
+}
+
+
 /* Very dumb test to fade black to make sure it stays black */
 static void
 fade_test_format_black (AVPixelFormat f, string name)
 {
-	Image yuv (f, dcp::Size(640, 480), true);
+	Image yuv (f, dcp::Size(640, 480), Image::Alignment::PADDED);
 	yuv.make_black ();
 	yuv.fade (0);
 	string const filename = "fade_test_black_" + name + ".png";
-	yuv.convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_RGBA, true, false)->as_png().write("build/test/" + filename);
+	image_as_png(yuv.convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_RGBA, Image::Alignment::PADDED, false)).write("build/test/" + filename);
 	check_image ("test/data/" + filename, "build/test/" + filename);
 }
 
@@ -401,11 +579,11 @@ fade_test_format_black (AVPixelFormat f, string name)
 static void
 fade_test_format_red (AVPixelFormat f, float amount, string name)
 {
-	auto proxy = make_shared<FFmpegImageProxy>("test/data/flat_red.png", VideoRange::FULL);
-	auto red = proxy->image().image->convert_pixel_format(dcp::YUVToRGB::REC709, f, true, false);
+	auto proxy = make_shared<FFmpegImageProxy>("test/data/flat_red.png");
+	auto red = proxy->image(Image::Alignment::PADDED).image->convert_pixel_format(dcp::YUVToRGB::REC709, f, Image::Alignment::PADDED, false);
 	red->fade (amount);
 	string const filename = "fade_test_red_" + name + ".png";
-	red->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_RGBA, true, false)->as_png().write("build/test/" + filename);
+	image_as_png(red->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_RGBA, Image::Alignment::PADDED, false)).write("build/test/" + filename);
 	check_image ("test/data/" + filename, "build/test/" + filename);
 }
 
@@ -482,9 +660,9 @@ BOOST_AUTO_TEST_CASE (make_black_test)
 
 	int N = 0;
 	for (auto i: pix_fmts) {
-		auto foo = make_shared<Image>(i, in_size, true);
+		auto foo = make_shared<Image>(i, in_size, Image::Alignment::PADDED);
 		foo->make_black ();
-		auto bar = foo->scale (out_size, dcp::YUVToRGB::REC601, AV_PIX_FMT_RGB24, true, false);
+		auto bar = foo->scale (out_size, dcp::YUVToRGB::REC601, AV_PIX_FMT_RGB24, Image::Alignment::PADDED, false);
 
 		uint8_t* p = bar->data()[0];
 		for (int y = 0; y < bar->size().height; ++y) {
@@ -505,8 +683,8 @@ BOOST_AUTO_TEST_CASE (make_black_test)
 
 BOOST_AUTO_TEST_CASE (make_part_black_test)
 {
-	auto proxy = make_shared<FFmpegImageProxy>("test/data/flat_red.png", VideoRange::FULL);
-	auto original = proxy->image().image;
+	auto proxy = make_shared<FFmpegImageProxy>("test/data/flat_red.png");
+	auto original = proxy->image(Image::Alignment::PADDED).image;
 
 	list<AVPixelFormat> pix_fmts = {
 		AV_PIX_FMT_RGB24,
@@ -514,7 +692,9 @@ BOOST_AUTO_TEST_CASE (make_part_black_test)
 		AV_PIX_FMT_RGBA,
 		AV_PIX_FMT_ABGR,
 		AV_PIX_FMT_BGRA,
+		AV_PIX_FMT_YUV420P,
 		AV_PIX_FMT_YUV422P10LE,
+		AV_PIX_FMT_YUV444P10LE
 	};
 
 	list<std::pair<int, int>> positions = {
@@ -525,9 +705,9 @@ BOOST_AUTO_TEST_CASE (make_part_black_test)
 	int N = 0;
 	for (auto i: pix_fmts) {
 		for (auto j: positions) {
-			auto foo = original->convert_pixel_format(dcp::YUVToRGB::REC601, i, true, false);
+			auto foo = original->convert_pixel_format(dcp::YUVToRGB::REC601, i, Image::Alignment::PADDED, false);
 			foo->make_part_black (j.first, j.second);
-			auto bar = foo->convert_pixel_format (dcp::YUVToRGB::REC601, AV_PIX_FMT_RGB24, true, false);
+			auto bar = foo->convert_pixel_format (dcp::YUVToRGB::REC601, AV_PIX_FMT_RGB24, Image::Alignment::PADDED, false);
 
 			auto p = bar->data()[0];
 			for (int y = 0; y < bar->size().height; ++y) {
@@ -568,10 +748,10 @@ BOOST_AUTO_TEST_CASE (make_part_black_test)
  */
 BOOST_AUTO_TEST_CASE (over_crop_test)
 {
-	auto image = make_shared<Image>(AV_PIX_FMT_RGB24, dcp::Size(128, 128), true);
+	auto image = make_shared<Image>(AV_PIX_FMT_RGB24, dcp::Size(128, 128), Image::Alignment::PADDED);
 	image->make_black ();
 	auto scaled = image->crop_scale_window (
-		Crop(0, 0, 128, 128), dcp::Size(1323, 565), dcp::Size(1349, 565), dcp::YUVToRGB::REC709, VideoRange::FULL, AV_PIX_FMT_RGB24, VideoRange::FULL, true, true
+		Crop(0, 0, 128, 128), dcp::Size(1323, 565), dcp::Size(1349, 565), dcp::YUVToRGB::REC709, VideoRange::FULL, AV_PIX_FMT_RGB24, VideoRange::FULL, Image::Alignment::PADDED, true
 		);
 	string const filename = "over_crop_test.png";
 	write_image (scaled, "build/test/" + filename);