projects / dcpomatic.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Remove swaroop variant.
[dcpomatic.git] / test / image_test.cc
diff --git a/test/image_test.cc b/test/image_test.cc
index e2b1d71c7d0899a8a7e60b4a242e0632f7706e62..bf7effe092dcbe7541a1f48173ce7bdb8840f5e5 100644 (file)
--- 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"
@@ -39,8 +40,8 @@ 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]);
@@ -261,7 +262,9 @@ BOOST_AUTO_TEST_CASE (crop_scale_window_test)
 {
        shared_ptr<FFmpegImageProxy> proxy(new FFmpegImageProxy("test/data/flat_red.png", VIDEO_RANGE_FULL));
        shared_ptr<Image> raw = proxy->image().image;
-       shared_ptr<Image> 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<Image> 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, VIDEO_RANGE_FULL, true, false
+               );
        shared_ptr<Image> 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");
        check_image("test/data/crop_scale_window_test.png", "build/test/crop_scale_window_test.png");
@@ -271,15 +274,21 @@ BOOST_AUTO_TEST_CASE (crop_scale_window_test)
 BOOST_AUTO_TEST_CASE (crop_scale_window_test2)
 {
        shared_ptr<Image> 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::YUV_TO_RGB_REC709, VIDEO_RANGE_FULL, AV_PIX_FMT_RGB24, VIDEO_RANGE_FULL, 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, VIDEO_RANGE_FULL, false, false
+               );
 }
 
 BOOST_AUTO_TEST_CASE (crop_scale_window_test3)
 {
        shared_ptr<FFmpegImageProxy> proxy(new FFmpegImageProxy("test/data/player_seek_test_0.png", VIDEO_RANGE_FULL));
        shared_ptr<Image> xyz = proxy->image().image->convert_pixel_format(dcp::YUV_TO_RGB_REC709, AV_PIX_FMT_RGB24, true, false);
-       shared_ptr<Image> 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);
+       shared_ptr<Image> 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, VIDEO_RANGE_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");
 }
@@ -288,7 +297,9 @@ BOOST_AUTO_TEST_CASE (crop_scale_window_test4)
 {
        shared_ptr<FFmpegImageProxy> proxy(new FFmpegImageProxy("test/data/player_seek_test_0.png", VIDEO_RANGE_FULL));
        shared_ptr<Image> xyz = proxy->image().image->convert_pixel_format(dcp::YUV_TO_RGB_REC709, AV_PIX_FMT_RGB24, true, false);
-       shared_ptr<Image> 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);
+       shared_ptr<Image> 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, VIDEO_RANGE_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);
 }
@@ -297,7 +308,9 @@ BOOST_AUTO_TEST_CASE (crop_scale_window_test5)
 {
        shared_ptr<FFmpegImageProxy> proxy(new FFmpegImageProxy("test/data/player_seek_test_0.png", VIDEO_RANGE_FULL));
        shared_ptr<Image> xyz = proxy->image().image->convert_pixel_format(dcp::YUV_TO_RGB_REC709, AV_PIX_FMT_XYZ12LE, true, false);
-       shared_ptr<Image> 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);
+       shared_ptr<Image> 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, VIDEO_RANGE_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");
 }
@@ -306,11 +319,40 @@ BOOST_AUTO_TEST_CASE (crop_scale_window_test6)
 {
        shared_ptr<FFmpegImageProxy> proxy(new FFmpegImageProxy("test/data/player_seek_test_0.png", VIDEO_RANGE_FULL));
        shared_ptr<Image> xyz = proxy->image().image->convert_pixel_format(dcp::YUV_TO_RGB_REC709, AV_PIX_FMT_XYZ12LE, true, false);
-       shared_ptr<Image> 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);
+       shared_ptr<Image> 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, VIDEO_RANGE_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<FFmpegImageProxy> proxy(new FFmpegImageProxy("test/data/rgb_grey_testcard.png", VIDEO_RANGE_FULL));
+               shared_ptr<Image> yuv = proxy->image().image->convert_pixel_format(dcp::YUV_TO_RGB_REC709, AV_PIX_FMT_YUV420P, true, false);
+               int rounded = left_crop - (left_crop % 2);
+               shared_ptr<Image> cropped = yuv->crop_scale_window(
+                       Crop(left_crop, 0, 0, 0),
+                       dcp::Size(1998 - rounded, 1080),
+                       dcp::Size(1998 - rounded, 1080),
+                       dcp::YUV_TO_RGB_REC709,
+                       VIDEO_RANGE_VIDEO,
+                       AV_PIX_FMT_RGB24,
+                       VIDEO_RANGE_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<FFmpegImageProxy> proxy(new FFmpegImageProxy("test/data/3d_test/000001.png", VIDEO_RANGE_FULL));
@@ -371,3 +413,69 @@ 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<AVPixelFormat> 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<AVPixelFormat>::const_iterator i = pix_fmts.begin(); i != pix_fmts.end(); ++i) {
+               boost::shared_ptr<Image> foo (new Image (*i, in_size, true));
+               foo->make_black ();
+               boost::shared_ptr<Image> bar = foo->scale (out_size, dcp::YUV_TO_RGB_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;
+       }
+}
Development branch of dcpomatic