X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fj2k_image_proxy.cc;h=acf8bb05235e7018216824bfd484f0fa533b5d6a;hb=142f7dee139074294d35c630ecee67b85e8a98fc;hp=698943922a204920930ac8d8d04ec3fa5fa495e3;hpb=24fbd3513614dba8f2e5ac16b86576d39f1dc6c0;p=dcpomatic.git

diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index 698943922..acf8bb052 100644
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -51,6 +51,7 @@ J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size, AVPi
 	: _data (path)
 	, _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);
@@ -66,6 +67,7 @@ J2KImageProxy::J2KImageProxy (
 	, _size (size)
 	, _pixel_format (pixel_format)
 	, _forced_reduction (forced_reduction)
+	, _error (false)
 {
 	/* ::image assumes 16bpp */
 	DCPOMATIC_ASSERT (_pixel_format == AV_PIX_FMT_RGB48 || _pixel_format == AV_PIX_FMT_XYZ12LE);
@@ -83,6 +85,7 @@ J2KImageProxy::J2KImageProxy (
 	, _eye (eye)
 	, _pixel_format (pixel_format)
 	, _forced_reduction (forced_reduction)
+	, _error (false)
 {
 	/* ::image assumes 16bpp */
 	DCPOMATIC_ASSERT (_pixel_format == AV_PIX_FMT_RGB48 || _pixel_format == AV_PIX_FMT_XYZ12LE);
@@ -99,6 +102,7 @@ J2KImageProxy::J2KImageProxy (
 }
 
 J2KImageProxy::J2KImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket)
+	: _error (false)
 {
 	_size = dcp::Size (xml->number_child<int> ("Width"), xml->number_child<int> ("Height"));
 	if (xml->optional_number_child<int> ("Eye")) {
@@ -136,30 +140,35 @@ J2KImageProxy::prepare (optional<dcp::Size> target_size) const
 		reduce = max (0, reduce);
 	}
 
-	shared_ptr<dcp::OpenJPEGImage> decompressed = dcp::decompress_j2k (const_cast<uint8_t*> (_data.data().get()), _data.size (), reduce);
-
-	_image.reset (new Image (_pixel_format, decompressed->size(), true));
-
-	int const shift = 16 - decompressed->precision (0);
-
-	/* Copy data in whatever format (sRGB or XYZ) into our Image; I'm assuming
-	   the data is 12-bit either way.
-	*/
-
-	int const width = decompressed->size().width;
-
-	int p = 0;
-	int* decomp_0 = decompressed->data (0);
-	int* decomp_1 = decompressed->data (1);
-	int* decomp_2 = decompressed->data (2);
-	for (int y = 0; y < decompressed->size().height; ++y) {
-		uint16_t* q = (uint16_t *) (_image->data()[0] + y * _image->stride()[0]);
-		for (int x = 0; x < width; ++x) {
-			*q++ = decomp_0[p] << shift;
-			*q++ = decomp_1[p] << shift;
-			*q++ = decomp_2[p] << shift;
-			++p;
+	try {
+		shared_ptr<dcp::OpenJPEGImage> decompressed = dcp::decompress_j2k (const_cast<uint8_t*> (_data.data().get()), _data.size (), reduce);
+		_image.reset (new Image (_pixel_format, decompressed->size(), true));
+
+		int const shift = 16 - decompressed->precision (0);
+
+		/* Copy data in whatever format (sRGB or XYZ) into our Image; I'm assuming
+		   the data is 12-bit either way.
+		   */
+
+		int const width = decompressed->size().width;
+
+		int p = 0;
+		int* decomp_0 = decompressed->data (0);
+		int* decomp_1 = decompressed->data (1);
+		int* decomp_2 = decompressed->data (2);
+		for (int y = 0; y < decompressed->size().height; ++y) {
+			uint16_t* q = (uint16_t *) (_image->data()[0] + y * _image->stride()[0]);
+			for (int x = 0; x < width; ++x) {
+				*q++ = decomp_0[p] << shift;
+				*q++ = decomp_1[p] << shift;
+				*q++ = decomp_2[p] << shift;
+				++p;
+			}
 		}
+	} catch (dcp::J2KDecompressionError& e) {
+		_image.reset (new Image (_pixel_format, _size, true));
+		_image->make_black ();
+		_error = true;
 	}
 
 	_target_size = target_size;
@@ -168,16 +177,19 @@ J2KImageProxy::prepare (optional<dcp::Size> target_size) const
 	return reduce;
 }
 
-pair<shared_ptr<Image>, int>
-J2KImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size> target_size) const
+
+ImageProxy::Result
+J2KImageProxy::image (optional<dcp::Size> target_size) const
 {
 	int const r = prepare (target_size);
+
 	/* I think this is safe without a lock on mutex.  _image is guaranteed to be
 	   set up when prepare() has happened.
 	*/
-	return make_pair (_image, r);
+	return Result (_image, r, _error);
 }
 
+
 void
 J2KImageProxy::add_metadata (xmlpp::Node* node) const
 {
@@ -191,7 +203,7 @@ J2KImageProxy::add_metadata (xmlpp::Node* node) const
 }
 
 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());
 }