X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.cc;h=35d70162ccfb014b695d5ef65f8b9d48488a2499;hp=b6e684815b3e8cfcd346de91b60ad6b08ab28afd;hb=5a5324ed3a381a86dfe0a6e3932c1d58fdcd596f;hpb=b67a3505b58ffd204ee1a2560be3026688be8f10

diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index b6e684815..35d70162c 100644
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -1,34 +1,36 @@
 /*
     Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "j2k_image_proxy.h"
 #include "dcpomatic_socket.h"
 #include "image.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 <dcp/j2k.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
+#include <boost/make_shared.hpp>
 #include <iostream>
 
 #include "i18n.h"
@@ -38,6 +40,8 @@ using std::cout;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
+using boost::make_shared;
+using dcp::Data;
 
 /** Construct a J2KImageProxy from a JPEG2000 file */
 J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size)
@@ -80,39 +84,46 @@ 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> note) const
+void
+J2KImageProxy::ensure_j2k () const
 {
-	shared_ptr<Image> image (new Image (AV_PIX_FMT_RGB48LE, _size, true));
+	if (!_j2k) {
+		_j2k = dcp::decompress_j2k (const_cast<uint8_t*> (_data.data().get()), _data.size (), 0);
+	}
+}
 
-	shared_ptr<dcp::OpenJPEGImage> oj = dcp::decompress_j2k (const_cast<uint8_t*> (_data.data().get()), _data.size (), 0);
+shared_ptr<Image>
+J2KImageProxy::image (optional<dcp::NoteHandler>) const
+{
+	ensure_j2k ();
 
-	if (oj->opj_image()->comps[0].prec < 12) {
-		int const shift = 12 - oj->opj_image()->comps[0].prec;
+	if (_j2k->precision(0) < 12) {
+		int const shift = 12 - _j2k->precision (0);
 		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) {
+			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;
 				}
 			}
 		}
 	}
 
-	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;
+	shared_ptr<Image> image = make_shared<Image> (pixel_format(), _size, true);
+
+	/* Copy data in whatever format (sRGB or XYZ) into our Image; I'm assuming
+	   the data is 12-bit either way.
+	*/
+
+	int p = 0;
+	for (int y = 0; y < _j2k->size().height; ++y) {
+		uint16_t* q = (uint16_t *) (image->data()[0] + y * image->stride()[0]);
+		for (int x = 0; x < _j2k->size().width; ++x) {
+			for (int c = 0; c < 3; ++c) {
+				*q++ = _j2k->data(c)[p] << 4;
 			}
+			++p;
 		}
-	} else {
-		dcp::xyz_to_rgb (oj, dcp::ColourConversion::srgb_to_xyz(), image->data()[0], image->stride()[0], note);
 	}
 
 	return image;
@@ -151,6 +162,18 @@ J2KImageProxy::same (shared_ptr<const ImageProxy> other) const
 	return memcmp (_data.data().get(), jp->_data.data().get(), _data.size()) == 0;
 }
 
+AVPixelFormat
+J2KImageProxy::pixel_format () const
+{
+	ensure_j2k ();
+
+	if (_j2k->srgb ()) {
+		return AV_PIX_FMT_RGB48LE;
+	}
+
+	return AV_PIX_FMT_XYZ12LE;
+}
+
 J2KImageProxy::J2KImageProxy (Data data, dcp::Size size)
 	: _data (data)
 	, _size (size)