Remove support for building with OpenJPEG 1.x.

4 files changed, 4 insertions, 195 deletions

diff --git a/cscript b/cscript
index b459ac0c..5750c937 100644
--- a/cscript
+++ b/cscript
@@ -34,14 +34,8 @@
 import os
 import shutil
 
-option_defaults = { 'jpeg': 'oj2' }
-
 def dependencies(target, options):
-    libcxml = ('libcxml', 'v0.17.4')
-    if options['jpeg'] == 'oj1':
-        return (libcxml, ('openjpeg', 'f166257'), ('asdcplib', '825e47522e3ae179a7820b2665c9de299b34494b'))
-    else:
-        return (libcxml, ('openjpeg', 'a1403c2'), ('asdcplib', '825e47522e3ae179a7820b2665c9de299b34494b'))
+    return (('libcxml', 'v0.17.4'), ('openjpeg', 'a1403c2'), ('asdcplib', '825e47522e3ae179a7820b2665c9de299b34494b'))
 
 def build(target, options):
     cmd = './waf configure --disable-examples --disable-benchmarks --prefix=%s' % target.directory
@@ -53,9 +47,6 @@ def build(target, options):
             cmd += ' --disable-tests'
     elif target.platform == 'windows':
         cmd += f' --target-windows-{target.bits}'
-        if target.version == 'xp':
-            # OpenJPEG 1.x is inexplicably faster on Windows XP; see DCP-o-matic bug #771
-            cmd += ' --jpeg=oj1'
 
     if target.debug:
         cmd += ' --enable-debug'
diff --git a/src/j2k_transcode.cc b/src/j2k_transcode.cc
index 0374d81b..2cc903c7 100644
--- a/src/j2k_transcode.cc
+++ b/src/j2k_transcode.cc
@@ -70,8 +70,6 @@ dcp::decompress_j2k (shared_ptr<const Data> data, int reduce)
 }
 
 
-#ifdef LIBDCP_OPENJPEG2
-
 class ReadBuffer
 {
 public:
@@ -186,38 +184,6 @@ dcp::decompress_j2k (uint8_t const * data, int64_t size, int reduce)
 	return std::make_shared<OpenJPEGImage>(image);
 }
 
-#endif
-
-
-#ifdef LIBDCP_OPENJPEG1
-
-shared_ptr<dcp::OpenJPEGImage>
-dcp::decompress_j2k (uint8_t* data, int64_t size, int reduce)
-{
-	auto 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);
-	auto cio = opj_cio_open ((opj_common_ptr) decoder, data, size);
-	auto image = opj_decode (decoder, cio);
-	if (!image) {
-		opj_destroy_decompress (decoder);
-		opj_cio_close (cio);
-		boost::throw_exception (ReadError (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 std::make_shared<OpenJPEGImage>(image);
-}
-#endif
-
-
-#ifdef LIBDCP_OPENJPEG2
 
 class WriteBuffer
 {
@@ -367,125 +333,3 @@ dcp::compress_j2k (shared_ptr<const OpenJPEGImage> xyz, int bandwidth, int frame
 	return enc;
 }
 
-#endif
-
-
-#ifdef LIBDCP_OPENJPEG1
-
-ArrayData
-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 */
-	auto cinfo = opj_create_compress (CODEC_J2K);
-	if (cinfo == nullptr) {
-		throw MiscError ("could not create JPEG2000 encoder");
-	}
-
-	/* Set encoding parameters to default values */
-	opj_cparameters_t parameters;
-	opj_set_default_encoder_parameters (&parameters);
-	if (fourk) {
-		parameters.numresolution = 7;
-	}
-
-	/* 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());
-
-	auto cio = opj_cio_open ((opj_common_ptr) cinfo, 0, 0);
-	if (cio == nullptr) {
-		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");
-	}
-
-	ArrayData 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/openjpeg_image.cc b/src/openjpeg_image.cc
index 6cfd312b..c963d2bb 100644
--- a/src/openjpeg_image.cc
+++ b/src/openjpeg_image.cc
@@ -46,11 +46,6 @@
 using namespace dcp;
 
 
-#ifdef LIBDCP_OPENJPEG1
-#define OPJ_CLRSPC_SRGB CLRSPC_SRGB
-#endif
-
-
 OpenJPEGImage::OpenJPEGImage (opj_image_t* image)
 	: _opj_image (image)
 {
@@ -58,12 +53,6 @@ OpenJPEGImage::OpenJPEGImage (opj_image_t* image)
 }
 
 
-#ifdef LIBDCP_OPENJPEG1
-typedef int32_t OPJ_INT32;
-typedef uint8_t OPJ_BYTE;
-#endif
-
-
 OpenJPEGImage::OpenJPEGImage (OpenJPEGImage const & other)
 {
 	_opj_image = reinterpret_cast<opj_image_t*>(malloc(sizeof(opj_image_t)));
diff --git a/wscript b/wscript
index acb2a93e..4c2d20c1 100644
--- a/wscript
+++ b/wscript
@@ -62,7 +62,6 @@ def options(opt):
     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('--openmp', default='gomp', help='specify OpenMP Library to use: omp, gomp (default), iomp')
-    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')
@@ -112,13 +111,6 @@ def configure(conf):
     if conf.env.TARGET_LINUX:
         conf.check(lib='dl', uselib_store='DL', msg='Checking for library dl')
 
-    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)
@@ -138,12 +130,8 @@ def configure(conf):
     conf.check_cfg(package='sndfile', args='--cflags --libs', uselib_store='SNDFILE', mandatory=False)
 
     if conf.options.static:
-        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='libopenjp2', args='--cflags', atleast_version='2.1.0', uselib_store='OPENJPEG', mandatory=True)
+        conf.env.STLIB_OPENJPEG = ['openjp2']
         conf.check_cfg(package='libasdcp-carl', atleast_version='0.1.3', args='--cflags', uselib_store='ASDCPLIB_CTH', mandatory=True)
         conf.env.HAVE_ASDCPLIB_CTH = 1
         conf.env.STLIB_ASDCPLIB_CTH = ['asdcp-carl', 'kumu-carl']
@@ -153,10 +141,7 @@ def configure(conf):
         conf.check_cfg(package='xerces-c', args='--cflags', uselib_store='XERCES', mandatory=True)
         conf.env.LIB_XERCES = ['xerces-c', 'icuuc', 'curl']
     else:
-        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='libopenjp2', args='--cflags --libs', atleast_version='2.1.0', uselib_store='OPENJPEG', mandatory=True)
         conf.check_cfg(package='libasdcp-carl', atleast_version='0.1.3', args='--cflags --libs', uselib_store='ASDCPLIB_CTH', mandatory=True)
         conf.check_cfg(package='libcxml', atleast_version='0.17.0', args='--cflags --libs', uselib_store='CXML', mandatory=True)
         conf.check_cfg(package='xerces-c', args='--cflags --libs', uselib_store='XERCES', mandatory=True)