X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.cc;h=da3e23caf7bf64fd621fd74ee4cdfc8fe356b245;hb=3b31d2d8a129ae6d8d267427bd6b5bc444b40b2a;hp=2489a949925f12ffd535779c0efc2507257d0135;hpb=a5ea5c0d2637dd41e3d356cb62cac75b8cadf8ce;p=dcpomatic.git

diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index 2489a9499..da3e23caf 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,7 +52,8 @@ 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 (
@@ -64,6 +67,8 @@ J2KImageProxy::J2KImageProxy (
 	, _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 ());
 }
 
@@ -79,6 +84,8 @@ J2KImageProxy::J2KImageProxy (
 	, _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 ());
@@ -106,13 +113,14 @@ 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;
@@ -128,48 +136,46 @@ J2KImageProxy::prepare (optional<dcp::Size> target_size) const
 		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;
-				}
-			}
-		}
-	}
-
-	_target_size = target_size;
-}
-
-shared_ptr<Image>
-J2KImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size> target_size) const
-{
-	prepare (target_size);
+	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));
 
-	shared_ptr<Image> image (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 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]);
+	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++ = _decompressed->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;
+}
+
+
+ImageProxy::Result
+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 Result (_image, r);
 }
 
 void
@@ -210,16 +216,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 (_decompressed) {
+	if (_image) {
 		/* 3 components, 16-bits per pixel */
-		m += 3 * 2 * _decompressed->size().width * _decompressed->size().height;
+		m += 3 * 2 * _image->size().width * _image->size().height;
 	}
 	return m;
 }