X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fimage_test.cc;h=21363b5efd24b73885c32e23730bcf23074c7c0e;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=d3b0681718d43b2019008b898d2f16b04c7d6124;hpb=308488324dbc4d8b709d3fb1dc9fee0479346c21;p=dcpomatic.git diff --git a/test/image_test.cc b/test/image_test.cc index d3b068171..21363b5ef 100644 --- a/test/image_test.cc +++ b/test/image_test.cc @@ -26,9 +26,9 @@ #include #include #include "lib/image.h" -#include "lib/scaler.h" using std::string; +using std::list; using std::cout; using boost::shared_ptr; @@ -156,7 +156,7 @@ BOOST_AUTO_TEST_CASE (crop_image_test2) image = image->crop (crop, true); /* Convert it back to RGB to make comparison to black easier */ - image = image->scale (image->size(), Scaler::from_id ("bicubic"), PIX_FMT_RGB24, true); + image = image->scale (image->size(), dcp::YUV_TO_RGB_REC601, PIX_FMT_RGB24, true); /* Check that its still black after the crop */ uint8_t* p = image->data()[0]; @@ -171,53 +171,6 @@ BOOST_AUTO_TEST_CASE (crop_image_test2) } } -static -boost::shared_ptr -read_file (string file) -{ - Magick::Image magick_image (file.c_str ()); - dcp::Size size (magick_image.columns(), magick_image.rows()); - - boost::shared_ptr image (new Image (PIX_FMT_RGB24, size, true)); - - using namespace MagickCore; - - uint8_t* p = image->data()[0]; - for (int y = 0; y < size.height; ++y) { - uint8_t* q = p; - for (int x = 0; x < size.width; ++x) { - Magick::Color c = magick_image.pixelColor (x, y); - *q++ = c.redQuantum() * 255 / QuantumRange; - *q++ = c.greenQuantum() * 255 / QuantumRange; - *q++ = c.blueQuantum() * 255 / QuantumRange; - } - p += image->stride()[0]; - } - - return image; -} - -static -void -write_file (shared_ptr image, string file) -{ - using namespace MagickCore; - - Magick::Image magick_image (Magick::Geometry (image->size().width, image->size().height), Magick::Color (0, 0, 0)); - uint8_t*p = image->data()[0]; - for (int y = 0; y < image->size().height; ++y) { - uint8_t* q = p; - for (int x = 0; x < image->size().width; ++x) { - Magick::Color c (q[0] * QuantumRange / 256, q[1] * QuantumRange / 256, q[2] * QuantumRange / 256); - magick_image.pixelColor (x, y, c); - q += 3; - } - p += image->stride()[0]; - } - - magick_image.write (file.c_str ()); -} - static void crop_scale_window_single (AVPixelFormat in_format, dcp::Size in_size, Crop crop, dcp::Size inter_size, dcp::Size out_size) @@ -233,16 +186,16 @@ crop_scale_window_single (AVPixelFormat in_format, dcp::Size in_size, Crop crop, } } } - + /* Convert using separate methods */ boost::shared_ptr sep = test->crop (crop, true); - sep = sep->scale (inter_size, Scaler::from_id ("bicubic"), PIX_FMT_RGB24, true); + sep = sep->scale (inter_size, dcp::YUV_TO_RGB_REC601, PIX_FMT_RGB24, true); boost::shared_ptr sep_container (new Image (PIX_FMT_RGB24, out_size, true)); sep_container->make_black (); sep_container->copy (sep, Position ((out_size.width - inter_size.width) / 2, (out_size.height - inter_size.height) / 2)); /* Convert using the all-in-one method */ - shared_ptr all = test->crop_scale_window (crop, inter_size, out_size, Scaler::from_id ("bicubic"), PIX_FMT_RGB24, true); + shared_ptr all = test->crop_scale_window (crop, inter_size, out_size, dcp::YUV_TO_RGB_REC601, PIX_FMT_RGB24, true); /* Compare */ BOOST_CHECK_EQUAL (sep_container->size().width, all->size().width); @@ -277,3 +230,125 @@ BOOST_AUTO_TEST_CASE (crop_scale_window_test) crop_scale_window_single (AV_PIX_FMT_RGB24, dcp::Size (1000, 800), Crop (0, 0, 0, 0), dcp::Size (1920, 1080), dcp::Size (1998, 1080)); crop_scale_window_single (AV_PIX_FMT_RGB24, dcp::Size (1000, 800), Crop (55, 0, 1, 9), dcp::Size (1920, 1080), dcp::Size (1998, 1080)); } + +/** Test Image::alpha_blend */ +BOOST_AUTO_TEST_CASE (alpha_blend_test) +{ + int const stride = 48 * 4; + + shared_ptr A (new Image (AV_PIX_FMT_RGBA, dcp::Size (48, 48), false)); + A->make_black (); + uint8_t* a = A->data()[0]; + + for (int y = 0; y < 48; ++y) { + uint8_t* p = a + y * stride; + for (int x = 0; x < 16; ++x) { + p[x * 4] = 255; + p[(x + 16) * 4 + 1] = 255; + p[(x + 32) * 4 + 2] = 255; + } + } + + shared_ptr B (new Image (AV_PIX_FMT_RGBA, dcp::Size (48, 48), true)); + B->make_transparent (); + uint8_t* b = B->data()[0]; + + for (int y = 32; y < 48; ++y) { + uint8_t* p = b + y * stride; + for (int x = 0; x < 48; ++x) { + p[x * 4] = 255; + p[x * 4 + 1] = 255; + p[x * 4 + 2] = 255; + p[x * 4 + 3] = 255; + } + } + + A->alpha_blend (B, Position (0, 0)); + + for (int y = 0; y < 32; ++y) { + uint8_t* p = a + y * stride; + for (int x = 0; x < 16; ++x) { + BOOST_CHECK_EQUAL (p[x * 4], 255); + BOOST_CHECK_EQUAL (p[(x + 16) * 4 + 1], 255); + BOOST_CHECK_EQUAL (p[(x + 32) * 4 + 2], 255); + } + } + + for (int y = 32; y < 48; ++y) { + uint8_t* p = a + y * stride; + for (int x = 0; x < 48; ++x) { + BOOST_CHECK_EQUAL (p[x * 4], 255); + BOOST_CHECK_EQUAL (p[x * 4 + 1], 255); + BOOST_CHECK_EQUAL (p[x * 4 + 2], 255); + BOOST_CHECK_EQUAL (p[x * 4 + 3], 255); + } + } +} + +/** Test merge (list) with a single image */ +BOOST_AUTO_TEST_CASE (merge_test1) +{ + int const stride = 48 * 4; + + shared_ptr A (new Image (AV_PIX_FMT_RGBA, dcp::Size (48, 48), false)); + A->make_transparent (); + uint8_t* a = A->data()[0]; + + for (int y = 0; y < 48; ++y) { + uint8_t* p = a + y * stride; + for (int x = 0; x < 16; ++x) { + /* red */ + p[x * 4] = 255; + /* opaque */ + p[x * 4 + 3] = 255; + } + } + + list all; + all.push_back (PositionImage (A, Position (0, 0))); + PositionImage merged = merge (all); + + BOOST_CHECK (merged.position == Position (0, 0)); + BOOST_CHECK_EQUAL (memcmp (merged.image->data()[0], A->data()[0], stride * 48), 0); +} + +/** Test merge (list) with two images */ +BOOST_AUTO_TEST_CASE (merge_test2) +{ + shared_ptr A (new Image (AV_PIX_FMT_RGBA, dcp::Size (48, 1), false)); + A->make_transparent (); + uint8_t* a = A->data()[0]; + for (int x = 0; x < 16; ++x) { + /* red */ + a[x * 4] = 255; + /* opaque */ + a[x * 4 + 3] = 255; + } + + shared_ptr B (new Image (AV_PIX_FMT_RGBA, dcp::Size (48, 1), false)); + B->make_transparent (); + uint8_t* b = B->data()[0]; + for (int x = 0; x < 16; ++x) { + /* blue */ + b[(x + 32) * 4 + 2] = 255; + /* opaque */ + b[(x + 32) * 4 + 3] = 255; + } + + list all; + all.push_back (PositionImage (A, Position (0, 0))); + all.push_back (PositionImage (B, Position (0, 0))); + PositionImage merged = merge (all); + + BOOST_CHECK (merged.position == Position (0, 0)); + + uint8_t* m = merged.image->data()[0]; + + for (int x = 0; x < 16; ++x) { + BOOST_CHECK_EQUAL (m[x * 4], 255); + BOOST_CHECK_EQUAL (m[x * 4 + 3], 255); + BOOST_CHECK_EQUAL (m[(x + 16) * 4 + 3], 0); + BOOST_CHECK_EQUAL (m[(x + 32) * 4 + 2], 255); + BOOST_CHECK_EQUAL (m[(x + 32) * 4 + 3], 255); + } +}