X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimage_test.cc;h=88a56a7ee72c99e66a82ceabba2fcacd2e8a0010;hb=39fb8198febde1937019db1c300ec363aab5aa56;hp=e021322e095d9f81d407c020aa40e429f7d014a8;hpb=5ff6b15ef3c58a046fb9eec0273c5e7322988a14;p=dcpomatic.git diff --git a/test/image_test.cc b/test/image_test.cc index e021322e0..88a56a7ee 100644 --- a/test/image_test.cc +++ b/test/image_test.cc @@ -24,6 +24,7 @@ * @see test/make_black_test.cc, test/pixel_formats_test.cc */ +#include "lib/compose.hpp" #include "lib/image.h" #include "lib/ffmpeg_image_proxy.h" #include "test.h" @@ -33,14 +34,14 @@ using std::string; using std::list; using std::cout; -using boost::shared_ptr; +using std::shared_ptr; BOOST_AUTO_TEST_CASE (aligned_image_test) { Image* s = new Image (AV_PIX_FMT_RGB24, dcp::Size (50, 50), true); BOOST_CHECK_EQUAL (s->planes(), 1); - /* 160 is 150 aligned to the nearest 32 bytes */ - BOOST_CHECK_EQUAL (s->stride()[0], 160); + /* 192 is 150 aligned to the nearest 64 bytes */ + BOOST_CHECK_EQUAL (s->stride()[0], 192); BOOST_CHECK_EQUAL (s->line_size()[0], 150); BOOST_CHECK (s->data()[0]); BOOST_CHECK (!s->data()[1]); @@ -50,7 +51,7 @@ BOOST_AUTO_TEST_CASE (aligned_image_test) /* copy constructor */ Image* t = new Image (*s); BOOST_CHECK_EQUAL (t->planes(), 1); - BOOST_CHECK_EQUAL (t->stride()[0], 160); + BOOST_CHECK_EQUAL (t->stride()[0], 192); BOOST_CHECK_EQUAL (t->line_size()[0], 150); BOOST_CHECK (t->data()[0]); BOOST_CHECK (!t->data()[1]); @@ -67,7 +68,7 @@ BOOST_AUTO_TEST_CASE (aligned_image_test) Image* u = new Image (AV_PIX_FMT_YUV422P, dcp::Size (150, 150), false); *u = *s; BOOST_CHECK_EQUAL (u->planes(), 1); - BOOST_CHECK_EQUAL (u->stride()[0], 160); + BOOST_CHECK_EQUAL (u->stride()[0], 192); BOOST_CHECK_EQUAL (u->line_size()[0], 150); BOOST_CHECK (u->data()[0]); BOOST_CHECK (!u->data()[1]); @@ -137,9 +138,9 @@ BOOST_AUTO_TEST_CASE (compact_image_test) void alpha_blend_test_one (AVPixelFormat format, string suffix) { - shared_ptr proxy (new FFmpegImageProxy (TestPaths::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 proxy (new FFmpegImageProxy (TestPaths::private_data() / "prophet_frame.tiff", VideoRange::FULL)); + shared_ptr raw = proxy->image().image; + shared_ptr background = raw->convert_pixel_format (dcp::YUVToRGB::REC709, format, true, false); shared_ptr overlay (new Image (AV_PIX_FMT_BGRA, dcp::Size(431, 891), true)); overlay->make_transparent (); @@ -170,10 +171,10 @@ alpha_blend_test_one (AVPixelFormat format, string suffix) 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); + shared_ptr save = background->convert_pixel_format (dcp::YUVToRGB::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", TestPaths::private_data / ("image_test_" + suffix + ".png")); + write_image (save, "build/test/image_test_" + suffix + ".png"); + check_image ("build/test/image_test_" + suffix + ".png", TestPaths::private_data() / ("image_test_" + suffix + ".png")); } /** Test Image::alpha_blend */ @@ -259,11 +260,13 @@ BOOST_AUTO_TEST_CASE (merge_test2) /** 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, VIDEO_RANGE_FULL, 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"); + shared_ptr proxy(new FFmpegImageProxy("test/data/flat_red.png", VideoRange::FULL)); + shared_ptr raw = proxy->image().image; + shared_ptr 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 + ); + shared_ptr save = out->scale(dcp::Size(1998, 1080), dcp::YUVToRGB::REC709, AV_PIX_FMT_RGB24, false, 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"); } @@ -271,51 +274,90 @@ BOOST_AUTO_TEST_CASE (crop_scale_window_test) BOOST_AUTO_TEST_CASE (crop_scale_window_test2) { shared_ptr image (new Image(AV_PIX_FMT_XYZ12LE, dcp::Size(2048, 858), true)); - image->crop_scale_window (Crop(279, 0, 0, 0), dcp::Size(1069, 448), dcp::Size(1069, 578), dcp::YUV_TO_RGB_REC709, VIDEO_RANGE_FULL, AV_PIX_FMT_RGB24, false, false); - image->crop_scale_window (Crop(2048, 0, 0, 0), dcp::Size(1069, 448), dcp::Size(1069, 578), dcp::YUV_TO_RGB_REC709, VIDEO_RANGE_FULL, AV_PIX_FMT_RGB24, false, false); + 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 + ); + 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 + ); } BOOST_AUTO_TEST_CASE (crop_scale_window_test3) { - shared_ptr proxy(new FFmpegImageProxy("test/data/player_seek_test_0.png")); - shared_ptr xyz = proxy->image().first->convert_pixel_format(dcp::YUV_TO_RGB_REC709, AV_PIX_FMT_RGB24, true, false); - shared_ptr cropped = xyz->crop_scale_window(Crop(512, 0, 0, 0), dcp::Size(1486, 1080), dcp::Size(1998, 1080), dcp::YUV_TO_RGB_REC709, VIDEO_RANGE_FULL, AV_PIX_FMT_RGB24, false, false); - write_image(cropped, "build/test/crop_scale_window_test3.png", "RGB", MagickCore::CharPixel); + shared_ptr proxy(new FFmpegImageProxy(TestPaths::private_data() / "player_seek_test_0.png", VideoRange::FULL)); + shared_ptr xyz = proxy->image().image->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_RGB24, true, false); + shared_ptr 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 + ); + 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"); } BOOST_AUTO_TEST_CASE (crop_scale_window_test4) { - shared_ptr proxy(new FFmpegImageProxy("test/data/player_seek_test_0.png")); - shared_ptr xyz = proxy->image().first->convert_pixel_format(dcp::YUV_TO_RGB_REC709, AV_PIX_FMT_RGB24, true, false); - shared_ptr cropped = xyz->crop_scale_window(Crop(512, 0, 0, 0), dcp::Size(1486, 1080), dcp::Size(1998, 1080), dcp::YUV_TO_RGB_REC709, VIDEO_RANGE_FULL, AV_PIX_FMT_XYZ12LE, false, false); - write_image(cropped, "build/test/crop_scale_window_test4.png", "RGB", MagickCore::ShortPixel); - check_image("test/data/crop_scale_window_test4.png", "build/test/crop_scale_window_test4.png"); + shared_ptr proxy(new FFmpegImageProxy(TestPaths::private_data() / "player_seek_test_0.png", VideoRange::FULL)); + shared_ptr xyz = proxy->image().image->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_RGB24, true, false); + shared_ptr 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 + ); + 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); } BOOST_AUTO_TEST_CASE (crop_scale_window_test5) { - shared_ptr proxy(new FFmpegImageProxy("test/data/player_seek_test_0.png")); - shared_ptr xyz = proxy->image().first->convert_pixel_format(dcp::YUV_TO_RGB_REC709, AV_PIX_FMT_XYZ12LE, true, false); - shared_ptr cropped = xyz->crop_scale_window(Crop(512, 0, 0, 0), dcp::Size(1486, 1080), dcp::Size(1998, 1080), dcp::YUV_TO_RGB_REC709, VIDEO_RANGE_FULL, AV_PIX_FMT_RGB24, false, false); - write_image(cropped, "build/test/crop_scale_window_test5.png", "RGB", MagickCore::CharPixel); + shared_ptr proxy(new FFmpegImageProxy(TestPaths::private_data() / "player_seek_test_0.png", VideoRange::FULL)); + shared_ptr xyz = proxy->image().image->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_XYZ12LE, true, false); + shared_ptr 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 + ); + 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"); } BOOST_AUTO_TEST_CASE (crop_scale_window_test6) { - shared_ptr proxy(new FFmpegImageProxy("test/data/player_seek_test_0.png")); - shared_ptr xyz = proxy->image().first->convert_pixel_format(dcp::YUV_TO_RGB_REC709, AV_PIX_FMT_XYZ12LE, true, false); - shared_ptr cropped = xyz->crop_scale_window(Crop(512, 0, 0, 0), dcp::Size(1486, 1080), dcp::Size(1998, 1080), dcp::YUV_TO_RGB_REC709, VIDEO_RANGE_FULL, AV_PIX_FMT_XYZ12LE, false, false); - write_image(cropped, "build/test/crop_scale_window_test6.png", "RGB", MagickCore::ShortPixel); - check_image("test/data/crop_scale_window_test6.png", "build/test/crop_scale_window_test6.png"); + shared_ptr proxy(new FFmpegImageProxy(TestPaths::private_data() / "player_seek_test_0.png", VideoRange::FULL)); + shared_ptr xyz = proxy->image().image->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_XYZ12LE, true, false); + shared_ptr 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 + ); + 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); } + +/** Test some small crops with an image that shows up errors in registration of the YUV planes (#1872) */ +BOOST_AUTO_TEST_CASE (crop_scale_window_test7) +{ + using namespace boost::filesystem; + for (int left_crop = 0; left_crop < 8; ++left_crop) { + shared_ptr proxy(new FFmpegImageProxy("test/data/rgb_grey_testcard.png", VideoRange::FULL)); + shared_ptr yuv = proxy->image().image->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_YUV420P, true, false); + int rounded = left_crop - (left_crop % 2); + shared_ptr cropped = yuv->crop_scale_window( + Crop(left_crop, 0, 0, 0), + dcp::Size(1998 - rounded, 1080), + dcp::Size(1998 - rounded, 1080), + dcp::YUVToRGB::REC709, + VideoRange::VIDEO, + AV_PIX_FMT_RGB24, + VideoRange::VIDEO, + true, + false + ); + path file = String::compose("crop_scale_window_test7-%1.png", left_crop); + write_image(cropped, path("build") / "test" / file); + check_image(path("test") / "data" / file, path("build") / "test" / file, 10); + } +} + + BOOST_AUTO_TEST_CASE (as_png_test) { - shared_ptr proxy(new FFmpegImageProxy("test/data/3d_test/000001.png")); - shared_ptr image_rgb = proxy->image().first; - shared_ptr image_bgr = image_rgb->convert_pixel_format(dcp::YUV_TO_RGB_REC709, AV_PIX_FMT_BGRA, true, false); + shared_ptr proxy(new FFmpegImageProxy("test/data/3d_test/000001.png", VideoRange::FULL)); + shared_ptr image_rgb = proxy->image().image; + shared_ptr 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"); @@ -331,7 +373,7 @@ fade_test_format_black (AVPixelFormat f, string name) yuv.make_black (); yuv.fade (0); string const filename = "fade_test_black_" + name + ".png"; - yuv.convert_pixel_format(dcp::YUV_TO_RGB_REC709, AV_PIX_FMT_RGBA, true, false)->as_png().write("build/test/" + filename); + yuv.convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_RGBA, true, false)->as_png().write("build/test/" + filename); check_image ("test/data/" + filename, "build/test/" + filename); } @@ -339,11 +381,11 @@ fade_test_format_black (AVPixelFormat f, string name) static void fade_test_format_red (AVPixelFormat f, float amount, string name) { - shared_ptr proxy(new FFmpegImageProxy("test/data/flat_red.png")); - shared_ptr red = proxy->image().first->convert_pixel_format(dcp::YUV_TO_RGB_REC709, f, true, false); + shared_ptr proxy(new FFmpegImageProxy("test/data/flat_red.png", VideoRange::FULL)); + shared_ptr red = proxy->image().image->convert_pixel_format(dcp::YUVToRGB::REC709, f, true, false); red->fade (amount); string const filename = "fade_test_red_" + name + ".png"; - red->convert_pixel_format(dcp::YUV_TO_RGB_REC709, AV_PIX_FMT_RGBA, true, false)->as_png().write("build/test/" + filename); + red->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_RGBA, true, false)->as_png().write("build/test/" + filename); check_image ("test/data/" + filename, "build/test/" + filename); } @@ -371,3 +413,86 @@ BOOST_AUTO_TEST_CASE (fade_test) fade_test_format_red (AV_PIX_FMT_RGB48LE, 0.5, "rgb48le_50"); fade_test_format_red (AV_PIX_FMT_RGB48LE, 1, "rgb48le_100"); } + + +BOOST_AUTO_TEST_CASE (make_black_test) +{ + dcp::Size in_size (512, 512); + dcp::Size out_size (1024, 1024); + + list pix_fmts; + pix_fmts.push_back (AV_PIX_FMT_RGB24); // 2 + pix_fmts.push_back (AV_PIX_FMT_ARGB); + pix_fmts.push_back (AV_PIX_FMT_RGBA); + pix_fmts.push_back (AV_PIX_FMT_ABGR); + pix_fmts.push_back (AV_PIX_FMT_BGRA); + pix_fmts.push_back (AV_PIX_FMT_YUV420P); // 0 + pix_fmts.push_back (AV_PIX_FMT_YUV411P); + pix_fmts.push_back (AV_PIX_FMT_YUV422P10LE); + pix_fmts.push_back (AV_PIX_FMT_YUV422P16LE); + pix_fmts.push_back (AV_PIX_FMT_YUV444P9LE); + pix_fmts.push_back (AV_PIX_FMT_YUV444P9BE); + pix_fmts.push_back (AV_PIX_FMT_YUV444P10LE); + pix_fmts.push_back (AV_PIX_FMT_YUV444P10BE); + pix_fmts.push_back (AV_PIX_FMT_UYVY422); + pix_fmts.push_back (AV_PIX_FMT_YUVJ420P); + pix_fmts.push_back (AV_PIX_FMT_YUVJ422P); + pix_fmts.push_back (AV_PIX_FMT_YUVJ444P); + pix_fmts.push_back (AV_PIX_FMT_YUVA420P9BE); + pix_fmts.push_back (AV_PIX_FMT_YUVA422P9BE); + pix_fmts.push_back (AV_PIX_FMT_YUVA444P9BE); + pix_fmts.push_back (AV_PIX_FMT_YUVA420P9LE); + pix_fmts.push_back (AV_PIX_FMT_YUVA422P9LE); + pix_fmts.push_back (AV_PIX_FMT_YUVA444P9LE); + pix_fmts.push_back (AV_PIX_FMT_YUVA420P10BE); + pix_fmts.push_back (AV_PIX_FMT_YUVA422P10BE); + pix_fmts.push_back (AV_PIX_FMT_YUVA444P10BE); + pix_fmts.push_back (AV_PIX_FMT_YUVA420P10LE); + pix_fmts.push_back (AV_PIX_FMT_YUVA422P10LE); + pix_fmts.push_back (AV_PIX_FMT_YUVA444P10LE); + pix_fmts.push_back (AV_PIX_FMT_YUVA420P16BE); + pix_fmts.push_back (AV_PIX_FMT_YUVA422P16BE); + pix_fmts.push_back (AV_PIX_FMT_YUVA444P16BE); + pix_fmts.push_back (AV_PIX_FMT_YUVA420P16LE); + pix_fmts.push_back (AV_PIX_FMT_YUVA422P16LE); + pix_fmts.push_back (AV_PIX_FMT_YUVA444P16LE); + pix_fmts.push_back (AV_PIX_FMT_RGB555LE); // 46 + + int N = 0; + for (list::const_iterator i = pix_fmts.begin(); i != pix_fmts.end(); ++i) { + std::shared_ptr foo (new Image (*i, in_size, true)); + foo->make_black (); + std::shared_ptr bar = foo->scale (out_size, dcp::YUVToRGB::REC601, AV_PIX_FMT_RGB24, true, false); + + uint8_t* p = bar->data()[0]; + for (int y = 0; y < bar->size().height; ++y) { + uint8_t* q = p; + for (int x = 0; x < bar->line_size()[0]; ++x) { + if (*q != 0) { + std::cerr << "x=" << x << ", (x%3)=" << (x%3) << "\n"; + } + BOOST_CHECK_EQUAL (*q++, 0); + } + p += bar->stride()[0]; + } + + ++N; + } +} + + +/** Make sure the image isn't corrupted if it is cropped too much. This can happen when a + * filler 128x128 black frame is emitted from the FFmpegDecoder and the overall crop in either direction + * is greater than 128 pixels. + */ +BOOST_AUTO_TEST_CASE (over_crop_test) +{ + shared_ptr image (new Image (AV_PIX_FMT_RGB24, dcp::Size(128, 128), true)); + image->make_black (); + shared_ptr 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 + ); + string const filename = "over_crop_test.png"; + write_image (scaled, "build/test/" + filename); + check_image ("test/data/" + filename, "build/test/" + filename); +}