X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimage_test.cc;h=9d07f8a0a75d969eda6fe3bdc721b28288614df3;hb=5043961f2c1606fc13e1ecadfb42f5c0f1b05866;hp=5a39bb066ebf382acaa284823263445804e69a13;hpb=6996f3e291aec986adb1589808a54d09b8647520;p=dcpomatic.git diff --git a/test/image_test.cc b/test/image_test.cc index 5a39bb066..9d07f8a0a 100644 --- a/test/image_test.cc +++ b/test/image_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2018 Carl Hetherington This file is part of DCP-o-matic. @@ -24,9 +24,10 @@ * @see test/make_black_test.cc, test/pixel_formats_test.cc */ -#include -#include #include "lib/image.h" +#include "lib/ffmpeg_image_proxy.h" +#include "test.h" +#include #include using std::string; @@ -133,58 +134,58 @@ 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 proxy (new FFmpegImageProxy (private_data / "prophet_frame.tiff")); + shared_ptr raw = proxy->image().first; + shared_ptr background = raw->convert_pixel_format (dcp::YUV_TO_RGB_REC709, format, true, false); - shared_ptr A (new Image (AV_PIX_FMT_RGBA, dcp::Size (48, 48), false)); - A->make_black (); - uint8_t* a = A->data()[0]; + shared_ptr overlay (new Image (AV_PIX_FMT_BGRA, dcp::Size(431, 891), true)); + overlay->make_transparent (); - for (int y = 0; y < 48; ++y) { - uint8_t* p = a + y * stride; - for (int x = 0; x < 16; ++x) { - p[x * 4] = 255; - p[(x + 16) * 4 + 1] = 255; - p[(x + 32) * 4 + 2] = 255; + 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 + 2] = 255; + p[x * 4 + 3] = 255; } } - shared_ptr B (new 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 (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] = 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 (13, 17)); + + shared_ptr 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")); +} + +/** 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"); } /** Test merge (list) with a single image */ @@ -192,14 +193,14 @@ BOOST_AUTO_TEST_CASE (merge_test1) { int const stride = 48 * 4; - shared_ptr A (new Image (AV_PIX_FMT_RGBA, dcp::Size (48, 48), false)); + shared_ptr 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; @@ -217,21 +218,21 @@ BOOST_AUTO_TEST_CASE (merge_test1) /** Test merge (list) with two images */ BOOST_AUTO_TEST_CASE (merge_test2) { - shared_ptr A (new Image (AV_PIX_FMT_RGBA, dcp::Size (48, 1), false)); + shared_ptr 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 B (new Image (AV_PIX_FMT_RGBA, dcp::Size (48, 1), false)); + shared_ptr 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; @@ -254,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 proxy(new FFmpegImageProxy("test/data/flat_red.png")); + shared_ptr raw = proxy->image().first; + shared_ptr 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 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"); +}