encoding bug fixes

Author: awxkee

.swiftpm/xcode/xcuserdata/radzivonbartoshyk.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -17,7 +17,7 @@
 		<key>JxlCoder.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>1</integer>
 		</dict>
 		<key>jxlcoder.xcscheme_^#shared#^_</key>
 		<dict>

JxlCoder.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = 'JxlCoder'
-    s.version          = '1.2.4'
+    s.version          = '1.2.5'
     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'

Sources/jxlc/JxlInternalCoder.mm

@@ -46,9 +46,12 @@ static inline float JXLGetDistance(const int quality)
 {
     if (quality == 0)
         return(1.0f);
-    if (quality >= 30)
-        return std::clamp((0.1f+(float) (100-std::min(100.0f, (float)quality))*0.09f), 0.0f, 15.0f);
-    return std::clamp((6.24f+(float) pow(2.5f,(30.0-(float)quality)/5.0)/6.25f), 0.0f, 15.0f);
+    float distance = quality >= 100 ? 0.0
+                       : quality >= 30
+                           ? 0.1 + (100 - quality) * 0.09
+                           : 53.0 / 3000.0 * quality * quality -
+                                 23.0 / 20.0 * quality + 25.0;
+    return distance;
 }
 
 @implementation JxlInternalCoder

Sources/jxlc/JxlWorker.cpp

@@ -259,8 +259,7 @@ bool EncodeJxlOneshot(const std::vector<uint8_t> &pixels, const uint32_t xsize,
     JxlEncoderInitBasicInfo(&basic_info);
     basic_info.xsize = xsize;
     basic_info.ysize = ysize;
-    basic_info.bits_per_sample = 32;
-    basic_info.exponent_bits_per_sample = 8;
+    basic_info.bits_per_sample = 8;
     basic_info.uses_original_profile = compression_option == loosy ? JXL_FALSE : JXL_TRUE;
     basic_info.num_color_channels = 3;
 
@@ -299,18 +298,19 @@ bool EncodeJxlOneshot(const std::vector<uint8_t> &pixels, const uint32_t xsize,
     JxlEncoderFrameSettings *frameSettings =
             JxlEncoderFrameSettingsCreate(enc.get(), nullptr);
 
-    if (JXL_ENC_SUCCESS !=
-        JxlEncoderAddImageFrame(frameSettings, &pixel_format,
-                                (void *) pixels.data(),
-                                sizeof(uint8_t) * pixels.size())) {
+    JxlBitDepth depth;
+    depth.bits_per_sample = 8;
+    depth.exponent_bits_per_sample = 0;
+    depth.type = JXL_BIT_DEPTH_FROM_PIXEL_FORMAT;
+    if (JXL_ENC_SUCCESS != JxlEncoderSetFrameBitDepth(frameSettings, &depth)) {
         return false;
     }
 
-    if (compression_option == loseless &&
-        JXL_ENC_SUCCESS != JxlEncoderSetFrameDistance(frameSettings, JXL_TRUE)) {
+    if (JXL_ENC_SUCCESS != JxlEncoderSetFrameLossless(frameSettings, compression_option == loseless)) {
         return false;
-    } else if (compression_option == loosy &&
-               JXL_ENC_SUCCESS !=
+    }
+
+    if (JXL_ENC_SUCCESS !=
                JxlEncoderSetFrameDistance(frameSettings, compression_distance)) {
         return false;
     }
@@ -320,6 +320,13 @@ bool EncodeJxlOneshot(const std::vector<uint8_t> &pixels, const uint32_t xsize,
         return false;
     }
 
+    if (JXL_ENC_SUCCESS !=
+        JxlEncoderAddImageFrame(frameSettings, &pixel_format,
+                                (void *) pixels.data(),
+                                sizeof(uint8_t) * pixels.size())) {
+        return false;
+    }
+
     JxlEncoderCloseInput(enc.get());
 
     compressed->resize(64);

Sources/jxlc/half.hpp

@@ -38,6 +38,7 @@
 
 // check C++11 language features
 #if defined(__clang__)										// clang
+    #pragma clang fp contract(fast) exceptions(ignore) reassociate(on)
 	#if __has_feature(cxx_static_assert) && !defined(HALF_ENABLE_CPP11_STATIC_ASSERT)
 		#define HALF_ENABLE_CPP11_STATIC_ASSERT 1
 	#endif