Fix erroneous reports of unresolved assets when checking OV/VF pairs.

[libdcp.git] / src / j2k.cc

diff --git a/src/j2k.cc b/src/j2k.cc
index 4c29abfc5e49662d9d116e5efd07739eb43c419a..f1e4c3f5ebbddf5710ee14968e54e2032f7e8ede 100644 (file)
--- a/src/j2k.cc
+++ b/src/j2k.cc
@@ -90,6 +90,12 @@ read_free_function (void* data)
        delete reinterpret_cast<ReadBuffer*>(data);
 }
 
+static void
+error_callback (char const * msg, void *)
+{
+       throw MiscError (msg);
+}
+
 /** Decompress a JPEG2000 image to a bitmap.
  *  @param data JPEG2000 data.
  *  @param size Size of data in bytes.
@@ -102,6 +108,8 @@ read_free_function (void* data)
 shared_ptr<dcp::OpenJPEGImage>
 dcp::decompress_j2k (uint8_t* data, int64_t size, int reduce)
 {
+       DCP_ASSERT (reduce >= 0);
+
        uint8_t const jp2_magic[] = {
                0x00,
                0x00,
@@ -132,6 +140,8 @@ dcp::decompress_j2k (uint8_t* data, int64_t size, int reduce)
                throw MiscError ("could not create JPEG2000 stream");
        }
 
+       opj_set_error_handler(decoder, error_callback, 00);
+
        opj_stream_set_read_function (stream, read_function);
        ReadBuffer* buffer = new ReadBuffer (data, size);
        opj_stream_set_user_data (stream, buffer, read_free_function);
@@ -251,12 +261,9 @@ seek_function (OPJ_OFF_T nb_bytes, void* data)
        return reinterpret_cast<WriteBuffer*>(data)->seek (nb_bytes);
 }
 
-static void
-error_callback (char const * msg, void *)
-{
-       throw MiscError (msg);
-}
-
+/** @xyz Picture to compress.  Parts of xyz's data WILL BE OVERWRITTEN by libopenjpeg so xyz cannot be re-used
+ *  after this call; see opj_j2k_encode where if l_reuse_data is false it will set l_tilec->data = l_img_comp->data.
+ */
 Data
 dcp::compress_j2k (shared_ptr<const OpenJPEGImage> xyz, int bandwidth, int frames_per_second, bool threed, bool fourk)
 {
@@ -271,6 +278,9 @@ dcp::compress_j2k (shared_ptr<const OpenJPEGImage> xyz, int bandwidth, int frame
        /* Set encoding parameters to default values */
        opj_cparameters_t parameters;
        opj_set_default_encoder_parameters (&parameters);
+       if (fourk) {
+               parameters.numresolution = 7;
+       }
        parameters.rsiz = fourk ? OPJ_PROFILE_CINEMA_4K : OPJ_PROFILE_CINEMA_2K;
        parameters.cp_comment = strdup ("libdcp");
 
@@ -298,7 +308,12 @@ dcp::compress_j2k (shared_ptr<const OpenJPEGImage> xyz, int bandwidth, int frame
        opj_stream_set_user_data (stream, buffer, write_free_function);
 
        if (!opj_start_compress (encoder, xyz->opj_image(), stream)) {
-               throw MiscError ("could not start JPEG2000 encoding");
+               if ((errno & 0x61500) == 0x61500) {
+                       /* We've had one of the magic error codes from our patched openjpeg */
+                       throw MiscError (String::compose ("could not start JPEG2000 encoding (%1)", errno & 0xff));
+               } else {
+                       throw MiscError ("could not start JPEG2000 encoding");
+               }
        }
 
        if (!opj_encode (encoder, stream)) {
@@ -344,6 +359,9 @@ dcp::compress_j2k (shared_ptr<const OpenJPEGImage> xyz, int bandwidth, int frame
        /* 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;