X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.cc;h=eea4b038a2c841861a5799288bb216cb7ee9cafc;hb=10da8c6ef355d86cb3c0859f264d7d649dce4619;hp=44b5ebea7f6d67cce56f367e7d917f5173e4fcc1;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git

diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index 44b5ebea7..eea4b038a 100644
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -21,7 +21,7 @@
 #include "j2k_image_proxy.h"
 #include "dcpomatic_socket.h"
 #include "image.h"
-#include "raw_convert.h"
+#include <dcp/raw_convert.h>
 #include <dcp/openjpeg_image.h>
 #include <dcp/mono_picture_frame.h>
 #include <dcp/stereo_picture_frame.h>
@@ -30,35 +30,41 @@
 #include <dcp/j2k.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
+#include <Magick++.h>
 #include <iostream>
 
 #include "i18n.h"
 
 using std::string;
 using std::cout;
+using std::max;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
 using dcp::Data;
+using dcp::raw_convert;
 
 /** Construct a J2KImageProxy from a JPEG2000 file */
-J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size)
+J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size, AVPixelFormat pixel_format)
 	: _data (path)
 	, _size (size)
+	, _pixel_format (pixel_format)
 {
 
 }
 
-J2KImageProxy::J2KImageProxy (shared_ptr<const dcp::MonoPictureFrame> frame, dcp::Size size)
+J2KImageProxy::J2KImageProxy (shared_ptr<const dcp::MonoPictureFrame> frame, dcp::Size size, AVPixelFormat pixel_format)
 	: _data (frame->j2k_size ())
 	, _size (size)
+	, _pixel_format (pixel_format)
 {
 	memcpy (_data.data().get(), frame->j2k_data(), _data.size ());
 }
 
-J2KImageProxy::J2KImageProxy (shared_ptr<const dcp::StereoPictureFrame> frame, dcp::Size size, dcp::Eye eye)
+J2KImageProxy::J2KImageProxy (shared_ptr<const dcp::StereoPictureFrame> frame, dcp::Size size, dcp::Eye eye, AVPixelFormat pixel_format)
 	: _size (size)
 	, _eye (eye)
+	, _pixel_format (pixel_format)
 {
 	switch (eye) {
 	case dcp::EYE_LEFT:
@@ -79,44 +85,55 @@ J2KImageProxy::J2KImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
 		_eye = static_cast<dcp::Eye> (xml->number_child<int> ("Eye"));
 	}
 	_data = Data (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 ());
 }
 
-void
-J2KImageProxy::ensure_j2k () const
-{
-	if (!_j2k) {
-		_j2k = dcp::decompress_j2k (const_cast<uint8_t*> (_data.data().get()), _data.size (), 0);
-	}
-}
-
 shared_ptr<Image>
-J2KImageProxy::image (optional<dcp::NoteHandler>) const
+J2KImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size> target_size) const
 {
-	ensure_j2k ();
-
-	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;
+	if (!_j2k || target_size != _j2k_target_size) {
+		int reduce = 0;
+
+		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(), _size, true));
+	shared_ptr<Image> image (new Image (_pixel_format, _j2k->size(), true));
 
 	/* 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 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 x = 0; x < width; ++x) {
 			for (int c = 0; c < 3; ++c) {
 				*q++ = _j2k->data(c)[p] << 4;
 			}
@@ -134,7 +151,7 @@ J2KImageProxy::add_metadata (xmlpp::Node* node) const
 	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("Eye")->add_child_text (raw_convert<string> (static_cast<int> (_eye.get ())));
 	}
 	node->add_child("Size")->add_child_text (raw_convert<string> (_data.size ()));
 }
@@ -160,21 +177,10 @@ 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)
+J2KImageProxy::J2KImageProxy (Data data, dcp::Size size, AVPixelFormat pixel_format)
 	: _data (data)
 	, _size (size)
+	, _pixel_format (pixel_format)
 {
 
 }