HDR images + other improvements

Author: awxkee

JxlCoder.podspec

@@ -1,10 +1,10 @@
 Pod::Spec.new do |s|
     s.name             = 'JxlCoder'
-    s.version          = '1.0.3'
+    s.version          = '1.0.4'
     s.summary          = 'JXL coder for iOS and MacOS'
     s.description      = 'Provides support for JXL files in iOS and MacOS'
     s.homepage         = 'https://github.com/awxkee/jxl-coder-swift'
-    s.license          = { :type => 'BSD-3', :file => 'LICENSE' }
+    s.license          = { :type => 'CC0', :file => 'LICENSE' }
     s.author           = { 'username' => '[email protected]' }
     s.source           = { :git => 'https://github.com/awxkee/jxl-coder-swift.git', :tag => "#{s.version}" }
     s.ios.deployment_target = '11.0'

JxlNukePlugin.podspec

@@ -1,10 +1,10 @@
 Pod::Spec.new do |s|
     s.name             = 'JxlNukePlugin'
-    s.version          = '1.0.1'
+    s.version          = '1.0.4'
     s.summary          = 'JXL encoder and decoder for SDWebImage'
     s.description      = 'JXL plugin for Nuke in iOS and MacOS'
     s.homepage         = 'https://github.com/awxkee/jxl-coder-swift'
-    s.license          = { :type => 'BSD-3', :file => 'LICENSE' }
+    s.license          = { :type => 'CC0', :file => 'LICENSE' }
     s.author           = { 'username' => '[email protected]' }
     s.source           = { :git => 'https://github.com/awxkee/jxl-coder-swift.git', :tag => "#{s.version}" }
     s.ios.deployment_target = '11.0'

JxlSDWebImageCoder.podspec

@@ -1,10 +1,10 @@
 Pod::Spec.new do |s|
     s.name             = 'JxlSDWebImageCoder'
-    s.version          = '1.0.1'
+    s.version          = '1.0.4'
     s.summary          = 'JXL encoder and decoder for SDWebImage'
     s.description      = 'JXL plugin for SDWebImage in iOS and MacOS'
     s.homepage         = 'https://github.com/awxkee/jxl-coder-swift'
-    s.license          = { :type => 'BSD-3', :file => 'LICENSE' }
+    s.license          = { :type => 'CC0', :file => 'LICENSE' }
     s.author           = { 'username' => '[email protected]' }
     s.source           = { :git => 'https://github.com/awxkee/jxl-coder-swift.git', :tag => "#{s.version}" }
     s.ios.deployment_target = '11.0'

README.md

@@ -5,6 +5,8 @@ This package is provides support for JXL ( JPEG XL ) images for all apple platfo
 
 A package to decode JXL on iOS, MacOS or encode JXL images. Also provider JXL support for Nuke and SDWebImage. Have support for older versions of iOS, MacOSX and all the simulators that doesn't have support for JXL images
 
+Supported ICC Profiles and HDR images.
+
 Package based on `libjxl`
 </br>
 Main aim of the project is to use `JXL` image on all Apple platforms etc with usable speed and convenience

Sources/JxlCoder/JXLCoder.swift

@@ -28,7 +28,7 @@ public class JXLCoder {
      - Returns: If provided data is possible valid JXL image
      **/
     public static func isJXL(data: Data) throws -> Bool {
-        return startsWith(magic1, ofLength: magic1.count, in: data) || startsWith(magic2, ofLength: magic1.count, in: data)
+        return startsWith(magic1, ofLength: magic1.count, in: data) || startsWith(magic2, ofLength: magic2.count, in: data)
     }
 
     /***

Sources/jxlc/JXLCPlusCoder.mm

@@ -205,8 +205,9 @@ - (nullable JXLSystemImage *)decode:(nonnull NSInputStream *)inputStream error:(
     auto dataWrapper = new JXLDataWrapper<uint8_t>();
     std::vector<uint8_t> iccProfile;
     size_t xSize, ySize;
+    bool useFloats;
     auto decoded = DecodeJpegXlOneShot(imageData.data(), imageData.size(),
-                                       &dataWrapper->data, &xSize, &ySize, &iccProfile);
+                                       &dataWrapper->data, &xSize, &ySize, &iccProfile, &useFloats);
     if (!decoded) {
         delete dataWrapper;
         *error = [[NSError alloc] initWithDomain:@"JXLCoder" code:500 userInfo:@{ NSLocalizedDescriptionKey: @"Failed to decode JXL image" }];
@@ -226,9 +227,16 @@ - (nullable JXLSystemImage *)decode:(nonnull NSInputStream *)inputStream error:(
         colorSpace = CGColorSpaceCreateDeviceRGB();
     }
 
-    int flags = (int)kCGImageByteOrder32Big | (int)kCGImageAlphaLast;
-    CGDataProviderRef provider = CGDataProviderCreateWithData(dataWrapper, dataWrapper->data.data(),
-                                                              dataWrapper->data.size(), JXLCGData8ProviderReleaseDataCallback);
+    int flags;
+    if (useFloats) {
+        flags = (int)kCGImageByteOrder16Little | (int)kCGImageAlphaLast | (int)kCGBitmapFloatComponents;
+    } else {
+        flags = (int)kCGImageByteOrder32Big | (int)kCGImageAlphaLast;
+    }
+    CGDataProviderRef provider = CGDataProviderCreateWithData(dataWrapper,
+                                                              dataWrapper->data.data(),
+                                                              dataWrapper->data.size(),
+                                                              JXLCGData8ProviderReleaseDataCallback);
     if (!provider) {
         delete dataWrapper;
         *error = [[NSError alloc] initWithDomain:@"JXLCoder"
@@ -237,7 +245,9 @@ - (nullable JXLSystemImage *)decode:(nonnull NSInputStream *)inputStream error:(
         return NULL;
     }
 
-    CGImageRef imageRef = CGImageCreate(xSize, ySize, 8, 32, 4*xSize, colorSpace, flags, provider, NULL, false, kCGRenderingIntentDefault);
+    CGImageRef imageRef = CGImageCreate(xSize, ySize, useFloats ? 16 : 8,
+                                        useFloats ? 64 : 32, 4*xSize * (useFloats ? sizeof(uint16_t) : sizeof(uint8_t)),
+                                        colorSpace, flags, provider, NULL, false, kCGRenderingIntentDefault);
     if (!imageRef) {
         *error = [[NSError alloc] initWithDomain:@"JXLCoder"
                                             code:500

Sources/jxlc/jxl_worker.cpp

@@ -17,7 +17,8 @@
 
 bool DecodeJpegXlOneShot(const uint8_t *jxl, size_t size,
                          std::vector<uint8_t> *pixels, size_t *xsize,
-                         size_t *ysize, std::vector<uint8_t> *icc_profile) {
+                         size_t *ysize, std::vector<uint8_t> *icc_profile,
+                         bool* useFloats) {
     // Multi-threaded parallel runner.
     auto runner = JxlResizableParallelRunnerMake(nullptr);
 
@@ -36,10 +37,13 @@ bool DecodeJpegXlOneShot(const uint8_t *jxl, size_t size,
     }
 
     JxlBasicInfo info;
-    JxlPixelFormat format = {4, JXL_TYPE_UINT8, JXL_BIG_ENDIAN, 0};
+    JxlPixelFormat format = {4, JXL_TYPE_UINT8, JXL_LITTLE_ENDIAN, 0};
 
     JxlDecoderSetInput(dec.get(), jxl, size);
     JxlDecoderCloseInput(dec.get());
+    int bitDepth = 8;
+    *useFloats = false;
+    bool hdrImage = false;
 
     for (;;) {
         JxlDecoderStatus status = JxlDecoderProcessInput(dec.get());
@@ -54,6 +58,14 @@ bool DecodeJpegXlOneShot(const uint8_t *jxl, size_t size,
             }
             *xsize = info.xsize;
             *ysize = info.ysize;
+            bitDepth = info.bits_per_sample;
+            if (bitDepth > 8) {
+                *useFloats = true;
+                hdrImage = true;
+                format = { 4, JXL_TYPE_FLOAT16, JXL_LITTLE_ENDIAN, 0 };
+            } else {
+                *useFloats = false;
+            }
             JxlResizableParallelRunnerSetThreads(
                     runner.get(),
                     JxlResizableParallelRunnerSuggestThreads(info.xsize, info.ysize));
@@ -77,13 +89,15 @@ bool DecodeJpegXlOneShot(const uint8_t *jxl, size_t size,
                 JxlDecoderImageOutBufferSize(dec.get(), &format, &buffer_size)) {
                 return false;
             }
-            if (buffer_size != *xsize * *ysize * 4 * sizeof(uint8_t)) {
+            if (buffer_size != *xsize * *ysize * 4 * (hdrImage ? sizeof(uint16_t) : sizeof(uint8_t))) {
                 return false;
             }
-            pixels->resize(*xsize * *ysize * 4 * sizeof(uint8_t));
+            pixels->resize(*xsize * *ysize * 4 * (hdrImage ? sizeof(uint16_t) : sizeof(uint8_t)));
             void *pixels_buffer = (void *) pixels->data();
-            size_t pixels_buffer_size = pixels->size() * sizeof(uint8_t);
-            if (JXL_DEC_SUCCESS != JxlDecoderSetImageOutBuffer(dec.get(), &format,
+            size_t pixels_buffer_size = pixels->size() * (hdrImage ? sizeof(uint16_t) : sizeof(uint8_t));
+            
+            if (JXL_DEC_SUCCESS != JxlDecoderSetImageOutBuffer(dec.get(),
+                                                               &format,
                                                                pixels_buffer,
                                                                pixels_buffer_size)) {
                 return false;

Sources/jxlc/jxl_worker.hpp

@@ -26,7 +26,8 @@ enum jxl_compression_option {
 
 bool DecodeJpegXlOneShot(const uint8_t *jxl, size_t size,
                          std::vector<uint8_t> *pixels, size_t *xsize,
-                         size_t *ysize, std::vector<uint8_t> *icc_profile);
+                         size_t *ysize, std::vector<uint8_t> *icc_profile,
+                         bool* useFloats);
 bool DecodeBasicInfo(const uint8_t *jxl, size_t size, size_t *xsize, size_t *ysize);
 bool EncodeJxlOneshot(const std::vector<uint8_t> &pixels, const uint32_t xsize,
                       const uint32_t ysize, std::vector<uint8_t> *compressed,