X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimage_test.cc;h=4df4f9125a6889a1cfce4931f9af34fb6b023288;hb=HEAD;hp=c638523a881c76038442dc03144ef927c2d6a559;hpb=d881836379172f4072ed81ea074f46b3a363a681;p=dcpomatic.git diff --git a/test/image_test.cc b/test/image_test.cc index c638523a8..4df4f9125 100644 --- a/test/image_test.cc +++ b/test/image_test.cc @@ -145,8 +145,9 @@ 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(TestPaths::private_data() / "prophet_frame.tiff"); auto raw = proxy->image(Image::Alignment::PADDED).image; @@ -183,26 +184,84 @@ alpha_blend_test_one (AVPixelFormat format, string suffix) 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(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(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(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(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(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(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 the "base" image is XYZ12LE */ -BOOST_AUTO_TEST_CASE (alpha_blend_test_onto_xyz) +/** 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(); @@ -238,6 +297,57 @@ BOOST_AUTO_TEST_CASE (alpha_blend_test_onto_xyz) } +/** 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(AV_PIX_FMT_RGBA64BE, dcp::Size(8, 8), Image::Alignment::PADDED); + for (int y = 0; y < 8; ++y) { + auto p = reinterpret_cast(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(4, 4)); + + for (int y = 0; y < 50; ++y) { + auto p = reinterpret_cast(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(0, 0)); + write_image(make_shared(target), "build/test/alpha_blend_text.png"); + check_image("build/test/alpha_blend_text.png", TestPaths::private_data() / "16-bit-sub-blended.png"); +} + + /** Test merge (list) with a single image */ BOOST_AUTO_TEST_CASE (merge_test1) { @@ -355,7 +465,7 @@ BOOST_AUTO_TEST_CASE (crop_scale_window_test4) 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"); } @@ -379,7 +489,7 @@ BOOST_AUTO_TEST_CASE (crop_scale_window_test6) 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"); } @@ -548,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(i, in_size, Image::Alignment::PADDED); foo->make_black (); @@ -565,8 +674,6 @@ BOOST_AUTO_TEST_CASE (make_black_test) } p += bar->stride()[0]; } - - ++N; } } @@ -584,6 +691,7 @@ BOOST_AUTO_TEST_CASE (make_part_black_test) AV_PIX_FMT_BGRA, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P10LE, + AV_PIX_FMT_YUV444P10LE }; list> positions = { @@ -591,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); @@ -624,8 +731,6 @@ BOOST_AUTO_TEST_CASE (make_part_black_test) } p += bar->stride()[0]; } - - ++N; } } }