Port to openjpeg version 2.1.

3 files changed, 131 insertions, 39 deletions

diff --git a/src/openjpeg_image.cc b/src/openjpeg_image.cc
index b7a9c0d0..88e896e6 100644
--- a/src/openjpeg_image.cc
+++ b/src/openjpeg_image.cc
@@ -55,7 +55,7 @@ OpenJPEGImage::OpenJPEGImage (Size size)
 	}
 
 	/* XXX: is this _SRGB right? */
-	_opj_image = opj_image_create (3, &cmptparm[0], CLRSPC_SRGB);
+	_opj_image = opj_image_create (3, &cmptparm[0], OPJ_CLRSPC_SRGB);
 	if (_opj_image == 0) {
 		throw std::runtime_error ("could not create libopenjpeg image");
 	}
diff --git a/src/util.cc b/src/util.cc
index b37e99c8..0c944a15 100644
--- a/src/util.cc
+++ b/src/util.cc
@@ -57,6 +57,7 @@ using std::setw;
 using std::setfill;
 using std::ostream;
 using boost::shared_ptr;
+using boost::shared_array;
 using boost::optional;
 using boost::function;
 using boost::algorithm::trim;
@@ -199,6 +200,41 @@ dcp::decompress_j2k (Data data, int reduce)
 	return dcp::decompress_j2k (data.data.get(), data.size, reduce);
 }
 
+class ReadBuffer
+{
+public:
+	ReadBuffer (uint8_t* data, int64_t size)
+		: _data (data)
+		, _size (size)
+		, _offset (0)
+	{}
+
+	OPJ_SIZE_T read (void* buffer, OPJ_SIZE_T nb_bytes)
+	{
+		int64_t N = min (nb_bytes, _size - _offset);
+		memcpy (buffer, _data + _offset, N);
+		_offset += N;
+		return N;
+	}
+
+private:
+	uint8_t* _data;
+	OPJ_SIZE_T _size;
+	OPJ_SIZE_T _offset;
+};
+
+static OPJ_SIZE_T
+read_function (void* buffer, OPJ_SIZE_T nb_bytes, void* data)
+{
+	return reinterpret_cast<ReadBuffer*>(data)->read (buffer, nb_bytes);
+}
+
+static void
+read_free_function (void* data)
+{
+	delete reinterpret_cast<ReadBuffer*>(data);
+}
+
 /** Decompress a JPEG2000 image to a bitmap.
  *  @param data JPEG2000 data.
  *  @param size Size of data in bytes.
@@ -222,12 +258,12 @@ dcp::decompress_j2k (uint8_t* data, int64_t size, int reduce)
 		0x20
 	};
 
-	OPJ_CODEC_FORMAT format = CODEC_J2K;
+	OPJ_CODEC_FORMAT format = OPJ_CODEC_J2K;
 	if (size >= int (sizeof (jp2_magic)) && memcmp (data, jp2_magic, sizeof (jp2_magic)) == 0) {
-		format = CODEC_JP2;
+		format = OPJ_CODEC_JP2;
 	}
 
-	opj_dinfo_t* decoder = opj_create_decompress (format);
+	opj_codec_t* decoder = opj_create_decompress (format);
 	if (!decoder) {
 		boost::throw_exception (DCPReadError ("could not create JPEG2000 decompresser"));
 	}
@@ -235,32 +271,81 @@ dcp::decompress_j2k (uint8_t* data, int64_t size, int reduce)
 	opj_set_default_decoder_parameters (&parameters);
 	parameters.cp_reduce = reduce;
 	opj_setup_decoder (decoder, &parameters);
-	opj_cio_t* cio = opj_cio_open ((opj_common_ptr) decoder, data, size);
-	if (!cio) {
-		boost::throw_exception (DCPReadError ("could not create JPEG2000 memory stream"));
+
+	opj_stream_t* stream = opj_stream_default_create (OPJ_TRUE);
+	if (!stream) {
+		throw MiscError ("could not create JPEG2000 stream");
 	}
-	opj_image_t* image = opj_decode (decoder, cio);
-	if (!image) {
-		opj_destroy_decompress (decoder);
-		opj_cio_close (cio);
-		if (format == CODEC_J2K) {
+
+	opj_stream_set_read_function (stream, read_function);
+	ReadBuffer* buffer = new ReadBuffer (data, size);
+	opj_stream_set_user_data (stream, buffer, read_free_function);
+	opj_stream_set_user_data_length (stream, size);
+
+	opj_image_t* image = 0;
+	opj_read_header (stream, decoder, &image);
+	if (opj_decode (decoder, stream, image) == OPJ_FALSE) {
+		opj_destroy_codec (decoder);
+		opj_stream_destroy (stream);
+		if (format == OPJ_CODEC_J2K) {
 			boost::throw_exception (DCPReadError (String::compose ("could not decode JPEG2000 codestream of %1 bytes.", size)));
 		} else {
 			boost::throw_exception (DCPReadError (String::compose ("could not decode JP2 file of %1 bytes.", size)));
 		}
 	}
 
-	opj_destroy_decompress (decoder);
-	opj_cio_close (cio);
+	opj_destroy_codec (decoder);
+	opj_stream_destroy (stream);
 
 	image->x1 = rint (float(image->x1) / pow (2, reduce));
 	image->y1 = rint (float(image->y1) / pow (2, reduce));
 	return shared_ptr<OpenJPEGImage> (new OpenJPEGImage (image));
 }
 
+class WriteBuffer
+{
+public:
+/* XXX: is there a better strategy for this? */
+#define MAX_J2K_SIZE (1024 * 1024 * 2)
+	WriteBuffer ()
+		: _data (shared_array<uint8_t> (new uint8_t[MAX_J2K_SIZE]), MAX_J2K_SIZE)
+		, _offset (0)
+	{}
+
+	OPJ_SIZE_T write (void* buffer, OPJ_SIZE_T nb_bytes)
+	{
+		DCP_ASSERT ((_offset + nb_bytes) < MAX_J2K_SIZE);
+		memcpy (_data.data.get() + _offset, buffer, nb_bytes);
+		_offset += nb_bytes;
+		return nb_bytes;
+	}
+
+	Data data () const {
+		return _data;
+	}
+
+private:
+	Data _data;
+	OPJ_SIZE_T _offset;
+};
+
+static OPJ_SIZE_T
+write_function (void* buffer, OPJ_SIZE_T nb_bytes, void* data)
+{
+	return reinterpret_cast<WriteBuffer*>(data)->write (buffer, nb_bytes);
+}
+
+static void
+write_free_function (void* data)
+{
+	delete reinterpret_cast<WriteBuffer*>(data);
+}
+
 Data
-dcp::compress_j2k (shared_ptr<OpenJPEGImage> xyz, int bandwidth, int frames_per_second, bool threed, bool fourk)
+dcp::compress_j2k (shared_ptr<const OpenJPEGImage> xyz, int bandwidth, int frames_per_second, bool threed, bool fourk)
 {
+	/* XXX: should probably use opj_set_*_handler */
+
 	/* Set the max image and component sizes based on frame_rate */
 	int max_cs_len = ((float) bandwidth) / 8 / frames_per_second;
 	if (threed) {
@@ -270,8 +355,8 @@ dcp::compress_j2k (shared_ptr<OpenJPEGImage> xyz, int bandwidth, int frames_per_
 	int const max_comp_size = max_cs_len / 1.25;
 
 	/* get a J2K compressor handle */
-	opj_cinfo_t* cinfo = opj_create_compress (CODEC_J2K);
-	if (cinfo == 0) {
+	opj_codec_t* encoder = opj_create_compress (OPJ_CODEC_J2K);
+	if (encoder == 0) {
 		throw MiscError ("could not create JPEG2000 encoder");
 	}
 
@@ -280,7 +365,7 @@ dcp::compress_j2k (shared_ptr<OpenJPEGImage> xyz, int bandwidth, int frames_per_
 	opj_set_default_encoder_parameters (&parameters);
 
 	/* Set default cinema parameters */
-	parameters.tile_size_on = false;
+	parameters.tile_size_on = OPJ_FALSE;
 	parameters.cp_tdx = 1;
 	parameters.cp_tdy = 1;
 
@@ -300,7 +385,7 @@ dcp::compress_j2k (shared_ptr<OpenJPEGImage> xyz, int bandwidth, int frames_per_
 	parameters.csty |= 0x01;
 
 	/* The progression order shall be CPRL */
-	parameters.prog_order = CPRL;
+	parameters.prog_order = OPJ_CPRL;
 
 	/* No ROI */
 	parameters.roi_compno = -1;
@@ -314,7 +399,7 @@ dcp::compress_j2k (shared_ptr<OpenJPEGImage> xyz, int bandwidth, int frames_per_
 	parameters.tcp_rates[0] = 0;
 	parameters.tcp_numlayers++;
 	parameters.cp_disto_alloc = 1;
-	parameters.cp_rsiz = fourk ? CINEMA4K : CINEMA2K;
+	parameters.cp_rsiz = fourk ? OPJ_CINEMA4K : OPJ_CINEMA2K;
 	if (fourk) {
 		parameters.numpocs = 2;
 		parameters.POC[0].tile = 1;
@@ -323,18 +408,18 @@ dcp::compress_j2k (shared_ptr<OpenJPEGImage> xyz, int bandwidth, int frames_per_
 		parameters.POC[0].layno1 = 1;
 		parameters.POC[0].resno1 = parameters.numresolution - 1;
 		parameters.POC[0].compno1 = 3;
-		parameters.POC[0].prg1 = CPRL;
+		parameters.POC[0].prg1 = OPJ_CPRL;
 		parameters.POC[1].tile = 1;
 		parameters.POC[1].resno0 = parameters.numresolution - 1;
 		parameters.POC[1].compno0 = 0;
 		parameters.POC[1].layno1 = 1;
 		parameters.POC[1].resno1 = parameters.numresolution;
 		parameters.POC[1].compno1 = 3;
-		parameters.POC[1].prg1 = CPRL;
+		parameters.POC[1].prg1 = OPJ_CPRL;
 	}
 
 	parameters.cp_comment = strdup ("libdcp");
-	parameters.cp_cinema = fourk ? CINEMA4K_24 : CINEMA2K_24;
+	parameters.cp_cinema = fourk ? OPJ_CINEMA4K_24 : OPJ_CINEMA2K_24;
 
 	/* 3 components, so use MCT */
 	parameters.tcp_mct = 1;
@@ -343,30 +428,37 @@ dcp::compress_j2k (shared_ptr<OpenJPEGImage> xyz, int bandwidth, int frames_per_
 	parameters.max_comp_size = max_comp_size;
 	parameters.tcp_rates[0] = ((float) (3 * xyz->size().width * xyz->size().height * 12)) / (max_cs_len * 8);
 
-	/* Set event manager to null (openjpeg 1.3 bug) */
-	cinfo->event_mgr = 0;
-
 	/* Setup the encoder parameters using the current image and user parameters */
-	opj_setup_encoder (cinfo, &parameters, xyz->opj_image ());
+	opj_setup_encoder (encoder, &parameters, xyz->opj_image());
 
-	opj_cio_t* cio = opj_cio_open ((opj_common_ptr) cinfo, 0, 0);
-	if (cio == 0) {
-		opj_destroy_compress (cinfo);
-		throw MiscError ("could not open JPEG2000 stream");
+	opj_stream_t* stream = opj_stream_default_create (OPJ_FALSE);
+	if (!stream) {
+		throw MiscError ("could not create JPEG2000 stream");
 	}
 
-	int const r = opj_encode (cinfo, cio, xyz->opj_image(), 0);
-	if (r == 0) {
-		opj_cio_close (cio);
-		opj_destroy_compress (cinfo);
+	opj_stream_set_write_function (stream, write_function);
+	WriteBuffer* buffer = new WriteBuffer ();
+	opj_stream_set_user_data (stream, buffer, write_free_function);
+
+	if (!opj_start_compress (encoder, xyz->opj_image(), stream)) {
+		throw MiscError ("could not start JPEG2000 encoding");
+	}
+
+	if (!opj_encode (encoder, stream)) {
+		opj_destroy_codec (encoder);
+		opj_stream_destroy (stream);
 		throw MiscError ("JPEG2000 encoding failed");
 	}
 
-	Data enc (cio->buffer, cio_tell (cio));
+	if (!opj_end_compress (encoder, stream)) {
+		throw MiscError ("could not end JPEG2000 encoding");
+	}
+
+	Data enc (buffer->data ());
 
-	opj_cio_close (cio);
 	free (parameters.cp_comment);
-	opj_destroy_compress (cinfo);
+	opj_destroy_codec (encoder);
+	opj_stream_destroy (stream);
 
 	return enc;
 }
diff --git a/src/util.h b/src/util.h
index 8802c81d..d75ba795 100644
--- a/src/util.h
+++ b/src/util.h
@@ -56,7 +56,7 @@ extern ContentKind content_kind_from_string (std::string kind);
 extern bool empty_or_white_space (std::string s);
 extern boost::shared_ptr<OpenJPEGImage> decompress_j2k (uint8_t* data, int64_t size, int reduce);
 extern boost::shared_ptr<OpenJPEGImage> decompress_j2k (Data data, int reduce);
-extern Data compress_j2k (boost::shared_ptr<OpenJPEGImage>, int bandwith, int frames_per_second, bool threed, bool fourk);
+extern Data compress_j2k (boost::shared_ptr<const OpenJPEGImage>, int bandwith, int frames_per_second, bool threed, bool fourk);
 extern bool ids_equal (std::string a, std::string b);
 
 extern void init ();