Re-add support for OpenJPEG version 1.5.x.

5 files changed, 224 insertions, 10 deletions

diff --git a/cscript b/cscript
index bb88d552..dd9fa760 100644
--- a/cscript
+++ b/cscript
@@ -1,7 +1,43 @@
+#
+#    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+#
+#    This file is part of libdcp.
+#
+#    libdcp 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.
+#
+#    libdcp 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 libdcp.  If not, see <http://www.gnu.org/licenses/>.
+#
+#    In addition, as a special exception, the copyright holders give
+#    permission to link the code of portions of this program with the
+#    OpenSSL library under certain conditions as described in each
+#    individual source file, and distribute linked combinations
+#    including the two.
+#
+#    You must obey the GNU General Public License in all respects
+#    for all of the code used other than OpenSSL.  If you modify
+#    file(s) with this exception, you may extend this exception to your
+#    version of the file(s), but you are not obligated to do so.  If you
+#    do not wish to do so, delete this exception statement from your
+#    version.  If you delete this exception statement from all source
+#    files in the program, then also delete it here.
+#
+
 import os
 
 def dependencies(target):
-    return (('libcxml', 'v0.15.1'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', 'd2042ad'))
+    if target.platform == 'windows' and target.version == 'xp':
+        return (('libcxml', 'v0.15.1'), ('openjpeg2-cdist', '94bdab1'), ('asdcplib-cth', 'd2042ad'))
+    else:
+        return (('libcxml', 'v0.15.1'), ('openjpeg-cdist',  '5d8bffd'), ('asdcplib-cth', 'd2042ad'))
 
 def build(target, options):
     cmd = './waf configure --disable-examples --prefix=%s' % target.directory
@@ -13,6 +49,9 @@ def build(target, options):
             target.append_with_space('CXXFLAGS', '-std=c++11')
     elif target.platform == 'windows':
         cmd += ' --target-windows --disable-gcov'
+        if target.version == 'xp':
+            # OpenJPEG 1.x is inexplicably faster on Windows XP; see DCP-o-matic bug #771
+            cmd += ' --jpeg=oj1'
     elif target.platform == 'osx':
         cmd += ' --disable-tests'
 
diff --git a/src/j2k.cc b/src/j2k.cc
index 0b3d5e60..4c29abfc 100644
--- a/src/j2k.cc
+++ b/src/j2k.cc
@@ -53,6 +53,8 @@ dcp::decompress_j2k (Data data, int reduce)
 	return dcp::decompress_j2k (data.data().get(), data.size(), reduce);
 }
 
+#ifdef LIBDCP_OPENJPEG2
+
 class ReadBuffer
 {
 public:
@@ -154,7 +156,44 @@ dcp::decompress_j2k (uint8_t* data, int64_t size, int reduce)
 	image->y1 = rint (float(image->y1) / pow (2.0f, reduce));
 	return shared_ptr<OpenJPEGImage> (new OpenJPEGImage (image));
 }
+#endif
+
+#ifdef LIBDCP_OPENJPEG1
+/** Decompress a JPEG2000 image to a bitmap.
+ *  @param data JPEG2000 data.
+ *  @param size Size of data in bytes.
+ *  @param reduce A power of 2 by which to reduce the size of the decoded image;
+ *  e.g. 0 reduces by (2^0 == 1), ie keeping the same size.
+ *       1 reduces by (2^1 == 2), ie halving the size of the image.
+ *  This is useful for scaling 4K DCP images down to 2K.
+ *  @return XYZ image.
+ */
+shared_ptr<dcp::OpenJPEGImage>
+dcp::decompress_j2k (uint8_t* data, int64_t size, int reduce)
+{
+	opj_dinfo_t* decoder = opj_create_decompress (CODEC_J2K);
+	opj_dparameters_t parameters;
+	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);
+	opj_image_t* image = opj_decode (decoder, cio);
+	if (!image) {
+		opj_destroy_decompress (decoder);
+		opj_cio_close (cio);
+		boost::throw_exception (DCPReadError (String::compose ("could not decode JPEG2000 codestream of %1 bytes.", size)));
+	}
+
+	opj_destroy_decompress (decoder);
+	opj_cio_close (cio);
+
+	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));
+}
+#endif
 
+#ifdef LIBDCP_OPENJPEG2
 class WriteBuffer
 {
 public:
@@ -282,3 +321,120 @@ dcp::compress_j2k (shared_ptr<const OpenJPEGImage> xyz, int bandwidth, int frame
 
 	return enc;
 }
+#endif
+
+#ifdef LIBDCP_OPENJPEG1
+Data
+dcp::compress_j2k (shared_ptr<const OpenJPEGImage> xyz, int bandwidth, int frames_per_second, bool threed, bool fourk)
+{
+	/* Set the max image and component sizes based on frame_rate */
+	int max_cs_len = ((float) bandwidth) / 8 / frames_per_second;
+	if (threed) {
+		/* In 3D we have only half the normal bandwidth per eye */
+		max_cs_len /= 2;
+	}
+	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) {
+		throw MiscError ("could not create JPEG2000 encoder");
+	}
+
+	/* Set encoding parameters to default values */
+	opj_cparameters_t parameters;
+	opj_set_default_encoder_parameters (&parameters);
+
+	/* Set default cinema parameters */
+	parameters.tile_size_on = false;
+	parameters.cp_tdx = 1;
+	parameters.cp_tdy = 1;
+
+	/* Tile part */
+	parameters.tp_flag = 'C';
+	parameters.tp_on = 1;
+
+	/* Tile and Image shall be at (0,0) */
+	parameters.cp_tx0 = 0;
+	parameters.cp_ty0 = 0;
+	parameters.image_offset_x0 = 0;
+	parameters.image_offset_y0 = 0;
+
+	/* Codeblock size = 32x32 */
+	parameters.cblockw_init = 32;
+	parameters.cblockh_init = 32;
+	parameters.csty |= 0x01;
+
+	/* The progression order shall be CPRL */
+	parameters.prog_order = CPRL;
+
+	/* No ROI */
+	parameters.roi_compno = -1;
+
+	parameters.subsampling_dx = 1;
+	parameters.subsampling_dy = 1;
+
+	/* 9-7 transform */
+	parameters.irreversible = 1;
+
+	parameters.tcp_rates[0] = 0;
+	parameters.tcp_numlayers++;
+	parameters.cp_disto_alloc = 1;
+	parameters.cp_rsiz = fourk ? CINEMA4K : CINEMA2K;
+	if (fourk) {
+		parameters.numpocs = 2;
+		parameters.POC[0].tile = 1;
+		parameters.POC[0].resno0 = 0;
+		parameters.POC[0].compno0 = 0;
+		parameters.POC[0].layno1 = 1;
+		parameters.POC[0].resno1 = parameters.numresolution - 1;
+		parameters.POC[0].compno1 = 3;
+		parameters.POC[0].prg1 = 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.cp_comment = strdup ("libdcp");
+	parameters.cp_cinema = fourk ? CINEMA4K_24 : CINEMA2K_24;
+
+	/* 3 components, so use MCT */
+	parameters.tcp_mct = 1;
+
+	/* set max image */
+	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_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");
+	}
+
+	int const r = opj_encode (cinfo, cio, xyz->opj_image(), 0);
+	if (r == 0) {
+		opj_cio_close (cio);
+		opj_destroy_compress (cinfo);
+		throw MiscError ("JPEG2000 encoding failed");
+	}
+
+	Data enc (cio->buffer, cio_tell (cio));
+
+	opj_cio_close (cio);
+	free (parameters.cp_comment);
+	opj_destroy_compress (cinfo);
+
+	return enc;
+}
+
+#endif
diff --git a/src/j2k.h b/src/j2k.h
index dd5f9122..4f802a5a 100644
--- a/src/j2k.h
+++ b/src/j2k.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
diff --git a/src/openjpeg_image.cc b/src/openjpeg_image.cc
index e25c592a..32d1da3f 100644
--- a/src/openjpeg_image.cc
+++ b/src/openjpeg_image.cc
@@ -42,6 +42,10 @@
 
 using namespace dcp;
 
+#ifdef LIBDCP_OPENJPEG1
+#define OPJ_CLRSPC_SRGB CLRSPC_SRGB
+#endif
+
 /** Construct an OpenJPEGImage, taking ownership of the opj_image_t */
 OpenJPEGImage::OpenJPEGImage (opj_image_t* image)
 	: _opj_image (image)
diff --git a/wscript b/wscript
index f274c495..f06b5a51 100644
--- a/wscript
+++ b/wscript
@@ -50,6 +50,7 @@ def options(opt):
     opt.add_option('--disable-gcov', action='store_true', default=False, help='don''t use gcov in tests')
     opt.add_option('--disable-examples', action='store_true', default=False, help='disable building of examples')
     opt.add_option('--enable-openmp', action='store_true', default=False, help='enable use of OpenMP')
+    opt.add_option('--jpeg', default='oj2', help='specify JPEG library to build with: oj1 or oj2 for OpenJPEG 1.5.x or OpenJPEG 2.1.x respectively')
 
 def configure(conf):
     conf.load('compiler_cxx')
@@ -82,6 +83,13 @@ def configure(conf):
         conf.env.append_value('CXXFLAGS', ['-fopenmp', '-DLIBDCP_OPENMP'])
         conf.env.LIB_OPENMP = ['gomp']
 
+    if conf.options.jpeg == 'oj1':
+        conf.env.append_value('CXXFLAGS', ['-DLIBDCP_OPENJPEG1'])
+    elif conf.options.jpeg == 'oj2':
+        conf.env.append_value('CXXFLAGS', ['-DLIBDCP_OPENJPEG2'])
+    else:
+        Logs.error('Invalid --jpeg value %s' % conf.options.jpeg)
+
     conf.check_cfg(package='openssl', args='--cflags --libs', uselib_store='OPENSSL', mandatory=True)
     conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='LIBXML++', mandatory=True)
     conf.check_cfg(package='xmlsec1', args='--cflags --libs', uselib_store='XMLSEC1', mandatory=True)
@@ -95,23 +103,30 @@ def configure(conf):
         image = conf.check_cfg(package='ImageMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False)
         graphics = conf.check_cfg(package='GraphicsMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False)
         if image is None and graphics is None:
-            Logs.pprint('RED', 'Neither ImageMagick++ nor GraphicsMagick++ found: one or the other is required')
+            Logs.error('Neither ImageMagick++ nor GraphicsMagick++ found: one or the other is required')
 
     conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=False)
 
     if conf.options.static:
-        conf.check_cfg(package='libopenjp2', args='--cflags', atleast_version='2.1.0', uselib_store='OPENJPEG', mandatory=True)
-        conf.env.STLIB_OPENJPEG = ['openjp2']
-        conf.env.HAVE_CXML = 1
-        conf.env.LIB_CXML = ['xml++-2.6', 'glibmm-2.4']
-        conf.env.STLIB_CXML = ['cxml']
+        if conf.options.jpeg == 'oj2':
+            conf.check_cfg(package='libopenjp2', args='--cflags', atleast_version='2.1.0', uselib_store='OPENJPEG', mandatory=True)
+            conf.env.STLIB_OPENJPEG = ['openjp2']
+        elif conf.options.jpeg == 'oj1':
+            conf.check_cfg(package='libopenjpeg1', args='--cflags', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True)
+            conf.env.STLIB_OPENJPEG = ['openjpeg']
         conf.check_cfg(package='libasdcp-cth', atleast_version='0.0.1', args='--cflags', uselib_store='ASDCPLIB_CTH', mandatory=True)
         conf.env.HAVE_ASDCPLIB_CTH = 1
         conf.env.STLIB_ASDCPLIB_CTH = ['asdcp-cth', 'kumu-cth']
+        conf.env.HAVE_CXML = 1
+        conf.env.LIB_CXML = ['xml++-2.6', 'glibmm-2.4']
+        conf.env.STLIB_CXML = ['cxml']
     else:
-        conf.check_cfg(package='libopenjp2', args='--cflags --libs', atleast_version='2.1.0', uselib_store='OPENJPEG', mandatory=True)
-        conf.check_cfg(package='libcxml', atleast_version='0.15.1', args='--cflags --libs', uselib_store='CXML', mandatory=True)
+        if conf.options.jpeg == 'oj2':
+            conf.check_cfg(package='libopenjp2', args='--cflags --libs', atleast_version='2.1.0', uselib_store='OPENJPEG', mandatory=True)
+        elif conf.options.jpeg == 'oj1':
+            conf.check_cfg(package='libopenjpeg1', args='--cflags --libs', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True)
         conf.check_cfg(package='libasdcp-cth', atleast_version='0.1.0', args='--cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True)
+        conf.check_cfg(package='libcxml', atleast_version='0.15.1', args='--cflags --libs', uselib_store='CXML', mandatory=True)
 
     if conf.options.target_windows:
         boost_lib_suffix = '-mt'