X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimage_test.cc;h=3993b3efbdeaf7f99e4cff9f4b1f04caf4d7c4dd;hb=bb89ec4a3d7a912f1f79e8b13ec9f1be5481ca96;hp=4cc80b7e05052ba2766ed35106e104ae5db677f2;hpb=2aa6fd88e6d334c040d421938e425bd2f89983a7;p=dcpomatic.git diff --git a/test/image_test.cc b/test/image_test.cc index 4cc80b7e0..3993b3efb 100644 --- a/test/image_test.cc +++ b/test/image_test.cc @@ -147,7 +147,7 @@ BOOST_AUTO_TEST_CASE (compact_image_test) void alpha_blend_test_one (AVPixelFormat format, string suffix) { - auto proxy = make_shared(TestPaths::private_data() / "prophet_frame.tiff", VideoRange::FULL); + auto proxy = make_shared(TestPaths::private_data() / "prophet_frame.tiff"); auto raw = proxy->image().image; auto background = raw->convert_pixel_format (dcp::YUVToRGB::REC709, format, true, false); @@ -273,7 +273,7 @@ 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("test/data/flat_red.png", VideoRange::FULL); + auto proxy = make_shared("test/data/flat_red.png"); auto raw = proxy->image().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 @@ -299,7 +299,7 @@ BOOST_AUTO_TEST_CASE (crop_scale_window_test2) BOOST_AUTO_TEST_CASE (crop_scale_window_test3) { - auto proxy = make_shared(TestPaths::private_data() / "player_seek_test_0.png", VideoRange::FULL); + auto proxy = make_shared(TestPaths::private_data() / "player_seek_test_0.png"); auto xyz = proxy->image().image->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_RGB24, true, 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 @@ -311,7 +311,7 @@ BOOST_AUTO_TEST_CASE (crop_scale_window_test3) BOOST_AUTO_TEST_CASE (crop_scale_window_test4) { - auto proxy = make_shared(TestPaths::private_data() / "player_seek_test_0.png", VideoRange::FULL); + auto proxy = make_shared(TestPaths::private_data() / "player_seek_test_0.png"); auto xyz = proxy->image().image->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_RGB24, true, 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 @@ -323,7 +323,7 @@ BOOST_AUTO_TEST_CASE (crop_scale_window_test4) BOOST_AUTO_TEST_CASE (crop_scale_window_test5) { - auto proxy = make_shared(TestPaths::private_data() / "player_seek_test_0.png", VideoRange::FULL); + auto proxy = make_shared(TestPaths::private_data() / "player_seek_test_0.png"); auto xyz = proxy->image().image->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_XYZ12LE, true, 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 @@ -335,7 +335,7 @@ BOOST_AUTO_TEST_CASE (crop_scale_window_test5) BOOST_AUTO_TEST_CASE (crop_scale_window_test6) { - auto proxy = make_shared(TestPaths::private_data() / "player_seek_test_0.png", VideoRange::FULL); + auto proxy = make_shared(TestPaths::private_data() / "player_seek_test_0.png"); auto xyz = proxy->image().image->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_XYZ12LE, true, 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 @@ -350,7 +350,7 @@ 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("test/data/rgb_grey_testcard.png", VideoRange::FULL); + auto proxy = make_shared("test/data/rgb_grey_testcard.png"); auto yuv = proxy->image().image->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_YUV420P, true, false); int rounded = left_crop - (left_crop % 2); auto cropped = yuv->crop_scale_window( @@ -373,7 +373,7 @@ BOOST_AUTO_TEST_CASE (crop_scale_window_test7) BOOST_AUTO_TEST_CASE (as_png_test) { - auto proxy = make_shared("test/data/3d_test/000001.png", VideoRange::FULL); + auto proxy = make_shared("test/data/3d_test/000001.png"); 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"); @@ -401,7 +401,7 @@ fade_test_format_black (AVPixelFormat f, string name) static void fade_test_format_red (AVPixelFormat f, float amount, string name) { - auto proxy = make_shared("test/data/flat_red.png", VideoRange::FULL); + auto proxy = make_shared("test/data/flat_red.png"); auto red = proxy->image().image->convert_pixel_format(dcp::YUVToRGB::REC709, f, true, false); red->fade (amount); string const filename = "fade_test_red_" + name + ".png"; @@ -505,7 +505,7 @@ BOOST_AUTO_TEST_CASE (make_black_test) BOOST_AUTO_TEST_CASE (make_part_black_test) { - auto proxy = make_shared("test/data/flat_red.png", VideoRange::FULL); + auto proxy = make_shared("test/data/flat_red.png"); auto original = proxy->image().image; list pix_fmts = { @@ -514,6 +514,7 @@ 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, }; @@ -538,19 +539,19 @@ BOOST_AUTO_TEST_CASE (make_part_black_test) int b = *q++; if (x >= j.first && x < (j.first + j.second)) { BOOST_CHECK_MESSAGE ( - r < 3, "red=" << static_cast(r) << " at x=" << x << " format " << i << " from " << j.first << " width " << j.second + r < 3, "red=" << static_cast(r) << " at (" << x << "," << y << ") format " << i << " from " << j.first << " width " << j.second ); } else { BOOST_CHECK_MESSAGE ( - r > 252, "red=" << static_cast(r) << " at x=" << x << " format " << i << " from " << j.first << " width " << j.second + r >= 252, "red=" << static_cast(r) << " at (" << x << "," << y << ") format " << i << " from " << j.first << " width " << j.second ); } BOOST_CHECK_MESSAGE ( - g == 0, "green=" << static_cast(g) << " at x=" << x << " format " << i << " from " << j.first << " width " << j.second + g == 0, "green=" << static_cast(g) << " at (" << x << "," << y << ") format " << i << " from " << j.first << " width " << j.second ); BOOST_CHECK_MESSAGE ( - b == 0, "blue=" << static_cast(b) << " at x=" << x << " format " << i << " from " << j.first << " width " << j.second + b == 0, "blue=" << static_cast(b) << " at (" << x << "," << y << ") format " << i << " from " << j.first << " width " << j.second ); } p += bar->stride()[0];