Fix yet more pixel order confusions.

[dcpomatic.git] / test / image_test.cc

diff --git a/test/image_test.cc b/test/image_test.cc
index 59000918a0155722a3842324ec9ae72b52b2bcd6..b0bbe2594664739c3d10aae5d4083554618a37c0 100644 (file)
--- a/test/image_test.cc
+++ b/test/image_test.cc
@@ -140,15 +140,15 @@ 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<Image> background = raw->scale (raw->size(), dcp::YUV_TO_RGB_REC709, format, true, false);
+       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, raw->size(), 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,14 +164,14 @@ 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));
 
-       shared_ptr<Image> save = background->scale (background->size(), dcp::YUV_TO_RGB_REC709, AV_PIX_FMT_RGB24, false, false);
+       shared_ptr<Image> save = background->convert_pixel_format (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"));
@@ -255,3 +255,14 @@ BOOST_AUTO_TEST_CASE (merge_test2)
                BOOST_CHECK_EQUAL (m[(x + 32) * 4 + 3], 255);
        }
 }
+
+/** 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<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");
+       check_image("test/data/crop_scale_window_test.png", "build/test/crop_scale_window_test.png");
+}