X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimage_test.cc;h=5fccf6b9ba7acdf158febe3decdb8a61b609a3f6;hb=3b31d2d8a129ae6d8d267427bd6b5bc444b40b2a;hp=e5c95ea2de75ce9f0e90273536bd19c87582948d;hpb=7b0372776ac4da6a8e4ff29f41a4f08b9b4de506;p=dcpomatic.git diff --git a/test/image_test.cc b/test/image_test.cc index e5c95ea2d..5fccf6b9b 100644 --- a/test/image_test.cc +++ b/test/image_test.cc @@ -137,8 +137,8 @@ BOOST_AUTO_TEST_CASE (compact_image_test) void alpha_blend_test_one (AVPixelFormat format, string suffix) { - shared_ptr proxy (new FFmpegImageProxy (private_data / "prophet_frame.tiff")); - shared_ptr raw = proxy->image().first; + shared_ptr proxy (new FFmpegImageProxy (TestPaths::private_data / "prophet_frame.tiff")); + shared_ptr raw = proxy->image().image; shared_ptr background = raw->convert_pixel_format (dcp::YUV_TO_RGB_REC709, format, true, false); shared_ptr overlay (new Image (AV_PIX_FMT_BGRA, dcp::Size(431, 891), true)); @@ -173,7 +173,7 @@ alpha_blend_test_one (AVPixelFormat format, string suffix) 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")); + check_image ("build/test/image_test_" + suffix + ".png", TestPaths::private_data / ("image_test_" + suffix + ".png")); } /** Test Image::alpha_blend */ @@ -260,7 +260,7 @@ BOOST_AUTO_TEST_CASE (merge_test2) 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 raw = proxy->image().image; 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"); @@ -278,39 +278,43 @@ BOOST_AUTO_TEST_CASE (crop_scale_window_test2) 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 xyz = proxy->image().image->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); + 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 xyz = proxy->image().image->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"); } 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 xyz = proxy->image().image->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); + 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 xyz = proxy->image().image->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"); } 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_rgb = proxy->image().image; shared_ptr image_bgr = image_rgb->convert_pixel_format(dcp::YUV_TO_RGB_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"); @@ -336,7 +340,7 @@ 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 red = proxy->image().image->convert_pixel_format(dcp::YUV_TO_RGB_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);