Add lossy HTJ2K

Signed-off-by: Pierre-Anthony Lemieux <pal@palemieux.com>

Author: palemieux

cmake/OpenEXRSetup.cmake

@@ -432,18 +432,11 @@ if(TARGET Imath AND TARGET ImathConfig)
                      "${_openexr_imath_cfg_compat}/Imath/ImathConfig.h" COPYONLY)
     endif()
 
-    # Add the build interface include directory, but only do it once;
-    # if the cache key exists, it's already been added by a previous
-    # configuration run.
-    set(_openexr_imath_inc_patch_key "${Imath_SOURCE_DIR}|${Imath_BINARY_DIR}")
-    if(NOT OPENEXR_IMATH_SUBDIR_INCLUDE_PATCH STREQUAL _openexr_imath_inc_patch_key)
-      target_include_directories(Imath INTERFACE
-        "$<BUILD_INTERFACE:${Imath_SOURCE_DIR}/src>")
-      if(EXISTS "${_openexr_imath_gen_cfg}")
-        target_include_directories(ImathConfig INTERFACE
-          "$<BUILD_INTERFACE:${_openexr_imath_cfg_compat}>")
-      endif()
-      set(OPENEXR_IMATH_SUBDIR_INCLUDE_PATCH "${_openexr_imath_inc_patch_key}" CACHE INTERNAL "")
+    target_include_directories(Imath INTERFACE
+      "$<BUILD_INTERFACE:${Imath_SOURCE_DIR}/src>")
+    if(EXISTS "${_openexr_imath_gen_cfg}")
+      target_include_directories(ImathConfig INTERFACE
+        "$<BUILD_INTERFACE:${_openexr_imath_cfg_compat}>")
     endif()
   endif()
 endif()

src/bin/exrmetrics/exrmetrics.cpp

@@ -1022,6 +1022,10 @@ exrmetrics (
                     outHeaders[p].zipCompressionLevel () = level;
                     compressionSet                       = true;
                     break;
+                case HTJ2KL256_COMPRESSION:
+                    outHeaders[p].lossyHTJ2KQuality () = level;
+                    compressionSet                       = true;
+                    break;
                     //            case ZSTD_COMPRESSION :
                     //                outHeader.zstdCompressionLevel()=level;
                     //                break;
@@ -1061,7 +1065,7 @@ exrmetrics (
     if (!isinf (level) && level >= -1 && !compressionSet)
     {
         throw runtime_error (
-            "-l option only works for DWAA/DWAB,ZIP/ZIPS or ZSTD compression");
+            "-l option only works for DWAA/DWAB, HTJ2KL256,ZIP/ZIPS or ZSTD compression");
     }
 
     vector<partData> parts (part == -1 ? in.parts () : 1);

src/bin/exrmetrics/main.cpp

@@ -64,7 +64,7 @@ usageMessage (ostream& stream, const char* program_name, bool verbose = false)
                "  -t n                        Use a pool of n worker threads for processing files.\n"
                "                              Default is single threaded (no thread pool)\n"
                "\n"
-               "  -l level                    set DWA or ZIP compression level\n"
+               "  -l level                    set compression level for DWA, ZIP and lossy HTJ2K\n"
                "\n"
                "  -z,--compression list       list of compression methods to test\n"
                "                              ("

src/lib/OpenEXR/ImfCRgbaFile.h

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

src/lib/OpenEXR/ImfCompression.cpp

@@ -178,16 +178,22 @@ static const CompressionDesc IdToDesc[] = {
         false),
     CompressionDesc (
         "htj2k256",
-        "High-Throughput JPEG 2000 (256 lines)",
+        "High-Throughput JPEG 2000, lossless (256 lines)",
         256,
         false,
         false),
     CompressionDesc (
         "htj2k32",
-        "High-Throughput JPEG 2000 (32 lines)",
+        "High-Throughput JPEG 2000, lossless (32 lines)",
         32,
         false,
         false),
+    CompressionDesc (
+        "htj2kl256",
+        "High-Throughput JPEG 2000, lossy (256 lines)",
+        256,
+        true,
+        false),
 };
 // clang-format on
 
@@ -206,6 +212,7 @@ static const std::map<std::string, Compression> CompressionNameToId = {
     {"dwab", Compression::DWAB_COMPRESSION},
     {"htj2k256", Compression::HTJ2K256_COMPRESSION},
     {"htj2k32", Compression::HTJ2K32_COMPRESSION},
+    {"htj2kl256", Compression::HTJ2KL256_COMPRESSION},
 };
 
 #define UNKNOWN_COMPRESSION_ID_MSG "INVALID COMPRESSION ID"

src/lib/OpenEXR/ImfCompression.h

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

src/lib/OpenEXR/ImfCompressor.cpp

@@ -54,6 +54,7 @@ Compressor::Compressor (
 
     exr_set_zip_compression_level (_ctxt, 0, hdr.zipCompressionLevel ());
     exr_set_dwa_compression_level (_ctxt, 0, hdr.dwaCompressionLevel ());
+    exr_set_lossy_htj2k_quality (_ctxt, 0, hdr.lossyHTJ2KQuality ());
 
     exr_compression_t hdrcomp;
     if (EXR_ERR_SUCCESS != exr_get_compression (_ctxt, 0, &hdrcomp))
@@ -337,6 +338,7 @@ newCompressor (Compression c, size_t maxScanLineSize, const Header& hdr)
             break;
 
         case HTJ2K256_COMPRESSION:
+        case HTJ2KL256_COMPRESSION:
 
             return new HTCompressor (hdr, static_cast<int> (maxScanLineSize), 256);
 
@@ -427,6 +429,7 @@ newTileCompressor (
 
         case HTJ2K256_COMPRESSION:
         case HTJ2K32_COMPRESSION:
+        case HTJ2KL256_COMPRESSION:
 
             return new HTCompressor (
                 hdr,

src/lib/OpenEXR/ImfContextInit.h

@@ -105,6 +105,12 @@ class IMF_EXPORT_TYPE ContextInitializer
         return *this;
     }
 
+    ContextInitializer& setLossyHTJ2KQuality (float jq) noexcept
+    {
+        _initializer.lossy_htj2k_quality = jq;
+        return *this;
+    }
+
     ContextInitializer& strictHeaderValidation (bool onoff) noexcept
     {
         setFlag (EXR_CONTEXT_FLAG_STRICT_HEADER, onoff);

src/lib/OpenEXR/ImfHeader.cpp

@@ -71,9 +71,11 @@ struct CompressionRecord
     {
         exr_get_default_zip_compression_level (&zip_level);
         exr_get_default_dwa_compression_quality (&dwa_level);
+        exr_get_default_lossy_htj2k_quality (&lossy_htj2k_quality);
     }
     int   zip_level;
     float dwa_level;
+    float lossy_htj2k_quality;
 };
 // NB: This is extra complicated than one would normally write to
 // handle scenario that seems to happen on MacOS/Windows (probably
@@ -705,6 +707,18 @@ Header::dwaCompressionLevel () const
     return retrieveCompressionRecord (this).dwa_level;
 }
 
+float&
+Header::lossyHTJ2KQuality ()
+{
+    return retrieveCompressionRecord (this).lossy_htj2k_quality;
+}
+
+float
+Header::lossyHTJ2KQuality () const
+{
+    return retrieveCompressionRecord (this).lossy_htj2k_quality;
+}
+
 void
 Header::setName (const string& name)
 {

src/lib/OpenEXR/ImfHeader.h

@@ -286,6 +286,10 @@ class IMF_EXPORT_TYPE Header
     float& dwaCompressionLevel ();
     IMF_EXPORT
     float dwaCompressionLevel () const;
+    IMF_EXPORT
+    float& lossyHTJ2KQuality ();
+    IMF_EXPORT
+    float lossyHTJ2KQuality () const;
 
     //-----------------------------------------------------
     // Access to required attributes for multipart files