Fix subtitle_file() to find both Interop and SMPTE subtitles.

[dcpomatic.git] / test / image_test.cc

diff --git a/test/image_test.cc b/test/image_test.cc
index 94b7ba017d07696bd47ab770db0787f8d46a673d..56e6819436886b187f39861f2207ea198994bda0 100644 (file)
--- a/test/image_test.cc
+++ b/test/image_test.cc
@@ -355,7 +355,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 +379,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");
 }
 
 
@@ -409,6 +409,23 @@ BOOST_AUTO_TEST_CASE (crop_scale_window_test7)
 }
 
 
+BOOST_AUTO_TEST_CASE (crop_scale_window_test8)
+{
+       using namespace boost::filesystem;
+
+       auto image = make_shared<Image>(AV_PIX_FMT_YUV420P, dcp::Size(800, 600), Image::Alignment::PADDED);
+       memset(image->data()[0], 41, image->stride()[0] * 600);
+       memset(image->data()[1], 240, image->stride()[1] * 300);
+       memset(image->data()[2], 41, image->stride()[2] * 300);
+       auto scaled = image->crop_scale_window(
+               Crop(), dcp::Size(1435, 1080), dcp::Size(1998, 1080), dcp::YUVToRGB::REC709, VideoRange::FULL, AV_PIX_FMT_YUV420P, VideoRange::FULL, Image::Alignment::PADDED, false
+               );
+       auto file = "crop_scale_window_test8.png";
+       write_image(scaled->convert_pixel_format(dcp::YUVToRGB::REC709, AV_PIX_FMT_RGB24, Image::Alignment::COMPACT, false), path("build") / "test" / file);
+       check_image(path("test") / "data" / file, path("build") / "test" / file, 10);
+}
+
+
 BOOST_AUTO_TEST_CASE (as_png_test)
 {
        auto proxy = make_shared<FFmpegImageProxy>("test/data/3d_test/000001.png");
@@ -567,6 +584,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<std::pair<int, int>> positions = {