X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimage_test.cc;h=9d0d4366416f9efc7e890272d06f4b1d7840e3b8;hb=9bfa07293928c371d59db2091ba2b7e715ce5994;hp=4cc80b7e05052ba2766ed35106e104ae5db677f2;hpb=2aa6fd88e6d334c040d421938e425bd2f89983a7;p=dcpomatic.git diff --git a/test/image_test.cc b/test/image_test.cc index 4cc80b7e0..9d0d43664 100644 --- a/test/image_test.cc +++ b/test/image_test.cc @@ -147,8 +147,8 @@ 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 raw = proxy->image().image; + auto proxy = make_shared(TestPaths::private_data() / "prophet_frame.tiff"); + auto raw = proxy->image(false).image; auto background = raw->convert_pixel_format (dcp::YUVToRGB::REC709, format, true, false); auto overlay = make_shared(AV_PIX_FMT_BGRA, dcp::Size(431, 891), true); @@ -221,7 +221,7 @@ BOOST_AUTO_TEST_CASE (merge_test1) list all; all.push_back (PositionImage (A, Position(0, 0))); - auto merged = merge (all); + auto merged = merge (all, false); BOOST_CHECK (merged.position == Position(0, 0)); BOOST_CHECK_EQUAL (memcmp (merged.image->data()[0], A->data()[0], stride * 48), 0); @@ -254,7 +254,7 @@ BOOST_AUTO_TEST_CASE (merge_test2) list all; all.push_back (PositionImage(A, Position(0, 0))); all.push_back (PositionImage(B, Position(0, 0))); - auto merged = merge (all); + auto merged = merge (all, false); BOOST_CHECK (merged.position == Position(0, 0)); @@ -273,8 +273,8 @@ 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 raw = proxy->image().image; + auto proxy = make_shared("test/data/flat_red.png"); + auto raw = proxy->image(false).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,8 +299,8 @@ 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 xyz = proxy->image().image->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_RGB24, true, false); + auto proxy = make_shared(TestPaths::private_data() / "player_seek_test_0.png"); + auto xyz = proxy->image(false).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,8 +311,8 @@ 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 xyz = proxy->image().image->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_RGB24, true, false); + auto proxy = make_shared(TestPaths::private_data() / "player_seek_test_0.png"); + auto xyz = proxy->image(false).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,8 +323,8 @@ 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 xyz = proxy->image().image->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_XYZ12LE, true, false); + auto proxy = make_shared(TestPaths::private_data() / "player_seek_test_0.png"); + auto xyz = proxy->image(false).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,8 +335,8 @@ 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 xyz = proxy->image().image->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_XYZ12LE, true, false); + auto proxy = make_shared(TestPaths::private_data() / "player_seek_test_0.png"); + auto xyz = proxy->image(false).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,8 +350,8 @@ 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 yuv = proxy->image().image->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_YUV420P, true, false); + auto proxy = make_shared("test/data/rgb_grey_testcard.png"); + auto yuv = proxy->image(false).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( Crop(left_crop, 0, 0, 0), @@ -373,8 +373,8 @@ 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 image_rgb = proxy->image().image; + auto proxy = make_shared("test/data/3d_test/000001.png"); + auto image_rgb = proxy->image(false).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"); image_bgr->as_png().write ("build/test/as_png_bgr.png"); @@ -401,8 +401,8 @@ 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 red = proxy->image().image->convert_pixel_format(dcp::YUVToRGB::REC709, f, true, false); + auto proxy = make_shared("test/data/flat_red.png"); + auto red = proxy->image(false).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::YUVToRGB::REC709, AV_PIX_FMT_RGBA, true, false)->as_png().write("build/test/" + filename); @@ -505,8 +505,8 @@ 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 original = proxy->image().image; + auto proxy = make_shared("test/data/flat_red.png"); + auto original = proxy->image(false).image; list pix_fmts = { AV_PIX_FMT_RGB24, @@ -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];