X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.cc;h=31fda2510492d9285f8987c73a41acd9551a5435;hb=a2ceaa313a2b8ba28516c935f7f8b82d69957b77;hp=eea4b038a2c841861a5799288bb216cb7ee9cafc;hpb=bef4b0c377dcbfd4b7b3a244ea09003819134c19;p=dcpomatic.git

diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index eea4b038a..31fda2510 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;
@@ -50,22 +52,40 @@ J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size, AVPi
 	, _size (size)
 	, _pixel_format (pixel_format)
 {
-
+	/* ::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)
 {
+	/* ::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)
 {
+	/* ::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 ());
@@ -93,55 +113,68 @@ J2KImageProxy::J2KImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
 	socket->read (_data.data().get (), _data.size ());
 }
 
-shared_ptr<Image>
-J2KImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size> target_size) const
+int
+J2KImageProxy::prepare (optional<dcp::Size> target_size) const
 {
-	if (!_j2k || target_size != _j2k_target_size) {
-		int reduce = 0;
+	boost::mutex::scoped_lock lm (_mutex);
+
+	if (_image && target_size == _target_size) {
+		DCPOMATIC_ASSERT (_reduce);
+		return *_reduce;
+	}
+
+	int reduce = 0;
 
+	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);
-		_j2k = dcp::decompress_j2k (const_cast<uint8_t*> (_data.data().get()), _data.size (), reduce);
-
-		if (_j2k->precision(0) < 12) {
-			int const shift = 12 - _j2k->precision (0);
-			for (int c = 0; c < 3; ++c) {
-				int* p = _j2k->data (c);
-				for (int y = 0; y < _j2k->size().height; ++y) {
-					for (int x = 0; x < _j2k->size().width; ++x) {
-						*p++ <<= shift;
-					}
-				}
-			}
-		}
-
-		_j2k_target_size = target_size;
 	}
 
-	shared_ptr<Image> image (new Image (_pixel_format, _j2k->size(), true));
+	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 = _j2k->size().width;
+	int const width = decompressed->size().width;
 
 	int p = 0;
-	for (int y = 0; y < _j2k->size().height; ++y) {
-		uint16_t* q = (uint16_t *) (image->data()[0] + y * image->stride()[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) {
-			for (int c = 0; c < 3; ++c) {
-				*q++ = _j2k->data(c)[p] << 4;
-			}
+			*q++ = decomp_0[p] << shift;
+			*q++ = decomp_1[p] << shift;
+			*q++ = decomp_2[p] << shift;
 			++p;
 		}
 	}
 
-	return image;
+	_target_size = target_size;
+	_reduce = reduce;
+
+	return reduce;
+}
+
+pair<shared_ptr<Image>, int>
+J2KImageProxy::image (optional<dcp::Size> target_size) const
+{
+	int const r = prepare (target_size);
+	/* I think this is safe without a lock on mutex.  _image is guaranteed to be
+	   set up when prepare() has happened.
+	*/
+	return make_pair (_image, r);
 }
 
 void
@@ -182,5 +215,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;
 }