Add support for 32-line HTJ2K Compressor

Signed-off-by: Pierre-Anthony Lemieux <[email protected]>

Author: palemieux

src/lib/OpenEXR/ImfCRgbaFile.h

@@ -80,8 +80,9 @@ typedef struct ImfRgba ImfRgba;
 #define IMF_B44A_COMPRESSION 7
 #define IMF_DWAA_COMPRESSION 8
 #define IMF_DWAB_COMPRESSION 9
-#define IMF_HTJ2K_COMPRESSION 10
-#define IMF_NUM_COMPRESSION_METHODS 11
+#define IMF_HTJ2K256_COMPRESSION 10
+#define IMF_HTJ2K32_COMPRESSION 11
+#define IMF_NUM_COMPRESSION_METHODS 12
 
 /*
 ** Channels; values must be the same as in Imf::RgbaChannels.

src/lib/OpenEXR/ImfCompression.cpp

@@ -177,11 +177,17 @@ static const CompressionDesc IdToDesc[] = {
         true,
         false),
     CompressionDesc (
-        "htj2k",
+        "htj2k256",
         "High-Throughput JPEG 2000 (OpenJPH, 256 lines)",
         256,
         true,
         false),
+    CompressionDesc (
+        "htj2k32",
+        "High-Throughput JPEG 2000 (OpenJPH, 32 lines)",
+        32,
+        true,
+        false),
 };
 // clang-format on
 
@@ -198,7 +204,8 @@ static const std::map<std::string, Compression> CompressionNameToId = {
     {"b44a", Compression::B44A_COMPRESSION},
     {"dwaa", Compression::DWAA_COMPRESSION},
     {"dwab", Compression::DWAB_COMPRESSION},
-    {"htj2k", Compression::HTJ2K_COMPRESSION},
+    {"htj2k256", Compression::HTJ2K256_COMPRESSION},
+    {"htj2k32", Compression::HTJ2K32_COMPRESSION},
 };
 
 #define UNKNOWN_COMPRESSION_ID_MSG "INVALID COMPRESSION ID"

src/lib/OpenEXR/ImfCompression.h

@@ -51,7 +51,9 @@ enum IMF_EXPORT_ENUM Compression
                           // wise and faster to decode full frames
                           // than DWAA_COMPRESSION.
 
-    HTJ2K_COMPRESSION = 10, // High-Throughput JPEG2000 (HTJ2K), 256 scanlines
+    HTJ2K256_COMPRESSION = 10,   // High-Throughput JPEG2000 (HTJ2K), 256 scanlines
+
+    HTJ2K32_COMPRESSION = 11,    // High-Throughput JPEG2000 (HTJ2K), 32 scanlines
 
     NUM_COMPRESSION_METHODS // number of different compression methods
 };

src/lib/OpenEXR/ImfCompressor.cpp

@@ -336,10 +336,14 @@ newCompressor (Compression c, size_t maxScanLineSize, const Header& hdr)
                 DwaCompressor::STATIC_HUFFMAN);
             break;
 
-        case HTJ2K_COMPRESSION:
+        case HTJ2K256_COMPRESSION:
 
             return new HTCompressor (hdr, static_cast<int> (maxScanLineSize), 256);
 
+        case HTJ2K32_COMPRESSION:
+
+            return new HTCompressor (hdr, static_cast<int> (maxScanLineSize), 32);
+
         default: break;
     }
     // clang-format on
@@ -421,7 +425,8 @@ newTileCompressor (
                 DwaCompressor::STATIC_HUFFMAN);
             break;
 
-        case HTJ2K_COMPRESSION:
+        case HTJ2K256_COMPRESSION:
+        case HTJ2K32_COMPRESSION:
 
             return new HTCompressor (
                 hdr,

src/lib/OpenEXRCore/compression.c

@@ -241,9 +241,10 @@ int exr_compression_lines_per_chunk (exr_compression_t comptype)
         case EXR_COMPRESSION_PIZ:
         case EXR_COMPRESSION_B44:
         case EXR_COMPRESSION_B44A:
+        case EXR_COMPRESSION_HTJ2K32:
         case EXR_COMPRESSION_DWAA: linePerChunk = 32; break;
         case EXR_COMPRESSION_DWAB: linePerChunk = 256; break;
-        case EXR_COMPRESSION_HTJ2K: linePerChunk = 256; break;
+        case EXR_COMPRESSION_HTJ2K256: linePerChunk = 256; break;
         case EXR_COMPRESSION_LAST_TYPE:
         default:
             /* ERROR CONDITION */
@@ -377,7 +378,8 @@ exr_compress_chunk (exr_encode_pipeline_t* encode)
         case EXR_COMPRESSION_B44A: rv = internal_exr_apply_b44a (encode); break;
         case EXR_COMPRESSION_DWAA: rv = internal_exr_apply_dwaa (encode); break;
         case EXR_COMPRESSION_DWAB: rv = internal_exr_apply_dwab (encode); break;
-        case EXR_COMPRESSION_HTJ2K:
+        case EXR_COMPRESSION_HTJ2K32:
+        case EXR_COMPRESSION_HTJ2K256:
             rv = internal_exr_apply_ht (encode); break;
         case EXR_COMPRESSION_LAST_TYPE:
         default:
@@ -455,7 +457,8 @@ decompress_data (
             rv = internal_exr_undo_dwab (
                 decode, packbufptr, packsz, unpackbufptr, unpacksz);
             break;
-        case EXR_COMPRESSION_HTJ2K:
+        case EXR_COMPRESSION_HTJ2K256:
+        case EXR_COMPRESSION_HTJ2K32:
             rv = internal_exr_undo_ht (
                 decode, packbufptr, packsz, unpackbufptr, unpacksz);
             break;

src/lib/OpenEXRCore/debug.c

@@ -85,7 +85,8 @@ print_attr (const exr_attribute_t* a, int verbose)
                 "b44a",
                 "dwaa",
                 "dwab",
-                "htj2k"};
+                "htj2k256",
+                "htj2k32"};
             printf (
                 "'%s'", (a->uc < EXR_COMPRESSION_LAST_TYPE ? compressionnames[a->uc] : "<UNKNOWN>"));
             if (verbose) printf (" (0x%02X)", a->uc);

src/lib/OpenEXRCore/openexr_attr.h

@@ -45,7 +45,8 @@ typedef enum
     EXR_COMPRESSION_B44A  = 7,
     EXR_COMPRESSION_DWAA  = 8,
     EXR_COMPRESSION_DWAB  = 9,
-    EXR_COMPRESSION_HTJ2K     = 10,
+    EXR_COMPRESSION_HTJ2K256  = 10,
+    EXR_COMPRESSION_HTJ2K32   = 11,
     EXR_COMPRESSION_LAST_TYPE /**< Invalid value, provided for range checking. */
 } exr_compression_t;
 

src/test/OpenEXRTest/testCompressionApi.cpp

@@ -28,11 +28,11 @@ testCompressionApi (const string& tempDir)
         cout << "Testing compression API functions." << endl;
 
         // update this if you add a new compressor.
-        string codecList = "none/rle/zips/zip/piz/pxr24/b44/b44a/dwaa/dwab/htj2k";
+        string codecList = "none/rle/zips/zip/piz/pxr24/b44/b44a/dwaa/dwab/htj2k256/htj2k32";
 
         int numMethods = static_cast<int> (NUM_COMPRESSION_METHODS);
         // update this if you add a new compressor.
-        assert (numMethods == 11);
+        assert (numMethods == 12);
 
         for (int i = 0; i < numMethods; i++)
         {

src/wrappers/python/Imath.py

@@ -94,10 +94,11 @@ class Compression(Enumerated):
     B44A_COMPRESSION = 7
     DWAA_COMPRESSION = 8
     DWAB_COMPRESSION = 9
-    HTJ2K_COMPRESSION = 10
+    HTJ2K256_COMPRESSION = 10
+    HTJ2K32_COMPRESSION = 11
     names = [
         "NO_COMPRESSION", "RLE_COMPRESSION", "ZIPS_COMPRESSION", "ZIP_COMPRESSION", "PIZ_COMPRESSION", "PXR24_COMPRESSION",
-        "B44_COMPRESSION", "B44A_COMPRESSION", "DWAA_COMPRESSION", "DWAB_COMPRESSION", "HTJ2K_COMPRESSION"
+        "B44_COMPRESSION", "B44A_COMPRESSION", "DWAA_COMPRESSION", "DWAB_COMPRESSION", "HTJ2K256_COMPRESSION", "HTJ2K32_COMPRESSION"
     ]
 
 class PixelType(Enumerated):

src/wrappers/python/PyOpenEXR.cpp

@@ -2360,7 +2360,8 @@ PYBIND11_MODULE(OpenEXR, m)
         .value("B44A_COMPRESSION", B44A_COMPRESSION)
         .value("DWAA_COMPRESSION", DWAA_COMPRESSION)
         .value("DWAB_COMPRESSION", DWAB_COMPRESSION)
-        .value("HTJ2K_COMPRESSION", HTJ2K_COMPRESSION)
+        .value("HTJ2K256_COMPRESSION", HTJ2K256_COMPRESSION)
+        .value("HTJ2K32_COMPRESSION", HTJ2K32_COMPRESSION)
         .value("NUM_COMPRESSION_METHODS", NUM_COMPRESSION_METHODS)
         .export_values();
 
@@ -2713,7 +2714,8 @@ PYBIND11_MODULE(OpenEXR, m)
                  B44A_COMPRESSION
                  DWAA_COMPRESSION
                  DWAB_COMPRESSION
-                 HTJ2K_COMPRESSION
+                 HTJ2K256_COMPRESSION
+                 HTJ2K32_COMPRESSION
              )pbdoc")
         .def_readwrite("header", &PyPart::header,
              R"pbdoc(