X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fopenjpeg_image.cc;h=318895662ce4d5bf5bb94f59d8e07b4783d24038;hb=09d57c4e580533c959a0d0d07051f0aef9317628;hp=e25c592abbb21a42ec1728d77cdfc263d98b2774;hpb=d927e9b913606f4fc982885c7582ecaf0e3c5a1a;p=libdcp.git

diff --git a/src/openjpeg_image.cc b/src/openjpeg_image.cc
index e25c592a..31889566 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)
@@ -49,10 +53,63 @@ OpenJPEGImage::OpenJPEGImage (opj_image_t* image)
 	DCP_ASSERT (_opj_image->numcomps == 3);
 }
 
+#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)));
+	DCP_ASSERT (_opj_image);
+	memcpy (_opj_image, other._opj_image, sizeof (opj_image_t));
+
+	int const data_size = _opj_image->x1 * _opj_image->y1 * 4;
+
+	_opj_image->comps = reinterpret_cast<opj_image_comp_t*> (malloc (_opj_image->numcomps * sizeof (opj_image_comp_t)));
+	DCP_ASSERT (_opj_image->comps);
+	memcpy (_opj_image->comps, other._opj_image->comps, _opj_image->numcomps * sizeof (opj_image_comp_t));
+	for (unsigned int i = 0; i < _opj_image->numcomps; ++i) {
+		_opj_image->comps[i].data = reinterpret_cast<OPJ_INT32*> (malloc (data_size));
+		DCP_ASSERT (_opj_image->comps[i].data);
+		memcpy (_opj_image->comps[i].data, other._opj_image->comps[i].data, data_size);
+	}
+
+	_opj_image->icc_profile_buf = reinterpret_cast<OPJ_BYTE*> (malloc (_opj_image->icc_profile_len));
+	DCP_ASSERT (_opj_image->icc_profile_buf);
+	memcpy (_opj_image->icc_profile_buf, other._opj_image->icc_profile_buf, _opj_image->icc_profile_len);
+}
+
 /** Construct a new OpenJPEGImage with undefined contents.
  *  @param size Size for the frame in pixels.
  */
 OpenJPEGImage::OpenJPEGImage (Size size)
+{
+	create (size);
+}
+
+/** @param data_16 XYZ/RGB image data in packed 16:16:16, 48bpp with
+ *  the 2-byte value for each component stored as little-endian.
+ */
+OpenJPEGImage::OpenJPEGImage (uint8_t const * data_16, dcp::Size size, int stride)
+{
+	create (size);
+
+	int jn = 0;
+	for (int y = 0; y < size.height; ++y) {
+		uint16_t const * p = reinterpret_cast<uint16_t const *> (data_16 + y * stride);
+		for (int x = 0; x < size.width; ++x) {
+			/* Truncate 16-bit to 12-bit */
+			_opj_image->comps[0].data[jn] = *p++ >> 4;
+			_opj_image->comps[1].data[jn] = *p++ >> 4;
+			_opj_image->comps[2].data[jn] = *p++ >> 4;
+			++jn;
+		}
+	}
+}
+
+void
+OpenJPEGImage::create (Size size)
 {
 	opj_image_cmptparm_t cmptparm[3];
 
@@ -110,6 +167,12 @@ OpenJPEGImage::precision (int component) const
 	return _opj_image->comps[component].prec;
 }
 
+int
+OpenJPEGImage::factor (int component) const
+{
+	return _opj_image->comps[component].factor;
+}
+
 bool
 OpenJPEGImage::srgb () const
 {