X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.cc;h=fcd1689cbf2df23190fbe5f10ae46d64d8075968;hb=8336cba4e6a8c594680696d2337ddc800d84c267;hp=0e3fa88f5070182de40686dd06bf6629c458569d;hpb=4ab86ef0295bcd6bb9297996a06006f371d22bae;p=dcpomatic.git

diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index 0e3fa88f5..fcd1689cb 100644
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -22,15 +22,18 @@
 #include "dcpomatic_socket.h"
 #include "image.h"
 #include "dcpomatic_assert.h"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/mono_picture_frame.h>
 #include <dcp/stereo_picture_frame.h>
 #include <dcp/colour_conversion.h>
 #include <dcp/rgb_xyz.h>
-#include <dcp/j2k.h>
+#include <dcp/j2k_transcode.h>
 #include <libcxml/cxml.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <iostream>
 
 #include "i18n.h"
@@ -40,15 +43,15 @@ using std::cout;
 using std::max;
 using std::pair;
 using std::make_pair;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
-using boost::dynamic_pointer_cast;
-using dcp::Data;
+using std::dynamic_pointer_cast;
+using dcp::ArrayData;
 using dcp::raw_convert;
 
 /** Construct a J2KImageProxy from a JPEG2000 file */
 J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size, AVPixelFormat pixel_format)
-	: _data (path)
+	: _data (new dcp::ArrayData(path))
 	, _size (size)
 	, _pixel_format (pixel_format)
 	, _error (false)
@@ -57,13 +60,14 @@ J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size, AVPi
 	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,
 	optional<int> forced_reduction
 	)
-	: _data (frame->j2k_size ())
+	: _data (frame)
 	, _size (size)
 	, _pixel_format (pixel_format)
 	, _forced_reduction (forced_reduction)
@@ -71,9 +75,9 @@ J2KImageProxy::J2KImageProxy (
 {
 	/* ::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,
@@ -81,7 +85,8 @@ J2KImageProxy::J2KImageProxy (
 	AVPixelFormat pixel_format,
 	optional<int> forced_reduction
 	)
-	: _size (size)
+	: _data (eye == dcp::Eye::LEFT ? frame->left() : frame->right())
+	, _size (size)
 	, _eye (eye)
 	, _pixel_format (pixel_format)
 	, _forced_reduction (forced_reduction)
@@ -89,18 +94,9 @@ J2KImageProxy::J2KImageProxy (
 {
 	/* ::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 ());
-		memcpy (_data.data().get(), frame->left_j2k_data(), _data.size ());
-		break;
-	case dcp::EYE_RIGHT:
-		_data = Data (frame->right_j2k_size ());
-		memcpy (_data.data().get(), frame->right_j2k_data(), _data.size ());
-		break;
-	}
 }
 
+
 J2KImageProxy::J2KImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket)
 	: _error (false)
 {
@@ -108,13 +104,14 @@ J2KImageProxy::J2KImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
 	if (xml->optional_number_child<int> ("Eye")) {
 		_eye = static_cast<dcp::Eye> (xml->number_child<int> ("Eye"));
 	}
-	_data = Data (xml->number_child<int> ("Size"));
+	shared_ptr<ArrayData> data(new ArrayData(xml->number_child<int>("Size")));
 	/* This only matters when we are using J2KImageProxy for the preview, which
 	   will never use this constructor (which is only used for passing data to
 	   encode servers).  So we can put anything in here.  It's a bit of a hack.
 	*/
 	_pixel_format = AV_PIX_FMT_XYZ12LE;
-	socket->read (_data.data().get (), _data.size ());
+	socket->read (data->data(), data->size());
+	_data = data;
 }
 
 int
@@ -141,7 +138,8 @@ J2KImageProxy::prepare (optional<dcp::Size> target_size) const
 	}
 
 	try {
-		shared_ptr<dcp::OpenJPEGImage> decompressed = dcp::decompress_j2k (const_cast<uint8_t*> (_data.data().get()), _data.size (), reduce);
+		/* XXX: should check that potentially trashing _data here doesn't matter */
+		shared_ptr<dcp::OpenJPEGImage> decompressed = dcp::decompress_j2k (const_cast<uint8_t*>(_data->data()), _data->size(), reduce);
 		_image.reset (new Image (_pixel_format, decompressed->size(), true));
 
 		int const shift = 16 - decompressed->precision (0);
@@ -199,13 +197,13 @@ J2KImageProxy::add_metadata (xmlpp::Node* node) const
 	if (_eye) {
 		node->add_child("Eye")->add_child_text (raw_convert<string> (static_cast<int> (_eye.get ())));
 	}
-	node->add_child("Size")->add_child_text (raw_convert<string> (_data.size ()));
+	node->add_child("Size")->add_child_text (raw_convert<string>(_data->size()));
 }
 
 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());
+	socket->write (_data->data(), _data->size());
 }
 
 bool
@@ -216,17 +214,14 @@ J2KImageProxy::same (shared_ptr<const ImageProxy> other) const
 		return false;
 	}
 
-	if (_data.size() != jp->_data.size()) {
-		return false;
-	}
-
-	return memcmp (_data.data().get(), jp->_data.data().get(), _data.size()) == 0;
+	return *_data == *jp->_data;
 }
 
-J2KImageProxy::J2KImageProxy (Data data, dcp::Size size, AVPixelFormat pixel_format)
-	: _data (data)
+J2KImageProxy::J2KImageProxy (ArrayData data, dcp::Size size, AVPixelFormat pixel_format)
+	: _data (new ArrayData(data))
 	, _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);
@@ -235,7 +230,7 @@ J2KImageProxy::J2KImageProxy (Data data, dcp::Size size, AVPixelFormat pixel_for
 size_t
 J2KImageProxy::memory_used () const
 {
-	size_t m = _data.size();
+	size_t m = _data->size();
 	if (_image) {
 		/* 3 components, 16-bits per pixel */
 		m += 3 * 2 * _image->size().width * _image->size().height;