AVPixFmtDescriptor const * d = av_pix_fmt_desc_get(_pixel_format);
if (!d) {
- throw PixelFormatError ("lines()", _pixel_format);
+ throw PixelFormatError ("line_factor()", _pixel_format);
}
-
+
return pow (2.0f, d->log2_chroma_h);
}
if ((d->flags & PIX_FMT_PLANAR) == 0) {
return 1;
}
-
+
return d->nb_components;
}
sws_getCoefficients (lut[yuv_to_rgb]), 0,
0, 1 << 16, 1 << 16
);
-
+
+ AVPixFmtDescriptor const * desc = av_pix_fmt_desc_get (_pixel_format);
+ if (!desc) {
+ throw PixelFormatError ("crop_scale_window()", _pixel_format);
+ }
+
/* 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));
+ /* To work out the crop in bytes, start by multiplying
+ the crop by the (average) bytes per pixel. Then
+ round down so that we don't crop a subsampled pixel until
+ we've cropped all of its Y-channel pixels.
+ */
+ int const x = int (rint (bytes_per_pixel(c) * crop.left)) & ~ ((int) desc->log2_chroma_w);
+ scale_in_data[c] = data()[c] + x + stride()[c] * (crop.top / line_factor(c));
}
/* Corner of the image within out_size */
sws_freeContext (scale_context);
- return out;
+ return out;
}
shared_ptr<Image>
sws_getCoefficients (lut[yuv_to_rgb]), 0,
0, 1 << 16, 1 << 16
);
-
+
sws_scale (
scale_context,
data(), stride(),
return scaled;
}
-shared_ptr<Image>
-Image::crop (Crop crop, bool aligned) const
-{
- dcp::Size cropped_size = crop.apply (size ());
- shared_ptr<Image> 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;
- /* 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];
- uint8_t* out_p = out->data()[c];
-
- for (int y = 0; y < out->lines(c); ++y) {
- memcpy (out_p, in_p + crop_left_in_bytes, cropped_width_in_bytes);
- in_p += stride()[c];
- out_p += out->stride()[c];
- }
- }
-
- return out;
-}
-
/** Blacken a YUV image whose bits per pixel is rounded up to 16 */
void
Image::yuv_16_black (uint16_t v, bool alpha)
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;
-
+
switch (_pixel_format) {
case PIX_FMT_YUV420P:
case PIX_FMT_YUV422P:
case PIX_FMT_YUV444P9BE:
yuv_16_black (swap_16 (nine_bit_uv), false);
break;
-
+
case PIX_FMT_YUV422P10LE:
case PIX_FMT_YUV444P10LE:
yuv_16_black (ten_bit_uv, false);
case PIX_FMT_YUV444P16LE:
yuv_16_black (sixteen_bit_uv, false);
break;
-
+
case PIX_FMT_YUV444P10BE:
case PIX_FMT_YUV422P10BE:
yuv_16_black (swap_16 (ten_bit_uv), false);
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:
tp[0] = op[0] * alpha + tp[0] * (1 - alpha);
tp[1] = op[1] * alpha + tp[1] * (1 - alpha);
tp[2] = op[2] * alpha + tp[2] * (1 - alpha);
-
+
tp += this_bpp;
op += other_bpp;
}
tp[1] = op[1] * alpha + tp[1] * (1 - alpha);
tp[2] = op[2] * alpha + tp[2] * (1 - alpha);
tp[3] = op[3] * alpha + tp[3] * (1 - alpha);
-
+
tp += this_bpp;
op += other_bpp;
}
tp[1] = op[0] * alpha + tp[1] * (1 - alpha);
tp[3] = op[1] * alpha + tp[3] * (1 - alpha);
tp[5] = op[2] * alpha + tp[5] * (1 - alpha);
-
+
tp += this_bpp;
op += other_bpp;
}
DCPOMATIC_ASSERT (false);
}
}
-
+
void
Image::copy (shared_ptr<const Image> other, Position<int> position)
{
uint8_t * const op = other->data()[0] + oy * other->stride()[0];
memcpy (tp, op, N * 3);
}
-}
+}
void
Image::read_from_socket (shared_ptr<Socket> socket)
{
AVPixFmtDescriptor const * d = av_pix_fmt_desc_get(_pixel_format);
if (!d) {
- throw PixelFormatError ("lines()", _pixel_format);
+ throw PixelFormatError ("bytes_per_pixel()", _pixel_format);
}
if (c >= components()) {
if (d->nb_components > 3) {
bpp[3] = floor ((d->comp[3].depth_minus1 + 1 + 7) / 8) / pow (2.0f, d->log2_chroma_w);
}
-
+
if ((d->flags & PIX_FMT_PLANAR) == 0) {
/* Not planar; sum them up */
return bpp[0] + bpp[1] + bpp[2] + bpp[3];
{
_data = (uint8_t **) wrapped_av_malloc (4 * sizeof (uint8_t *));
_data[0] = _data[1] = _data[2] = _data[3] = 0;
-
+
_line_size = (int *) wrapped_av_malloc (4 * sizeof (int));
_line_size[0] = _line_size[1] = _line_size[2] = _line_size[3] = 0;
-
+
_stride = (int *) wrapped_av_malloc (4 * sizeof (int));
_stride[0] = _stride[1] = _stride[2] = _stride[3] = 0;
return PositionImage (merged, all.position ());
}
-string
-Image::digest () const
-{
- MD5Digester digester;
-
- for (int i = 0; i < components(); ++i) {
- uint8_t* p = data()[i];
- for (int y = 0; y < lines(i); ++y) {
- digester.add (p, line_size()[i]);
- p += stride()[i];
- }
- }
-
- return digester.get ();
-}
-
bool
operator== (Image const & a, Image const & b)
{
return true;
}
+/** Fade the image.
+ * @param f Amount to fade by; 0 is black, 1 is no fade.
+ */
void
Image::fade (float f)
{
case AV_PIX_FMT_YUVA420P10LE:
case AV_PIX_FMT_YUVA422P10LE:
case AV_PIX_FMT_YUVA444P10LE:
+ case AV_PIX_FMT_RGB48LE:
/* 16-bit little-endian */
for (int c = 0; c < 3; ++c) {
int const stride_pixels = stride()[c] / 2;
case AV_PIX_FMT_YUVA420P16BE:
case AV_PIX_FMT_YUVA422P16BE:
case AV_PIX_FMT_YUVA444P16BE:
+ case AV_PIX_FMT_RGB48BE:
/* 16-bit big-endian */
for (int c = 0; c < 3; ++c) {
int const stride_pixels = stride()[c] / 2;