X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage.cc;h=c3b1ca77afded0cc70270fb097d40a6b989a2bfa;hb=2e504b33eb9f38cac629ad31b7c107fb0cf5efda;hp=5f7d3f034199f020e6afe714da340663927b862d;hpb=4699463e19b2a153d64aeb0e00c62be1157bfc1b;p=dcpomatic.git diff --git a/src/lib/image.cc b/src/lib/image.cc index 5f7d3f034..c3b1ca77a 100644 --- a/src/lib/image.cc +++ b/src/lib/image.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 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 @@ -18,40 +18,29 @@ */ /** @file src/image.cc - * @brief A set of classes to describe video images. + * @brief A class to describe a video image. */ -#include -#include #include -#include -#include -#include -#include extern "C" { -#include -#include #include -#include -#include #include #include +#include } #include "image.h" #include "exceptions.h" #include "scaler.h" +#include "timer.h" #include "i18n.h" -using namespace std; -using namespace boost; -using libdcp::Size; - -void -Image::swap (Image& other) -{ - std::swap (_pixel_format, other._pixel_format); -} +using std::string; +using std::min; +using std::cout; +using std::cerr; +using boost::shared_ptr; +using dcp::Size; int Image::line_factor (int n) const @@ -62,7 +51,7 @@ Image::line_factor (int n) const AVPixFmtDescriptor const * d = av_pix_fmt_desc_get(_pixel_format); if (!d) { - throw PixelFormatError (N_("lines()"), _pixel_format); + throw PixelFormatError ("lines()", _pixel_format); } return pow (2.0f, d->log2_chroma_h); @@ -74,7 +63,7 @@ Image::line_factor (int n) const int Image::lines (int n) const { - return size().height / line_factor (n); + return rint (ceil (static_cast(size().height) / line_factor (n))); } /** @return Number of components */ @@ -83,7 +72,7 @@ Image::components () const { AVPixFmtDescriptor const * d = av_pix_fmt_desc_get(_pixel_format); if (!d) { - throw PixelFormatError (N_("components()"), _pixel_format); + throw PixelFormatError ("components()", _pixel_format); } if ((d->flags & PIX_FMT_PLANAR) == 0) { @@ -93,8 +82,9 @@ Image::components () const return d->nb_components; } +/** Crop this image, scale it to `inter_size' and then place it in a black frame of `out_size' */ shared_ptr -Image::scale (libdcp::Size out_size, Scaler const * scaler, bool result_aligned) const +Image::crop_scale_window (Crop crop, dcp::Size inter_size, dcp::Size out_size, Scaler const * scaler, AVPixelFormat out_format, bool out_aligned) const { assert (scaler); /* Empirical testing suggests that sws_scale() will crash if @@ -102,32 +92,55 @@ Image::scale (libdcp::Size out_size, Scaler const * scaler, bool result_aligned) */ assert (aligned ()); - shared_ptr scaled (new SimpleImage (pixel_format(), out_size, result_aligned)); + assert (out_size.width >= inter_size.width); + assert (out_size.height >= inter_size.height); + + /* Here's an image of out_size */ + shared_ptr out (new Image (out_format, out_size, out_aligned)); + out->make_black (); + /* Size of the image after any crop */ + dcp::Size const cropped_size = crop.apply (size ()); + + /* Scale context for a scale from cropped_size to inter_size */ struct SwsContext* scale_context = sws_getContext ( - size().width, size().height, pixel_format(), - out_size.width, out_size.height, pixel_format(), - scaler->ffmpeg_id (), 0, 0, 0 + cropped_size.width, cropped_size.height, pixel_format(), + inter_size.width, inter_size.height, out_format, + scaler->ffmpeg_id (), 0, 0, 0 ); + if (!scale_context) { + throw StringError (N_("Could not allocate SwsContext")); + } + + /* Prepare input data pointers with crop */ + uint8_t* scale_in_data[components()]; + for (int c = 0; c < components(); ++c) { + scale_in_data[c] = data()[c] + int (rint (bytes_per_pixel(c) * crop.left)) + stride()[c] * (crop.top / line_factor(c)); + } + + /* Corner of the image within out_size */ + Position const corner ((out_size.width - inter_size.width) / 2, (out_size.height - inter_size.height) / 2); + + uint8_t* scale_out_data[out->components()]; + for (int c = 0; c < out->components(); ++c) { + scale_out_data[c] = out->data()[c] + int (rint (out->bytes_per_pixel(c) * corner.x)) + out->stride()[c] * corner.y; + } + sws_scale ( scale_context, - data(), stride(), - 0, size().height, - scaled->data(), scaled->stride() + scale_in_data, stride(), + 0, cropped_size.height, + scale_out_data, out->stride() ); sws_freeContext (scale_context); - return scaled; + return out; } -/** Scale this image to a given size and convert it to RGB. - * @param out_size Output image size in pixels. - * @param scaler Scaler to use. - */ shared_ptr -Image::scale_and_convert_to_rgb (libdcp::Size out_size, Scaler const * scaler, bool result_aligned) const +Image::scale (dcp::Size out_size, Scaler const * scaler, AVPixelFormat out_format, bool out_aligned) const { assert (scaler); /* Empirical testing suggests that sws_scale() will crash if @@ -135,84 +148,39 @@ Image::scale_and_convert_to_rgb (libdcp::Size out_size, Scaler const * scaler, b */ assert (aligned ()); - shared_ptr rgb (new SimpleImage (PIX_FMT_RGB24, out_size, result_aligned)); + shared_ptr scaled (new Image (out_format, out_size, out_aligned)); struct SwsContext* scale_context = sws_getContext ( size().width, size().height, pixel_format(), - out_size.width, out_size.height, PIX_FMT_RGB24, + out_size.width, out_size.height, out_format, scaler->ffmpeg_id (), 0, 0, 0 ); - /* Scale and convert to RGB from whatever its currently in (which may be RGB) */ sws_scale ( scale_context, data(), stride(), 0, size().height, - rgb->data(), rgb->stride() + scaled->data(), scaled->stride() ); sws_freeContext (scale_context); - return rgb; -} - -/** Run a FFmpeg post-process on this image and return the processed version. - * @param pp Flags for the required set of post processes. - * @return Post-processed image. - */ -shared_ptr -Image::post_process (string pp, bool aligned) const -{ - shared_ptr out (new SimpleImage (pixel_format(), size (), aligned)); - - int pp_format = 0; - switch (pixel_format()) { - case PIX_FMT_YUV420P: - pp_format = PP_FORMAT_420; - break; - case PIX_FMT_YUV422P10LE: - case PIX_FMT_YUV422P: - case PIX_FMT_UYVY422: - pp_format = PP_FORMAT_422; - break; - case PIX_FMT_YUV444P: - case PIX_FMT_YUV444P9BE: - case PIX_FMT_YUV444P9LE: - case PIX_FMT_YUV444P10BE: - case PIX_FMT_YUV444P10LE: - pp_format = PP_FORMAT_444; - default: - throw PixelFormatError (N_("post_process"), pixel_format()); - } - - pp_mode* mode = pp_get_mode_by_name_and_quality (pp.c_str (), PP_QUALITY_MAX); - pp_context* context = pp_get_context (size().width, size().height, pp_format | PP_CPU_CAPS_MMX2); - - pp_postprocess ( - (const uint8_t **) data(), stride(), - out->data(), out->stride(), - size().width, size().height, - 0, 0, mode, context, 0 - ); - - pp_free_mode (mode); - pp_free_context (context); - - return out; + return scaled; } shared_ptr Image::crop (Crop crop, bool aligned) const { - libdcp::Size cropped_size = size (); - cropped_size.width -= crop.left + crop.right; - cropped_size.height -= crop.top + crop.bottom; - - shared_ptr out (new SimpleImage (pixel_format(), cropped_size, aligned)); + dcp::Size cropped_size = crop.apply (size ()); + shared_ptr out (new Image (pixel_format(), cropped_size, aligned)); for (int c = 0; c < components(); ++c) { int const crop_left_in_bytes = bytes_per_pixel(c) * crop.left; - int const cropped_width_in_bytes = bytes_per_pixel(c) * cropped_size.width; + /* bytes_per_pixel() could be a fraction; in this case the stride will be rounded + up, and we need to make sure that we copy over the width (up to the stride) + rather than short of the width; hence the ceil() here. + */ + int const cropped_width_in_bytes = ceil (bytes_per_pixel(c) * cropped_size.width); /* Start of the source line, cropped from the top but not the left */ uint8_t* in_p = data()[c] + (crop.top / out->line_factor(c)) * stride()[c]; @@ -230,18 +198,23 @@ Image::crop (Crop crop, bool aligned) const /** Blacken a YUV image whose bits per pixel is rounded up to 16 */ void -Image::yuv_16_black (uint16_t v) +Image::yuv_16_black (uint16_t v, bool alpha) { memset (data()[0], 0, lines(0) * stride()[0]); for (int i = 1; i < 3; ++i) { int16_t* p = reinterpret_cast (data()[i]); - for (int y = 0; y < size().height; ++y) { + for (int y = 0; y < lines(i); ++y) { + /* We divide by 2 here because we are writing 2 bytes at a time */ for (int x = 0; x < line_size()[i] / 2; ++x) { p[x] = v; } p += stride()[i] / 2; } } + + if (alpha) { + memset (data()[3], 0, lines(3) * stride()[3]); + } } uint16_t @@ -254,18 +227,19 @@ void Image::make_black () { /* U/V black value for 8-bit colour */ - static uint8_t const eight_bit_uv = (1 << 7) - 1; + static uint8_t const eight_bit_uv = (1 << 7) - 1; /* U/V black value for 9-bit colour */ - static uint16_t const nine_bit_uv = (1 << 8) - 1; + static uint16_t const nine_bit_uv = (1 << 8) - 1; /* U/V black value for 10-bit colour */ - static uint16_t const ten_bit_uv = (1 << 9) - 1; + static uint16_t const ten_bit_uv = (1 << 9) - 1; /* U/V black value for 16-bit colour */ - static uint16_t const sixteen_bit_uv = (1 << 15) - 1; + static uint16_t const sixteen_bit_uv = (1 << 15) - 1; switch (_pixel_format) { case PIX_FMT_YUV420P: case PIX_FMT_YUV422P: case PIX_FMT_YUV444P: + case PIX_FMT_YUV411P: memset (data()[0], 0, lines(0) * stride()[0]); memset (data()[1], eight_bit_uv, lines(1) * stride()[1]); memset (data()[2], eight_bit_uv, lines(2) * stride()[2]); @@ -281,30 +255,70 @@ Image::make_black () case PIX_FMT_YUV422P9LE: case PIX_FMT_YUV444P9LE: - yuv_16_black (nine_bit_uv); + yuv_16_black (nine_bit_uv, false); break; case PIX_FMT_YUV422P9BE: case PIX_FMT_YUV444P9BE: - yuv_16_black (swap_16 (nine_bit_uv)); + yuv_16_black (swap_16 (nine_bit_uv), false); break; case PIX_FMT_YUV422P10LE: case PIX_FMT_YUV444P10LE: - yuv_16_black (ten_bit_uv); + yuv_16_black (ten_bit_uv, false); break; case PIX_FMT_YUV422P16LE: case PIX_FMT_YUV444P16LE: - yuv_16_black (sixteen_bit_uv); + yuv_16_black (sixteen_bit_uv, false); break; case PIX_FMT_YUV444P10BE: case PIX_FMT_YUV422P10BE: - yuv_16_black (swap_16 (ten_bit_uv)); + yuv_16_black (swap_16 (ten_bit_uv), false); break; - case PIX_FMT_RGB24: + case AV_PIX_FMT_YUVA420P9BE: + case AV_PIX_FMT_YUVA422P9BE: + case AV_PIX_FMT_YUVA444P9BE: + yuv_16_black (swap_16 (nine_bit_uv), true); + break; + + case AV_PIX_FMT_YUVA420P9LE: + case AV_PIX_FMT_YUVA422P9LE: + case AV_PIX_FMT_YUVA444P9LE: + yuv_16_black (nine_bit_uv, true); + break; + + case AV_PIX_FMT_YUVA420P10BE: + case AV_PIX_FMT_YUVA422P10BE: + case AV_PIX_FMT_YUVA444P10BE: + yuv_16_black (swap_16 (ten_bit_uv), true); + break; + + case AV_PIX_FMT_YUVA420P10LE: + case AV_PIX_FMT_YUVA422P10LE: + case AV_PIX_FMT_YUVA444P10LE: + yuv_16_black (ten_bit_uv, true); + break; + + case AV_PIX_FMT_YUVA420P16BE: + case AV_PIX_FMT_YUVA422P16BE: + case AV_PIX_FMT_YUVA444P16BE: + yuv_16_black (swap_16 (sixteen_bit_uv), true); + break; + + case AV_PIX_FMT_YUVA420P16LE: + case AV_PIX_FMT_YUVA422P16LE: + case AV_PIX_FMT_YUVA444P16LE: + yuv_16_black (sixteen_bit_uv, true); + break; + + case PIX_FMT_RGB24: + case PIX_FMT_ARGB: + case PIX_FMT_RGBA: + case PIX_FMT_ABGR: + case PIX_FMT_BGRA: memset (data()[0], 0, lines(0) * stride()[0]); break; @@ -316,24 +330,34 @@ Image::make_black () for (int y = 0; y < Y; ++y) { for (int x = 0; x < X / 4; ++x) { *p++ = eight_bit_uv; // Cb - *p++ = 0; // Y0 + *p++ = 0; // Y0 *p++ = eight_bit_uv; // Cr - *p++ = 0; // Y1 + *p++ = 0; // Y1 } } break; } default: - throw PixelFormatError (N_("make_black()"), _pixel_format); + throw PixelFormatError ("make_black()", _pixel_format); } } void -Image::alpha_blend (shared_ptr other, Position position) +Image::alpha_blend (shared_ptr other, Position position) { - /* Only implemented for RGBA onto RGB24 so far */ - assert (_pixel_format == PIX_FMT_RGB24 && other->pixel_format() == PIX_FMT_RGBA); + int this_bpp = 0; + int other_bpp = 0; + + if (_pixel_format == PIX_FMT_BGRA && other->pixel_format() == PIX_FMT_RGBA) { + this_bpp = 4; + other_bpp = 4; + } else if (_pixel_format == PIX_FMT_RGB24 && other->pixel_format() == PIX_FMT_RGBA) { + this_bpp = 3; + other_bpp = 4; + } else { + assert (false); + } int start_tx = position.x; int start_ox = 0; @@ -352,21 +376,21 @@ Image::alpha_blend (shared_ptr other, Position position) } for (int ty = start_ty, oy = start_oy; ty < size().height && oy < other->size().height; ++ty, ++oy) { - uint8_t* tp = data()[0] + ty * stride()[0] + position.x * 3; + uint8_t* tp = data()[0] + ty * stride()[0] + position.x * this_bpp; uint8_t* op = other->data()[0] + oy * other->stride()[0]; for (int tx = start_tx, ox = start_ox; tx < size().width && ox < other->size().width; ++tx, ++ox) { float const alpha = float (op[3]) / 255; tp[0] = (tp[0] * (1 - alpha)) + op[0] * alpha; tp[1] = (tp[1] * (1 - alpha)) + op[1] * alpha; tp[2] = (tp[2] * (1 - alpha)) + op[2] * alpha; - tp += 3; - op += 4; + tp += this_bpp; + op += other_bpp; } } } void -Image::copy (shared_ptr other, Position position) +Image::copy (shared_ptr other, Position position) { /* Only implemented for RGB24 onto RGB24 so far */ assert (_pixel_format == PIX_FMT_RGB24 && other->pixel_format() == PIX_FMT_RGB24); @@ -410,7 +434,7 @@ Image::bytes_per_pixel (int c) const { AVPixFmtDescriptor const * d = av_pix_fmt_desc_get(_pixel_format); if (!d) { - throw PixelFormatError (N_("lines()"), _pixel_format); + throw PixelFormatError ("lines()", _pixel_format); } if (c >= components()) { @@ -438,42 +462,52 @@ Image::bytes_per_pixel (int c) const return bpp[c]; } -/** Construct a SimpleImage of a given size and format, allocating memory +/** Construct a Image of a given size and format, allocating memory * as required. * * @param p Pixel format. * @param s Size in pixels. */ -SimpleImage::SimpleImage (AVPixelFormat p, libdcp::Size s, bool aligned) - : Image (p) - , _size (s) +Image::Image (AVPixelFormat p, dcp::Size s, bool aligned) + : dcp::Image (s) + , _pixel_format (p) , _aligned (aligned) { allocate (); } void -SimpleImage::allocate () +Image::allocate () { - _data = (uint8_t **) av_malloc (4 * sizeof (uint8_t *)); + _data = (uint8_t **) wrapped_av_malloc (4 * sizeof (uint8_t *)); _data[0] = _data[1] = _data[2] = _data[3] = 0; - _line_size = (int *) av_malloc (4 * sizeof (int)); + _line_size = (int *) wrapped_av_malloc (4 * sizeof (int)); _line_size[0] = _line_size[1] = _line_size[2] = _line_size[3] = 0; - _stride = (int *) av_malloc (4 * sizeof (int)); + _stride = (int *) wrapped_av_malloc (4 * sizeof (int)); _stride[0] = _stride[1] = _stride[2] = _stride[3] = 0; for (int i = 0; i < components(); ++i) { - _line_size[i] = _size.width * bytes_per_pixel(i); + _line_size[i] = ceil (_size.width * bytes_per_pixel(i)); _stride[i] = stride_round_up (i, _line_size, _aligned ? 32 : 1); - _data[i] = (uint8_t *) av_malloc (_stride[i] * lines (i)); + + /* The assembler function ff_rgb24ToY_avx (in libswscale/x86/input.asm) + uses a 16-byte fetch to read three bytes (R/G/B) of image data. + Hence on the last pixel of the last line it reads over the end of + the actual data by 1 byte. If the width of an image is a multiple + of the stride alignment there will be no padding at the end of image lines. + OS X crashes on this illegal read, though other operating systems don't + seem to mind. The nasty + 1 in this malloc makes sure there is always a byte + for that instruction to read safely. + */ + _data[i] = (uint8_t *) wrapped_av_malloc (_stride[i] * lines (i) + 1); } } -SimpleImage::SimpleImage (SimpleImage const & other) - : Image (other) - , _size (other._size) +Image::Image (Image const & other) + : dcp::Image (other) + , _pixel_format (other._pixel_format) , _aligned (other._aligned) { allocate (); @@ -489,9 +523,9 @@ SimpleImage::SimpleImage (SimpleImage const & other) } } -SimpleImage::SimpleImage (AVFrame* frame) - : Image (static_cast (frame->format)) - , _size (frame->width, frame->height) +Image::Image (AVFrame* frame) + : dcp::Image (dcp::Size (frame->width, frame->height)) + , _pixel_format (static_cast (frame->format)) , _aligned (true) { allocate (); @@ -508,9 +542,9 @@ SimpleImage::SimpleImage (AVFrame* frame) } } -SimpleImage::SimpleImage (shared_ptr other, bool aligned) - : Image (*other.get()) - , _size (other->size()) +Image::Image (shared_ptr other, bool aligned) + : dcp::Image (other) + , _pixel_format (other->_pixel_format) , _aligned (aligned) { allocate (); @@ -527,24 +561,24 @@ SimpleImage::SimpleImage (shared_ptr other, bool aligned) } } -SimpleImage& -SimpleImage::operator= (SimpleImage const & other) +Image& +Image::operator= (Image const & other) { if (this == &other) { return *this; } - SimpleImage tmp (other); + Image tmp (other); swap (tmp); return *this; } void -SimpleImage::swap (SimpleImage & other) +Image::swap (Image & other) { - Image::swap (other); + dcp::Image::swap (other); - std::swap (_size, other._size); + std::swap (_pixel_format, other._pixel_format); for (int i = 0; i < 4; ++i) { std::swap (_data[i], other._data[i]); @@ -555,8 +589,8 @@ SimpleImage::swap (SimpleImage & other) std::swap (_aligned, other._aligned); } -/** Destroy a SimpleImage */ -SimpleImage::~SimpleImage () +/** Destroy a Image */ +Image::~Image () { for (int i = 0; i < components(); ++i) { av_free (_data[i]); @@ -568,60 +602,32 @@ SimpleImage::~SimpleImage () } uint8_t ** -SimpleImage::data () const +Image::data () const { return _data; } int * -SimpleImage::line_size () const +Image::line_size () const { return _line_size; } int * -SimpleImage::stride () const +Image::stride () const { return _stride; } -libdcp::Size -SimpleImage::size () const +dcp::Size +Image::size () const { return _size; } bool -SimpleImage::aligned () const +Image::aligned () const { return _aligned; } -RGBPlusAlphaImage::RGBPlusAlphaImage (shared_ptr im) - : SimpleImage (im->pixel_format(), im->size(), false) -{ - assert (im->pixel_format() == PIX_FMT_RGBA); - - _alpha = (uint8_t *) av_malloc (im->size().width * im->size().height); - - uint8_t* in = im->data()[0]; - uint8_t* out = data()[0]; - uint8_t* out_alpha = _alpha; - for (int y = 0; y < im->size().height; ++y) { - uint8_t* in_r = in; - for (int x = 0; x < im->size().width; ++x) { - *out++ = *in_r++; - *out++ = *in_r++; - *out++ = *in_r++; - *out_alpha++ = *in_r++; - } - - in += im->stride()[0]; - } -} - -RGBPlusAlphaImage::~RGBPlusAlphaImage () -{ - av_free (_alpha); -} -