Various build fixes.

8 files changed, 21 insertions, 122 deletions

diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index af4c8c3ab..aded330cd 100644
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -121,6 +121,8 @@ DCPVideo::convert_to_xyz (shared_ptr<const PlayerVideo> frame, dcp::NoteHandler
 Data
 DCPVideo::encode_locally (dcp::NoteHandler note)
 {
+	shared_ptr<dcp::OpenJPEGImage> xyz = convert_to_xyz (_frame, note);
+
 	shared_ptr<JPEG2000Encoder> encoder;
 	if (Config::instance()->encoder ()) {
 		encoder = JPEG2000Encoder::from_id (Config::instance()->encoder().get ());
diff --git a/src/lib/exceptions.cc b/src/lib/exceptions.cc
index b5de4168f..ecc8cee86 100644
--- a/src/lib/exceptions.cc
+++ b/src/lib/exceptions.cc
@@ -82,7 +82,7 @@ ProgrammingError::ProgrammingError (string file, int line)
 }
 
 JPEG2000EncoderUnavailableException::JPEG2000EncoderUnavailableException (string encoder_name, string message)
-	: StringError (String::compose (_("Encoder %1 unavailable: %2"), encoder_name, message))
+	: runtime_error (String::compose (_("Encoder %1 unavailable: %2"), encoder_name, message))
 {
 
 }
diff --git a/src/lib/jpeg2000_encoder.cc b/src/lib/jpeg2000_encoder.cc
index fe6959cd5..f0fc88cfd 100644
--- a/src/lib/jpeg2000_encoder.cc
+++ b/src/lib/jpeg2000_encoder.cc
@@ -28,6 +28,7 @@
 using std::vector;
 using std::string;
 using boost::shared_ptr;
+using dcp::Data;
 
 #define LOG_GENERAL(...) log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL);
 
diff --git a/src/lib/jpeg2000_encoder.h b/src/lib/jpeg2000_encoder.h
index 0f907e1ba..f77110b54 100644
--- a/src/lib/jpeg2000_encoder.h
+++ b/src/lib/jpeg2000_encoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2015-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,8 +21,8 @@
 #define DCPOMATIC_JPEG2000_ENCODER_H
 
 #include "types.h"
-#include "data.h"
 #include <dcp/types.h>
+#include <dcp/data.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
 #include <list>
@@ -46,7 +46,7 @@ public:
 
 	 *  @return Encoded JPEG2000 data.
 	 */
-	Data encode (
+	dcp::Data encode (
 		boost::shared_ptr<const dcp::OpenJPEGImage> input,
 		int bandwidth,
 		int frame_rate,
@@ -61,7 +61,7 @@ public:
 
 protected:
 
-	virtual Data do_encode (
+	virtual dcp::Data do_encode (
 		boost::shared_ptr<const dcp::OpenJPEGImage> input
 		) = 0;
 
diff --git a/src/lib/openjpeg_encoder.cc b/src/lib/openjpeg_encoder.cc
index 5094cf150..e8c36316c 100644
--- a/src/lib/openjpeg_encoder.cc
+++ b/src/lib/openjpeg_encoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
     Adapted from code Copyright (C) 2010-2011 Terrence Meiczinger
 
     This program is free software; you can redistribute it and/or modify
@@ -19,14 +19,16 @@
 */
 
 #include "openjpeg_encoder.h"
-#include "data.h"
 #include "exceptions.h"
+#include <dcp/data.h>
+#include <dcp/j2k.h>
 #include <dcp/openjpeg_image.h>
 
 #include "i18n.h"
 
 using std::string;
 using boost::shared_ptr;
+using dcp::Data;
 
 string
 OpenJPEGEncoder::name () const
@@ -37,113 +39,6 @@ OpenJPEGEncoder::name () const
 Data
 OpenJPEGEncoder::do_encode (shared_ptr<const dcp::OpenJPEGImage> input)
 {
-	/* Set the max image and component sizes based on frame_rate */
-	int max_cs_len = ((float) _bandwidth.get()) / 8 / _frame_rate.get();
-	if (_threed.get()) {
-		/* 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 EncodeError (N_("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 = _resolution.get() == RESOLUTION_2K ? CINEMA2K : CINEMA4K;
-	if (_resolution.get() == RESOLUTION_4K) {
-		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 (N_("DCP-o-matic"));
-	parameters.cp_cinema = _resolution.get() == RESOLUTION_2K ? CINEMA2K_24 : CINEMA4K_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 * input->size().width * input->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, input->opj_image ());
-
-	opj_cio_t* cio = opj_cio_open ((opj_common_ptr) cinfo, 0, 0);
-	if (cio == 0) {
-		opj_destroy_compress (cinfo);
-		throw EncodeError (N_("could not open JPEG2000 stream"));
-	}
-
-	int const r = opj_encode (cinfo, cio, input->opj_image(), 0);
-	if (r == 0) {
-		opj_cio_close (cio);
-		opj_destroy_compress (cinfo);
-		throw EncodeError (N_("JPEG2000 encoding failed"));
-	}
-
-	Data enc (cio->buffer, cio_tell (cio));
-
-	opj_cio_close (cio);
-	free (parameters.cp_comment);
-	opj_destroy_compress (cinfo);
-
-	return enc;
+	return dcp::compress_j2k (input, _bandwidth.get(), _frame_rate.get(), _threed.get(), _resolution.get() == RESOLUTION_4K);
 }
 
diff --git a/src/lib/openjpeg_encoder.h b/src/lib/openjpeg_encoder.h
index 0351abe4d..863628019 100644
--- a/src/lib/openjpeg_encoder.h
+++ b/src/lib/openjpeg_encoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -30,5 +30,5 @@ public:
 	}
 
 protected:
-	Data do_encode (boost::shared_ptr<const dcp::OpenJPEGImage> input);
+	dcp::Data do_encode (boost::shared_ptr<const dcp::OpenJPEGImage> input);
 };
diff --git a/src/lib/poznan_encoder.cc b/src/lib/poznan_encoder.cc
index 22da60abd..fe36ebc64 100644
--- a/src/lib/poznan_encoder.cc
+++ b/src/lib/poznan_encoder.cc
@@ -19,10 +19,10 @@
 
 #include "poznan_encoder.h"
 #include "exceptions.h"
-#include "data.h"
 #include "raw_convert.h"
-#include <poznan/tier2/markers.h>
+#include <poznan-jpeg2k-cth/tier2/markers.h>
 #include <dcp/openjpeg_image.h>
+#include <dcp/data.h>
 #include <dlfcn.h>
 #include <thrust/system/cuda/error.h>
 
@@ -31,6 +31,7 @@
 using std::string;
 using std::cout;
 using boost::shared_ptr;
+using dcp::Data;
 
 PoznanEncoder::PoznanEncoder ()
 {
diff --git a/src/lib/poznan_encoder.h b/src/lib/poznan_encoder.h
index 91413493c..6cdc5f074 100644
--- a/src/lib/poznan_encoder.h
+++ b/src/lib/poznan_encoder.h
@@ -18,8 +18,8 @@
 */
 
 #include "jpeg2000_encoder.h"
-#include <poznan/config/parameters.h>
-#include <poznan/types/image_types.h>
+#include <poznan-jpeg2k-cth/config/parameters.h>
+#include <poznan-jpeg2k-cth/types/image_types.h>
 #include <string>
 
 class PoznanEncoder : public JPEG2000Encoder
@@ -35,7 +35,7 @@ public:
 
 protected:
 
-	Data do_encode (
+	dcp::Data do_encode (
 		boost::shared_ptr<const dcp::OpenJPEGImage> input
 		);