Throw a better error on bad content kind.

[libdcp.git] / src / openjpeg_image.cc

diff --git a/src/openjpeg_image.cc b/src/openjpeg_image.cc
index 401b6aa171d3d422ff9ed80a2304140ddbbb3240..318895662ce4d5bf5bb94f59d8e07b4783d24038 100644 (file)
--- a/src/openjpeg_image.cc
+++ b/src/openjpeg_image.cc
@@ -53,6 +53,11 @@ 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)));
@@ -79,6 +84,32 @@ OpenJPEGImage::OpenJPEGImage (OpenJPEGImage const & other)
  *  @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];
 
@@ -136,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
 {