#include "dcpomatic_socket.h"
#include <dcp/rgb_xyz.h>
#include <dcp/transfer_function.h>
+#include <Magick++.h>
extern "C" {
#include <libswscale/swscale.h>
#include <libavutil/pixfmt.h>
#include <libavutil/pixdesc.h>
#include <libavutil/frame.h>
}
+#if HAVE_VALGRIND_MEMCHECK_H
+#include <valgrind/memcheck.h>
+#endif
#include <iostream>
#include "i18n.h"
0, 1 << 16, 1 << 16
);
- AVPixFmtDescriptor const * desc = av_pix_fmt_desc_get (_pixel_format);
- if (!desc) {
+ AVPixFmtDescriptor const * in_desc = av_pix_fmt_desc_get (_pixel_format);
+ if (!in_desc) {
throw PixelFormatError ("crop_scale_window()", _pixel_format);
}
round down so that we don't crop a subsampled pixel until
we've cropped all of its Y-channel pixels.
*/
- int const x = lrintf (bytes_per_pixel(c) * crop.left) & ~ ((int) desc->log2_chroma_w);
+ int const x = lrintf (bytes_per_pixel(c) * crop.left) & ~ ((int) in_desc->log2_chroma_w);
scale_in_data[c] = data()[c] + x + stride()[c] * (crop.top / vertical_factor(c));
}
/* Corner of the image within out_size */
Position<int> const corner ((out_size.width - inter_size.width) / 2, (out_size.height - inter_size.height) / 2);
+ AVPixFmtDescriptor const * out_desc = av_pix_fmt_desc_get (out_format);
+ if (!out_desc) {
+ throw PixelFormatError ("crop_scale_window()", out_format);
+ }
+
uint8_t* scale_out_data[out->planes()];
for (int c = 0; c < out->planes(); ++c) {
- scale_out_data[c] = out->data()[c] + lrintf (out->bytes_per_pixel(c) * corner.x) + out->stride()[c] * (corner.y / out->vertical_factor(c));
+ /* See the note in the crop loop above */
+ int const x = lrintf (out->bytes_per_pixel(c) * corner.x) & ~ ((int) out_desc->log2_chroma_w);
+ scale_out_data[c] = out->data()[c] + x + out->stride()[c] * (corner.y / out->vertical_factor(c));
}
sws_scale (
struct SwsContext* scale_context = sws_getContext (
size().width, size().height, pixel_format(),
out_size.width, out_size.height, out_format,
- fast ? SWS_FAST_BILINEAR : SWS_BICUBIC, 0, 0, 0
+ (fast ? SWS_FAST_BILINEAR : SWS_BICUBIC) | SWS_ACCURATE_RND, 0, 0, 0
);
DCPOMATIC_ASSERT (yuv_to_rgb < dcp::YUV_TO_RGB_COUNT);
void
Image::make_transparent ()
{
- if (_pixel_format != AV_PIX_FMT_RGBA) {
+ if (_pixel_format != AV_PIX_FMT_BGRA) {
throw PixelFormatError ("make_transparent()", _pixel_format);
}
void
Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
{
- /* We're blending RGBA images; first byte is red, second byte is green, third byte blue, fourth byte alpha */
- DCPOMATIC_ASSERT (other->pixel_format() == AV_PIX_FMT_RGBA);
+ /* We're blending BGRA images; first byte is blue, second byte is green, third byte red, fourth byte alpha */
+ DCPOMATIC_ASSERT (other->pixel_format() == AV_PIX_FMT_BGRA);
int const other_bpp = 4;
int start_tx = position.x;
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] = op[0] * alpha + tp[0] * (1 - alpha);
+ tp[0] = op[2] * alpha + tp[0] * (1 - alpha);
tp[1] = op[1] * alpha + tp[1] * (1 - alpha);
- tp[2] = op[2] * alpha + tp[2] * (1 - alpha);
+ tp[2] = op[0] * alpha + tp[2] * (1 - alpha);
tp += this_bpp;
op += other_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] = op[2] * alpha + tp[0] * (1 - alpha);
+ tp[0] = op[0] * alpha + tp[0] * (1 - alpha);
tp[1] = op[1] * alpha + tp[1] * (1 - alpha);
- tp[2] = op[0] * alpha + tp[2] * (1 - alpha);
+ tp[2] = op[2] * alpha + tp[2] * (1 - alpha);
tp[3] = op[3] * alpha + tp[3] * (1 - alpha);
tp += 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] = op[0] * alpha + tp[0] * (1 - alpha);
+ tp[0] = op[2] * alpha + tp[0] * (1 - alpha);
tp[1] = op[1] * alpha + tp[1] * (1 - alpha);
- tp[2] = op[2] * alpha + tp[2] * (1 - alpha);
+ tp[2] = op[0] * alpha + tp[2] * (1 - alpha);
tp[3] = op[3] * alpha + tp[3] * (1 - alpha);
tp += this_bpp;
for (int tx = start_tx, ox = start_ox; tx < size().width && ox < other->size().width; ++tx, ++ox) {
float const alpha = float (op[3]) / 255;
/* Blend high bytes */
- tp[1] = op[0] * alpha + tp[1] * (1 - alpha);
+ tp[1] = op[2] * alpha + tp[1] * (1 - alpha);
tp[3] = op[1] * alpha + tp[3] * (1 - alpha);
- tp[5] = op[2] * alpha + tp[5] * (1 - alpha);
+ tp[5] = op[0] * alpha + tp[5] * (1 - alpha);
tp += this_bpp;
op += other_bpp;
break;
}
case AV_PIX_FMT_YUV420P10:
+ {
+ shared_ptr<Image> yuv = other->convert_pixel_format (dcp::YUV_TO_RGB_REC709, _pixel_format, false, false);
+ dcp::Size const ts = size();
+ dcp::Size const os = yuv->size();
+ for (int ty = start_ty, oy = start_oy; ty < ts.height && oy < os.height; ++ty, ++oy) {
+ int const hty = ty / 2;
+ int const hoy = oy / 2;
+ uint16_t* tY = ((uint16_t *) (data()[0] + (ty * stride()[0]))) + start_tx;
+ uint16_t* tU = ((uint16_t *) (data()[1] + (hty * stride()[1]))) + start_tx / 2;
+ uint16_t* tV = ((uint16_t *) (data()[2] + (hty * stride()[2]))) + start_tx / 2;
+ uint16_t* oY = ((uint16_t *) (yuv->data()[0] + (oy * yuv->stride()[0]))) + start_ox;
+ uint16_t* oU = ((uint16_t *) (yuv->data()[1] + (hoy * yuv->stride()[1]))) + start_ox / 2;
+ uint16_t* oV = ((uint16_t *) (yuv->data()[2] + (hoy * yuv->stride()[2]))) + start_ox / 2;
+ uint8_t* alpha = other->data()[0] + (oy * other->stride()[0]) + start_ox * 4;
+ for (int tx = start_tx, ox = start_ox; tx < ts.width && ox < os.width; ++tx, ++ox) {
+ float const a = float(alpha[3]) / 255;
+ *tY = *oY * a + *tY * (1 - a);
+ *tU = *oU * a + *tU * (1 - a);
+ *tV = *oV * a + *tV * (1 - a);
+ ++tY;
+ ++oY;
+ if (tx % 2) {
+ ++tU;
+ ++tV;
+ }
+ if (ox % 2) {
+ ++oU;
+ ++oV;
+ }
+ alpha += 4;
+ }
+ }
+ break;
+ }
case AV_PIX_FMT_YUV422P10LE:
{
shared_ptr<Image> yuv = other->convert_pixel_format (dcp::YUV_TO_RGB_REC709, _pixel_format, false, false);
dcp::Size const ts = size();
dcp::Size const os = yuv->size();
for (int ty = start_ty, oy = start_oy; ty < ts.height && oy < os.height; ++ty, ++oy) {
- uint16_t* tY = (uint16_t *) (data()[0] + (ty * stride()[0])) + start_tx;
- uint8_t* tU = data()[1] + (ty * stride()[1]) + start_tx;
- uint8_t* tV = data()[2] + (ty * stride()[2]) + start_tx;
- uint16_t* oY = (uint16_t *) (yuv->data()[0] + (oy * yuv->stride()[0])) + start_ox;
- uint8_t* oU = yuv->data()[1] + (oy * yuv->stride()[1]) + start_ox;
- uint8_t* oV = yuv->data()[2] + (oy * yuv->stride()[2]) + start_ox;
+ uint16_t* tY = ((uint16_t *) (data()[0] + (ty * stride()[0]))) + start_tx;
+ uint16_t* tU = ((uint16_t *) (data()[1] + (ty * stride()[1]))) + start_tx / 2;
+ uint16_t* tV = ((uint16_t *) (data()[2] + (ty * stride()[2]))) + start_tx / 2;
+ uint16_t* oY = ((uint16_t *) (yuv->data()[0] + (oy * yuv->stride()[0]))) + start_ox;
+ uint16_t* oU = ((uint16_t *) (yuv->data()[1] + (oy * yuv->stride()[1]))) + start_ox / 2;
+ uint16_t* oV = ((uint16_t *) (yuv->data()[2] + (oy * yuv->stride()[2]))) + start_ox / 2;
uint8_t* alpha = other->data()[0] + (oy * other->stride()[0]) + start_ox * 4;
for (int tx = start_tx, ox = start_ox; tx < ts.width && ox < os.width; ++tx, ++ox) {
float const a = float(alpha[3]) / 255;
*tU = *oU * a + *tU * (1 - a);
*tV = *oV * a + *tV * (1 - a);
++tY;
- ++tU;
- ++tV;
++oY;
- ++oU;
- ++oV;
+ if (tx % 2) {
+ ++tU;
+ ++tV;
+ }
+ if (ox % 2) {
+ ++oU;
+ ++oV;
+ }
alpha += 4;
}
}
allocate ();
}
+/** Construct an Image from some PNG data */
+Image::Image (dcp::Data png)
+{
+ Magick::Blob blob;
+ blob.update (png.data().get(), png.size());
+ Magick::Image* magick_image = new Magick::Image (blob);
+ _size = dcp::Size(magick_image->columns(), magick_image->rows());
+ _pixel_format = AV_PIX_FMT_BGRA;
+ _aligned = true;
+ _extra_pixels = 0;
+ allocate ();
+
+ /* Write line-by-line here as _image must be aligned, and write() cannot be told about strides */
+ uint8_t* p = data()[0];
+ for (int i = 0; i < _size.height; ++i) {
+#ifdef DCPOMATIC_HAVE_MAGICKCORE_NAMESPACE
+ using namespace MagickCore;
+#endif
+#ifdef DCPOMATIC_HAVE_MAGICKLIB_NAMESPACE
+ using namespace MagickLib;
+#endif
+ magick_image->write (0, i, _size.width, 1, "BGRA", CharPixel, p);
+ p += stride()[0];
+ }
+
+ delete magick_image;
+}
+
void
Image::allocate ()
{
testing suggests that it works.
*/
_data[i] = (uint8_t *) wrapped_av_malloc (_stride[i] * sample_size(i).height + _extra_pixels * bytes_per_pixel(i) + 32);
+#if HAVE_VALGRIND_MEMCHECK_H
+ /* The data between the end of the line size and the stride is undefined but processed by
+ libswscale, causing lots of valgrind errors. Mark it all defined to quell these errors.
+ */
+ VALGRIND_MAKE_MEM_DEFINED (_data[i], _stride[i] * sample_size(i).height + _extra_pixels * bytes_per_pixel(i) + 32);
+#endif
}
}
Image::Image (Image const & other)
- : _size (other._size)
+ : boost::enable_shared_from_this<Image>(other)
+ , _size (other._size)
, _pixel_format (other._pixel_format)
, _aligned (other._aligned)
, _extra_pixels (other._extra_pixels)
}
}
-shared_ptr<Image>
-Image::ensure_aligned (shared_ptr<Image> image)
+shared_ptr<const Image>
+Image::ensure_aligned (shared_ptr<const Image> image)
{
if (image->aligned()) {
return image;
}
return m;
}
+
+dcp::Data
+Image::as_png () const
+{
+#ifdef DCPOMATIC_IMAGE_MAGICK
+ using namespace MagickCore;
+#else
+ using namespace MagickLib;
+#endif
+
+ string format;
+ switch (_pixel_format) {
+ case AV_PIX_FMT_RGB24:
+ format = "RGB";
+ break;
+ case AV_PIX_FMT_BGRA:
+ format = "BGRA";
+ break;
+ default:
+ DCPOMATIC_ASSERT (false);
+ break;
+ }
+
+ shared_ptr<const Image> use;
+ if (aligned()) {
+ use.reset (new Image(shared_from_this(), false));
+ }
+
+ Magick::Image m (size().width, size().height, format, CharPixel, (void *) use->data()[0]);
+ m.magick ("PNG");
+ Magick::Blob blob;
+ m.write (&blob);
+ /* XXX: could use a subclass of Data here (storing its data in a Blob) */
+ return dcp::Data (static_cast<const uint8_t*>(blob.data()), blob.length());
+}
projects / dcpomatic.git / blobdiff