Reduce during J2K decode where possible for playback (#986).

8 files changed, 58 insertions, 29 deletions

diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h
index b0ec16110..d7bd7b0e6 100644
--- a/src/lib/image_proxy.h
+++ b/src/lib/image_proxy.h
@@ -60,8 +60,16 @@ class ImageProxy : public boost::noncopyable
 public:
 	virtual ~ImageProxy () {}
 
-	/** @return Image (which must be aligned) */
-	virtual boost::shared_ptr<Image> image (boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> ()) const = 0;
+	/** @param note Handler for any notes that occur.
+	 *  @param size Size that the returned image will be scaled to, in case this
+	 *  can be used as an optimisation.
+	 *  @return Image (which must be aligned)
+	 */
+	virtual boost::shared_ptr<Image> image (
+		boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> (),
+		boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
+		) const = 0;
+
 	virtual void add_metadata (xmlpp::Node *) const = 0;
 	virtual void send_binary (boost::shared_ptr<Socket>) const = 0;
 	/** @return true if our image is definitely the same as another, false if it is probably not */
diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index fb38c9e99..4e38213c8 100644
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -30,12 +30,14 @@
 #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;
@@ -91,46 +93,53 @@ J2KImageProxy::J2KImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
 	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;
 			}
 			++p;
 		}
+		p += _j2k->factor(0) * width;
 	}
 
 	return image;
diff --git a/src/lib/j2k_image_proxy.h b/src/lib/j2k_image_proxy.h
index 96a776f2a..8fc9040d5 100644
--- a/src/lib/j2k_image_proxy.h
+++ b/src/lib/j2k_image_proxy.h
@@ -35,7 +35,11 @@ public:
 	J2KImageProxy (boost::shared_ptr<const dcp::StereoPictureFrame> frame, dcp::Size, dcp::Eye, AVPixelFormat pixel_format);
 	J2KImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
 
-	boost::shared_ptr<Image> image (boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> ()) const;
+	boost::shared_ptr<Image> image (
+		boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> (),
+		boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
+		) const;
+
 	void add_metadata (xmlpp::Node *) const;
 	void send_binary (boost::shared_ptr<Socket>) const;
 	/** @return true if our image is definitely the same as another, false if it is probably not */
@@ -57,11 +61,11 @@ private:
 
 	/* For tests */
 	J2KImageProxy (dcp::Data data, dcp::Size size, AVPixelFormat pixel_format);
-	void ensure_j2k () const;
 
 	dcp::Data _data;
 	dcp::Size _size;
 	boost::optional<dcp::Eye> _eye;
 	mutable boost::shared_ptr<dcp::OpenJPEGImage> _j2k;
+	mutable boost::optional<dcp::Size> _j2k_target_size;
 	AVPixelFormat _pixel_format;
 };
diff --git a/src/lib/magick_image_proxy.cc b/src/lib/magick_image_proxy.cc
index 2d1867fcc..b8255c9ad 100644
--- a/src/lib/magick_image_proxy.cc
+++ b/src/lib/magick_image_proxy.cc
@@ -67,7 +67,7 @@ MagickImageProxy::MagickImageProxy (shared_ptr<cxml::Node>, shared_ptr<Socket> s
 }
 
 shared_ptr<Image>
-MagickImageProxy::image (optional<dcp::NoteHandler>) const
+MagickImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size>) const
 {
 	boost::mutex::scoped_lock lm (_mutex);
 
diff --git a/src/lib/magick_image_proxy.h b/src/lib/magick_image_proxy.h
index e255b1336..5c4532add 100644
--- a/src/lib/magick_image_proxy.h
+++ b/src/lib/magick_image_proxy.h
@@ -29,7 +29,11 @@ public:
 	MagickImageProxy (boost::filesystem::path);
 	MagickImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
 
-	boost::shared_ptr<Image> image (boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> ()) const;
+	boost::shared_ptr<Image> image (
+		boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> (),
+		boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
+		) const;
+
 	void add_metadata (xmlpp::Node *) const;
 	void send_binary (boost::shared_ptr<Socket>) const;
 	bool same (boost::shared_ptr<const ImageProxy> other) const;
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index 8075b7b7d..5e34ddf97 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -106,7 +106,7 @@ PlayerVideo::set_subtitle (PositionImage image)
 shared_ptr<Image>
 PlayerVideo::image (dcp::NoteHandler note, function<AVPixelFormat (AVPixelFormat)> pixel_format, bool aligned, bool fast) const
 {
-	shared_ptr<Image> im = _in->image (optional<dcp::NoteHandler> (note));
+	shared_ptr<Image> im = _in->image (optional<dcp::NoteHandler> (note), _inter_size);
 
 	Crop total_crop = _crop;
 	switch (_part) {
diff --git a/src/lib/raw_image_proxy.cc b/src/lib/raw_image_proxy.cc
index 6ebcee60c..ea702f138 100644
--- a/src/lib/raw_image_proxy.cc
+++ b/src/lib/raw_image_proxy.cc
@@ -53,7 +53,7 @@ RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
 }
 
 shared_ptr<Image>
-RawImageProxy::image (optional<dcp::NoteHandler>) const
+RawImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size>) const
 {
 	return _image;
 }
diff --git a/src/lib/raw_image_proxy.h b/src/lib/raw_image_proxy.h
index 379c06f32..28fd7f263 100644
--- a/src/lib/raw_image_proxy.h
+++ b/src/lib/raw_image_proxy.h
@@ -29,7 +29,11 @@ public:
 	RawImageProxy (boost::shared_ptr<Image>);
 	RawImageProxy (boost::shared_ptr<cxml::Node> xml, boost::shared_ptr<Socket> socket);
 
-	boost::shared_ptr<Image> image (boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> ()) const;
+	boost::shared_ptr<Image> image (
+		boost::optional<dcp::NoteHandler> note = boost::optional<dcp::NoteHandler> (),
+		boost::optional<dcp::Size> size = boost::optional<dcp::Size> ()
+		) const;
+
 	void add_metadata (xmlpp::Node *) const;
 	void send_binary (boost::shared_ptr<Socket>) const;
 	bool same (boost::shared_ptr<const ImageProxy>) const;