X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage.cc;h=75345cb068ae5363416c2823b5fb9cbbdd36c2c6;hb=4d3d20687c9e334b29c8a2821e0646fb9166ab3f;hp=c3795dfa2a1adc8f7107d1ddafc6851fb4d2b90a;hpb=f484570d7fe219ec68aa48c9830d7bd2c76e9144;p=dcpomatic.git

diff --git a/src/lib/image.cc b/src/lib/image.cc
index c3795dfa2..75345cb06 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -30,12 +30,16 @@
 #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"
@@ -183,8 +187,8 @@ Image::crop_scale_window (
 		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);
 	}
 
@@ -196,16 +200,23 @@ Image::crop_scale_window (
 		   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 (
@@ -246,7 +257,7 @@ Image::scale (dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_fo
 	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);
@@ -783,6 +794,34 @@ Image::Image (AVPixelFormat p, dcp::Size s, bool aligned, int extra_pixels)
 	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 ()
 {
@@ -814,11 +853,18 @@ 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)
@@ -1118,8 +1164,8 @@ Image::fade (float f)
 	}
 }
 
-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;
@@ -1137,3 +1183,38 @@ Image::memory_used () const
 	}
 	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());
+}