X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=inline;f=test%2Fimage_test.cc;h=51ad49ebf63479694cd2c4099686a3e630babe7d;hb=259486c47986e8cfe2d81462cb1a60a8d096e1fc;hp=8dc2896023c6215914bbe70f17d2ceeb08fc7c29;hpb=ad6c0bbec4f354f29fb968099ff1a0ce2e57c43a;p=dcpomatic.git diff --git a/test/image_test.cc b/test/image_test.cc index 8dc289602..51ad49ebf 100644 --- a/test/image_test.cc +++ b/test/image_test.cc @@ -1,3 +1,30 @@ +/* + Copyright (C) 2012 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include +#include +#include "lib/image.h" +#include "lib/scaler.h" + +using std::string; +using std::cout; +using boost::shared_ptr; BOOST_AUTO_TEST_CASE (aligned_image_test) { @@ -123,7 +150,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_and_convert_to_rgb (image->size(), Scaler::from_id ("bicubic"), true); + image = image->scale (image->size(), Scaler::from_id ("bicubic"), PIX_FMT_RGB24, true); /* Check that its still black after the crop */ uint8_t* p = image->data()[0]; @@ -137,3 +164,110 @@ BOOST_AUTO_TEST_CASE (crop_image_test2) p += image->stride()[0]; } } + +static +boost::shared_ptr +read_file (string file) +{ + Magick::Image magick_image (file.c_str ()); + libdcp::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, libdcp::Size in_size, Crop crop, libdcp::Size inter_size, libdcp::Size out_size) +{ + /* Set up our test image */ + shared_ptr test (new Image (in_format, in_size, true)); + uint8_t n = 0; + for (int c = 0; c < test->components(); ++c) { + uint8_t* p = test->data()[c]; + for (int y = 0; y < test->lines(c); ++y) { + for (int x = 0; x < test->stride()[c]; ++x) { + *p++ = n++; + } + } + } + + /* 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); + 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); + + /* Compare */ + BOOST_CHECK_EQUAL (sep_container->size().width, all->size().width); + BOOST_CHECK_EQUAL (sep_container->size().height, all->size().height); + + /* Assuming RGB on these */ + BOOST_CHECK_EQUAL (sep_container->components(), 1); + BOOST_CHECK_EQUAL (all->components(), 1); + + uint8_t* p = sep_container->data()[0]; + uint8_t* q = all->data()[0]; + for (int y = 0; y < all->size().height; ++y) { + uint8_t* pp = p; + uint8_t* qq = q; + for (int x = 0; x < all->size().width * 3; ++x) { + BOOST_CHECK_EQUAL (*pp++, *qq++); + } + p += sep_container->stride()[0]; + q += all->stride()[0]; + } +} + +/** Test Image::crop_scale_window against separate calls to crop/scale/copy */ +BOOST_AUTO_TEST_CASE (crop_scale_window_test) +{ + crop_scale_window_single (AV_PIX_FMT_YUV422P, libdcp::Size (640, 480), Crop (), libdcp::Size (640, 480), libdcp::Size (640, 480)); + crop_scale_window_single (AV_PIX_FMT_YUV422P, libdcp::Size (640, 480), Crop (2, 4, 6, 8), libdcp::Size (640, 480), libdcp::Size (640, 480)); + crop_scale_window_single (AV_PIX_FMT_YUV422P, libdcp::Size (640, 480), Crop (2, 4, 6, 8), libdcp::Size (1920, 1080), libdcp::Size (1998, 1080)); + crop_scale_window_single (AV_PIX_FMT_YUV422P, libdcp::Size (640, 480), Crop (1, 4, 6, 8), libdcp::Size (1920, 1080), libdcp::Size (1998, 1080)); + crop_scale_window_single (AV_PIX_FMT_YUV420P, libdcp::Size (640, 480), Crop (16, 16, 0, 0), libdcp::Size (1920, 1080), libdcp::Size (1998, 1080)); + crop_scale_window_single (AV_PIX_FMT_YUV420P, libdcp::Size (640, 480), Crop (16, 3, 3, 0), libdcp::Size (1920, 1080), libdcp::Size (1998, 1080)); + crop_scale_window_single (AV_PIX_FMT_RGB24, libdcp::Size (1000, 800), Crop (0, 0, 0, 0), libdcp::Size (1920, 1080), libdcp::Size (1998, 1080)); + crop_scale_window_single (AV_PIX_FMT_RGB24, libdcp::Size (1000, 800), Crop (55, 0, 1, 9), libdcp::Size (1920, 1080), libdcp::Size (1998, 1080)); +}