#include "image.h"
#include "exceptions.h"
#include "scaler.h"
+#include "timer.h"
using std::string;
using std::min;
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>
-Image::scale (libdcp::Size out_size, Scaler const * scaler, bool result_aligned) const
+Image::crop_scale_window (Crop crop, libdcp::Size inter_size, libdcp::Size out_size, Scaler const * scaler, AVPixelFormat out_format, bool out_aligned) const
{
assert (scaler);
/* Empirical testing suggests that sws_scale() will crash if
*/
assert (aligned ());
- shared_ptr<Image> scaled (new Image (pixel_format(), out_size, result_aligned));
+ shared_ptr<Image> out (new Image (out_format, out_size, out_aligned));
+ out->make_black ();
+
+ libdcp::Size cropped_size = crop.apply (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
);
+ 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));
+ }
+
+ Position<int> const corner ((out_size.width - inter_size.width) / 2, (out_size.height - inter_size.height) / 2);
+
+ uint8_t* scale_out_data[components()];
+ for (int c = 0; c < 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>
-Image::scale_and_convert_to_rgb (libdcp::Size out_size, Scaler const * scaler, bool result_aligned) const
+Image::scale (libdcp::Size out_size, Scaler const * scaler, AVPixelFormat out_format, bool out_aligned) const
{
assert (scaler);
/* Empirical testing suggests that sws_scale() will crash if
*/
assert (aligned ());
- shared_ptr<Image> rgb (new Image (PIX_FMT_RGB24, out_size, result_aligned));
+ shared_ptr<Image> 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;
+ return scaled;
}
/** Run a FFmpeg post-process on this image and return the processed version.
shared_ptr<Image>
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;
-
+ libdcp::Size cropped_size = crop.apply (size ());
shared_ptr<Image> out (new Image (pixel_format(), cropped_size, aligned));
for (int c = 0; c < components(); ++c) {
/** 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<int16_t*> (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
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]);
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 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_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;
void
Image::alpha_blend (shared_ptr<const Image> other, Position<int> 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;
}
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;
}
}
}
_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 *) av_malloc (_stride[i] * lines (i) + 1);
}
}