X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage.cc;h=13ef0db19872cada4e8f89cc18b0496c55e1fe4f;hb=9e7b4d64c4e9a9bcd0e08ede076162bb0ec666d1;hp=1107f0a4077964ef07b67e221ade50d98f9b0fcb;hpb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;p=dcpomatic.git

diff --git a/src/lib/image.cc b/src/lib/image.cc
index 1107f0a40..13ef0db19 100644
--- a/src/lib/image.cc
+++ b/src/lib/image.cc
@@ -28,25 +28,26 @@
 #include "rect.h"
 #include "util.h"
 #include "dcpomatic_socket.h"
+#include <dcp/rgb_xyz.h>
+#include <dcp/transfer_function.h>
 extern "C" {
 #include <libswscale/swscale.h>
 #include <libavutil/pixfmt.h>
 #include <libavutil/pixdesc.h>
 #include <libavutil/frame.h>
 }
-#include <boost/make_shared.hpp>
 #include <iostream>
 
 #include "i18n.h"
 
 using std::string;
 using std::min;
+using std::max;
 using std::cout;
 using std::cerr;
 using std::list;
 using std::runtime_error;
 using boost::shared_ptr;
-using boost::make_shared;
 using dcp::Size;
 
 int
@@ -85,17 +86,6 @@ Image::sample_size (int n) const
 		);
 }
 
-int
-Image::components () const
-{
-	AVPixFmtDescriptor const * d = av_pix_fmt_desc_get(_pixel_format);
-	if (!d) {
-		throw PixelFormatError ("components()", _pixel_format);
-	}
-
-	return d->nb_components;
-}
-
 /** @return Number of planes */
 int
 Image::planes () const
@@ -151,7 +141,7 @@ Image::crop_scale_window (
 	   To get around this, we ask Image to overallocate its buffers by the overrun.
 	*/
 
-	shared_ptr<Image> out = make_shared<Image> (out_format, out_size, out_aligned, (out_size.width - inter_size.width) / 2);
+	shared_ptr<Image> out (new Image (out_format, out_size, out_aligned, (out_size.width - inter_size.width) / 2));
 	out->make_black ();
 
 	/* Size of the image after any crop */
@@ -229,7 +219,7 @@ Image::scale (dcp::Size out_size, dcp::YUVToRGB yuv_to_rgb, AVPixelFormat out_fo
 	*/
 	DCPOMATIC_ASSERT (aligned ());
 
-	shared_ptr<Image> scaled = make_shared<Image> (out_format, out_size, out_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(),
@@ -508,25 +498,34 @@ Image::alpha_blend (shared_ptr<const Image> other, Position<int> position)
 	}
 	case AV_PIX_FMT_XYZ12LE:
 	{
-		boost::numeric::ublas::matrix<double> matrix = dcp::ColourConversion::srgb_to_xyz().rgb_to_xyz();
+		dcp::ColourConversion conv = dcp::ColourConversion::srgb_to_xyz();
+		double fast_matrix[9];
+		dcp::combined_rgb_to_xyz (conv, fast_matrix);
+		double const * lut_in = conv.in()->lut (8, false);
+		double const * lut_out = conv.out()->lut (16, true);
 		int const this_bpp = 6;
 		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] + start_tx * this_bpp;
+			uint16_t* tp = reinterpret_cast<uint16_t*> (data()[0] + ty * stride()[0] + start_tx * 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;
 
-				/* Convert sRGB to XYZ; op is BGRA */
-				int const x = matrix(0, 0) * op[2] + matrix(0, 1) * op[1] + matrix(0, 2) * op[0];
-				int const y = matrix(1, 0) * op[2] + matrix(1, 1) * op[1] + matrix(1, 2) * op[0];
-				int const z = matrix(2, 0) * op[2] + matrix(2, 1) * op[1] + matrix(2, 2) * op[0];
+				/* Convert sRGB to XYZ; op is BGRA.  First, input gamma LUT */
+				double const r = lut_in[op[2]];
+				double const g = lut_in[op[1]];
+				double const b = lut_in[op[0]];
 
-				/* Blend high bytes */
-				tp[1] = min (x, 255) * alpha + tp[1] * (1 - alpha);
-				tp[3] = min (y, 255) * alpha + tp[3] * (1 - alpha);
-				tp[5] = min (z, 255) * alpha + tp[5] * (1 - alpha);
+				/* RGB to XYZ, including Bradford transform and DCI companding */
+				double const x = max (0.0, min (65535.0, r * fast_matrix[0] + g * fast_matrix[1] + b * fast_matrix[2]));
+				double const y = max (0.0, min (65535.0, r * fast_matrix[3] + g * fast_matrix[4] + b * fast_matrix[5]));
+				double const z = max (0.0, min (65535.0, r * fast_matrix[6] + g * fast_matrix[7] + b * fast_matrix[8]));
 
-				tp += this_bpp;
+				/* Out gamma LUT and blend */
+				tp[0] = lrint(lut_out[lrint(x)] * 65535) * alpha + tp[0] * (1 - alpha);
+				tp[1] = lrint(lut_out[lrint(y)] * 65535) * alpha + tp[1] * (1 - alpha);
+				tp[2] = lrint(lut_out[lrint(z)] * 65535) * alpha + tp[2] * (1 - alpha);
+
+				tp += this_bpp / 2;
 				op += other_bpp;
 			}
 		}
@@ -761,6 +760,7 @@ Image::swap (Image & other)
 	}
 
 	std::swap (_aligned, other._aligned);
+	std::swap (_extra_pixels, other._extra_pixels);
 }
 
 /** Destroy a Image */
@@ -821,7 +821,7 @@ merge (list<PositionImage> images)
 		all.extend (dcpomatic::Rect<int> (i->position, i->image->size().width, i->image->size().height));
 	}
 
-	shared_ptr<Image> merged = make_shared<Image> (images.front().image->pixel_format (), dcp::Size (all.width, all.height), true);
+	shared_ptr<Image> merged (new Image (images.front().image->pixel_format (), dcp::Size (all.width, all.height), true));
 	merged->make_transparent ();
 	for (list<PositionImage>::const_iterator i = images.begin(); i != images.end(); ++i) {
 		merged->alpha_blend (i->image, i->position - all.position());