X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.cc;h=acf8bb05235e7018216824bfd484f0fa533b5d6a;hb=4b7185e4eda53534c4d71a1f31ba33ca3dd8dc8d;hp=9e68951e95b8e8823ab12d46346e96ac8ff1ab51;hpb=3e230d3785f19bc707fd7ea2b1f55321b93f536f;p=dcpomatic.git

diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index 9e68951e9..acf8bb052 100644
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -21,6 +21,7 @@
 #include "j2k_image_proxy.h"
 #include "dcpomatic_socket.h"
 #include "image.h"
+#include "dcpomatic_assert.h"
 #include <dcp/raw_convert.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/mono_picture_frame.h>
@@ -30,7 +31,6 @@
 #include <dcp/j2k.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
-#include <Magick++.h>
 #include <iostream>
 
 #include "i18n.h"
@@ -38,6 +38,8 @@
 using std::string;
 using std::cout;
 using std::max;
+using std::pair;
+using std::make_pair;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
@@ -49,23 +51,44 @@ J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size, AVPi
 	: _data (path)
 	, _size (size)
 	, _pixel_format (pixel_format)
+	, _error (false)
 {
-
+	/* ::image assumes 16bpp */
+	DCPOMATIC_ASSERT (_pixel_format == AV_PIX_FMT_RGB48 || _pixel_format == AV_PIX_FMT_XYZ12LE);
 }
 
-J2KImageProxy::J2KImageProxy (shared_ptr<const dcp::MonoPictureFrame> frame, dcp::Size size, AVPixelFormat pixel_format)
+J2KImageProxy::J2KImageProxy (
+	shared_ptr<const dcp::MonoPictureFrame> frame,
+	dcp::Size size,
+	AVPixelFormat pixel_format,
+	optional<int> forced_reduction
+	)
 	: _data (frame->j2k_size ())
 	, _size (size)
 	, _pixel_format (pixel_format)
+	, _forced_reduction (forced_reduction)
+	, _error (false)
 {
+	/* ::image assumes 16bpp */
+	DCPOMATIC_ASSERT (_pixel_format == AV_PIX_FMT_RGB48 || _pixel_format == AV_PIX_FMT_XYZ12LE);
 	memcpy (_data.data().get(), frame->j2k_data(), _data.size ());
 }
 
-J2KImageProxy::J2KImageProxy (shared_ptr<const dcp::StereoPictureFrame> frame, dcp::Size size, dcp::Eye eye, AVPixelFormat pixel_format)
+J2KImageProxy::J2KImageProxy (
+	shared_ptr<const dcp::StereoPictureFrame> frame,
+	dcp::Size size,
+	dcp::Eye eye,
+	AVPixelFormat pixel_format,
+	optional<int> forced_reduction
+	)
 	: _size (size)
 	, _eye (eye)
 	, _pixel_format (pixel_format)
+	, _forced_reduction (forced_reduction)
+	, _error (false)
 {
+	/* ::image assumes 16bpp */
+	DCPOMATIC_ASSERT (_pixel_format == AV_PIX_FMT_RGB48 || _pixel_format == AV_PIX_FMT_XYZ12LE);
 	switch (eye) {
 	case dcp::EYE_LEFT:
 		_data = Data (frame->left_j2k_size ());
@@ -79,6 +102,7 @@ J2KImageProxy::J2KImageProxy (shared_ptr<const dcp::StereoPictureFrame> frame, d
 }
 
 J2KImageProxy::J2KImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket)
+	: _error (false)
 {
 	_size = dcp::Size (xml->number_child<int> ("Width"), xml->number_child<int> ("Height"));
 	if (xml->optional_number_child<int> ("Eye")) {
@@ -93,67 +117,79 @@ J2KImageProxy::J2KImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
 	socket->read (_data.data().get (), _data.size ());
 }
 
-void
+int
 J2KImageProxy::prepare (optional<dcp::Size> target_size) const
 {
 	boost::mutex::scoped_lock lm (_mutex);
 
-	if (_decompressed && target_size == _target_size) {
-		return;
+	if (_image && target_size == _target_size) {
+		DCPOMATIC_ASSERT (_reduce);
+		return *_reduce;
 	}
 
 	int reduce = 0;
 
-	while (target_size && (_size.width / pow(2, reduce)) > target_size->width && (_size.height / pow(2, reduce)) > target_size->height) {
-		++reduce;
+	if (_forced_reduction) {
+		reduce = *_forced_reduction;
+	} else {
+		while (target_size && (_size.width / pow(2, reduce)) > target_size->width && (_size.height / pow(2, reduce)) > target_size->height) {
+			++reduce;
+		}
+
+		--reduce;
+		reduce = max (0, reduce);
 	}
 
-	--reduce;
-	reduce = max (0, reduce);
-	_decompressed = dcp::decompress_j2k (const_cast<uint8_t*> (_data.data().get()), _data.size (), reduce);
-
-	if (_decompressed->precision(0) < 12) {
-		int const shift = 12 - _decompressed->precision (0);
-		for (int c = 0; c < 3; ++c) {
-			int* p = _decompressed->data (c);
-			for (int y = 0; y < _decompressed->size().height; ++y) {
-				for (int x = 0; x < _decompressed->size().width; ++x) {
-					*p++ <<= shift;
-				}
+	try {
+		shared_ptr<dcp::OpenJPEGImage> decompressed = dcp::decompress_j2k (const_cast<uint8_t*> (_data.data().get()), _data.size (), reduce);
+		_image.reset (new Image (_pixel_format, decompressed->size(), true));
+
+		int const shift = 16 - decompressed->precision (0);
+
+		/* Copy data in whatever format (sRGB or XYZ) into our Image; I'm assuming
+		   the data is 12-bit either way.
+		   */
+
+		int const width = decompressed->size().width;
+
+		int p = 0;
+		int* decomp_0 = decompressed->data (0);
+		int* decomp_1 = decompressed->data (1);
+		int* decomp_2 = decompressed->data (2);
+		for (int y = 0; y < decompressed->size().height; ++y) {
+			uint16_t* q = (uint16_t *) (_image->data()[0] + y * _image->stride()[0]);
+			for (int x = 0; x < width; ++x) {
+				*q++ = decomp_0[p] << shift;
+				*q++ = decomp_1[p] << shift;
+				*q++ = decomp_2[p] << shift;
+				++p;
 			}
 		}
+	} catch (dcp::J2KDecompressionError& e) {
+		_image.reset (new Image (_pixel_format, _size, true));
+		_image->make_black ();
+		_error = true;
 	}
 
 	_target_size = target_size;
+	_reduce = reduce;
+
+	return reduce;
 }
 
-shared_ptr<Image>
-J2KImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size> target_size) const
-{
-	prepare (target_size);
 
-	shared_ptr<Image> image (new Image (_pixel_format, _decompressed->size(), true));
+ImageProxy::Result
+J2KImageProxy::image (optional<dcp::Size> target_size) const
+{
+	int const r = prepare (target_size);
 
-	/* Copy data in whatever format (sRGB or XYZ) into our Image; I'm assuming
-	   the data is 12-bit either way.
+	/* I think this is safe without a lock on mutex.  _image is guaranteed to be
+	   set up when prepare() has happened.
 	*/
-
-	int const width = _decompressed->size().width;
-
-	int p = 0;
-	for (int y = 0; y < _decompressed->size().height; ++y) {
-		uint16_t* q = (uint16_t *) (image->data()[0] + y * image->stride()[0]);
-		for (int x = 0; x < width; ++x) {
-			for (int c = 0; c < 3; ++c) {
-				*q++ = _decompressed->data(c)[p] << 4;
-			}
-			++p;
-		}
-	}
-
-	return image;
+	return Result (_image, r, _error);
 }
 
+
 void
 J2KImageProxy::add_metadata (xmlpp::Node* node) const
 {
@@ -167,7 +203,7 @@ J2KImageProxy::add_metadata (xmlpp::Node* node) const
 }
 
 void
-J2KImageProxy::send_binary (shared_ptr<Socket> socket) const
+J2KImageProxy::write_to_socket (shared_ptr<Socket> socket) const
 {
 	socket->write (_data.data().get(), _data.size());
 }
@@ -192,5 +228,17 @@ J2KImageProxy::J2KImageProxy (Data data, dcp::Size size, AVPixelFormat pixel_for
 	, _size (size)
 	, _pixel_format (pixel_format)
 {
+	/* ::image assumes 16bpp */
+	DCPOMATIC_ASSERT (_pixel_format == AV_PIX_FMT_RGB48 || _pixel_format == AV_PIX_FMT_XYZ12LE);
+}
 
+size_t
+J2KImageProxy::memory_used () const
+{
+	size_t m = _data.size();
+	if (_image) {
+		/* 3 components, 16-bits per pixel */
+		m += 3 * 2 * _image->size().width * _image->size().height;
+	}
+	return m;
 }