X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.cc;h=9914887738bc5859eba5a21eec55e88f15ee56db;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=6924fad795bd1ddbdcab067036a96917110560ed;hpb=1f82930e73679d6aec5223caa255f564339a1a2a;p=dcpomatic.git

diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index 6924fad79..991488773 100644
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,107 +17,134 @@
 
 */
 
-#include <libcxml/cxml.h>
-#include <dcp/raw_convert.h>
-#include <dcp/mono_picture_frame.h>
-#include <dcp/stereo_picture_frame.h>
 #include "j2k_image_proxy.h"
-#include "util.h"
+#include "dcpomatic_socket.h"
 #include "image.h"
-#include "encoded_data.h"
+#include "data.h"
+#include "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 <libcxml/cxml.h>
 
 #include "i18n.h"
 
 using std::string;
+using std::cout;
 using boost::shared_ptr;
+using boost::optional;
+using boost::dynamic_pointer_cast;
 
-J2KImageProxy::J2KImageProxy (shared_ptr<const dcp::MonoPictureFrame> frame, dcp::Size size, shared_ptr<Log> log)
-	: ImageProxy (log)
-	, _mono (frame)
+/** Construct a J2KImageProxy from a JPEG2000 file */
+J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size)
+	: _data (path)
 	, _size (size)
 {
-	
+
 }
 
-J2KImageProxy::J2KImageProxy (shared_ptr<const dcp::StereoPictureFrame> frame, dcp::Size size, dcp::Eye eye, shared_ptr<Log> log)
-	: ImageProxy (log)
-	, _stereo (frame)
+J2KImageProxy::J2KImageProxy (shared_ptr<const dcp::MonoPictureFrame> frame, dcp::Size size)
+	: _data (frame->j2k_size ())
 	, _size (size)
-	, _eye (eye)
 {
+	memcpy (_data.data().get(), frame->j2k_data(), _data.size ());
+}
 
+J2KImageProxy::J2KImageProxy (shared_ptr<const dcp::StereoPictureFrame> frame, dcp::Size size, dcp::Eye eye)
+	: _size (size)
+	, _eye (eye)
+{
+	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, shared_ptr<Log> log)
-	: ImageProxy (log)
+J2KImageProxy::J2KImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket)
 {
 	_size = dcp::Size (xml->number_child<int> ("Width"), xml->number_child<int> ("Height"));
 	if (xml->optional_number_child<int> ("Eye")) {
 		_eye = static_cast<dcp::Eye> (xml->number_child<int> ("Eye"));
-		int const left_size = xml->number_child<int> ("LeftSize");
-		int const right_size = xml->number_child<int> ("RightSize");
-		shared_ptr<dcp::StereoPictureFrame> f (new dcp::StereoPictureFrame ());
-		socket->read (f->left_j2k_data(), left_size);
-		socket->read (f->right_j2k_data(), right_size);
-		_stereo = f;
-	} else {
-		int const size = xml->number_child<int> ("Size");
-		shared_ptr<dcp::MonoPictureFrame> f (new dcp::MonoPictureFrame ());
-		socket->read (f->j2k_data (), size);
-		_mono = f;
 	}
+	_data = Data (xml->number_child<int> ("Size"));
+	socket->read (_data.data().get (), _data.size ());
 }
 
 shared_ptr<Image>
-J2KImageProxy::image () const
+J2KImageProxy::image (optional<dcp::NoteHandler> note) const
 {
-	shared_ptr<Image> image (new Image (PIX_FMT_RGB24, _size, false));
+	shared_ptr<Image> image (new Image (PIX_FMT_RGB48LE, _size, true));
+
+	shared_ptr<dcp::OpenJPEGImage> oj = dcp::decompress_j2k (const_cast<uint8_t*> (_data.data().get()), _data.size (), 0);
+
+	if (oj->opj_image()->comps[0].prec < 12) {
+		int const shift = 12 - oj->opj_image()->comps[0].prec;
+		for (int c = 0; c < 3; ++c) {
+			int* p = oj->data (c);
+			for (int y = 0; y < oj->size().height; ++y) {
+				for (int x = 0; x < oj->size().width; ++x) {
+					*p++ <<= shift;
+				}
+			}
+		}
+	}
 
-	if (_mono) {
-		_mono->rgb_frame (image->data()[0]);
+	if (oj->opj_image()->color_space == CLRSPC_SRGB) {
+		/* No XYZ -> RGB conversion necessary; just copy and interleave the values */
+		int p = 0;
+		for (int y = 0; y < oj->size().height; ++y) {
+			uint16_t* q = (uint16_t *) (image->data()[0] + y * image->stride()[0]);
+			for (int x = 0; x < oj->size().width; ++x) {
+				for (int c = 0; c < 3; ++c) {
+					*q++ = oj->data(c)[p] << 4;
+				}
+				++p;
+			}
+		}
 	} else {
-		_stereo->rgb_frame (_eye, image->data()[0]);
+		dcp::xyz_to_rgb (oj, dcp::ColourConversion::srgb_to_xyz(), image->data()[0], image->stride()[0], note);
 	}
 
-	return shared_ptr<Image> (new Image (image, true));
+	return image;
 }
 
 void
 J2KImageProxy::add_metadata (xmlpp::Node* node) const
 {
 	node->add_child("Type")->add_child_text (N_("J2K"));
-	node->add_child("Width")->add_child_text (dcp::raw_convert<string> (_size.width));
-	node->add_child("Height")->add_child_text (dcp::raw_convert<string> (_size.height));
-	if (_stereo) {
-		node->add_child("Eye")->add_child_text (dcp::raw_convert<string> (_eye));
-		node->add_child("LeftSize")->add_child_text (dcp::raw_convert<string> (_stereo->left_j2k_size ()));
-		node->add_child("RightSize")->add_child_text (dcp::raw_convert<string> (_stereo->right_j2k_size ()));
-	} else {
-		node->add_child("Size")->add_child_text (dcp::raw_convert<string> (_mono->j2k_size ()));
+	node->add_child("Width")->add_child_text (raw_convert<string> (_size.width));
+	node->add_child("Height")->add_child_text (raw_convert<string> (_size.height));
+	if (_eye) {
+		node->add_child("Eye")->add_child_text (raw_convert<string> (_eye.get ()));
 	}
+	node->add_child("Size")->add_child_text (raw_convert<string> (_data.size ()));
 }
 
 void
 J2KImageProxy::send_binary (shared_ptr<Socket> socket) const
 {
-	if (_mono) {
-		socket->write (_mono->j2k_data(), _mono->j2k_size ());
-	} else {
-		socket->write (_stereo->left_j2k_data(), _stereo->left_j2k_size ());
-		socket->write (_stereo->right_j2k_data(), _stereo->right_j2k_size ());
-	}
+	socket->write (_data.data().get(), _data.size());
 }
 
-shared_ptr<EncodedData>
-J2KImageProxy::j2k () const
+bool
+J2KImageProxy::same (shared_ptr<const ImageProxy> other) const
 {
-	if (_mono) {
-		return shared_ptr<EncodedData> (new EncodedData (_mono->j2k_data(), _mono->j2k_size()));
-	} else {
-		if (_eye == dcp::EYE_LEFT) {
-			return shared_ptr<EncodedData> (new EncodedData (_stereo->left_j2k_data(), _stereo->left_j2k_size()));
-		} else {
-			return shared_ptr<EncodedData> (new EncodedData (_stereo->right_j2k_data(), _stereo->right_j2k_size()));
-		}
+	shared_ptr<const J2KImageProxy> jp = dynamic_pointer_cast<const J2KImageProxy> (other);
+	if (!jp) {
+		return false;
 	}
+
+	if (_data.size() != jp->_data.size()) {
+		return false;
+	}
+
+	return memcmp (_data.data().get(), jp->_data.data().get(), _data.size()) == 0;
 }