Fix leak of parallel runner && use libjxl default thread count

Author: dreampiggy

Example/SDWebImageJPEGXLCoder/SDViewController.m

@@ -11,6 +11,12 @@
 #import <SDWebImage/SDWebImage.h>
 #import <libjxl/jxl/encode.h>
 
+static void WriteTempJXLFile(NSData *data, NSString *filename) {
+    NSString *tempOutputPath = [NSTemporaryDirectory() stringByAppendingPathComponent:filename];
+    [data writeToFile:tempOutputPath atomically:YES];
+    NSLog(@"Written encoded JXL to : %@", tempOutputPath);
+}
+
 @interface SDViewController ()
 @property (nonatomic, strong) UIImageView *imageView1;
 @property (nonatomic, strong) UIImageView *imageView2;
@@ -48,10 +54,7 @@ - (void)viewDidLoad {
             NSData *jxlData = [SDImageJPEGXLCoder.sharedCoder encodedDataWithImage:image format:SDImageFormatJPEGXL options:@{SDImageCoderEncodeMaxFileSize : @(maxFileSize)}];
             if (jxlData) {
                 NSLog(@"Static JPEG-XL encode success, bytes: %lu", (unsigned long)jxlData.length);
-                dispatch_async(dispatch_get_main_queue(), ^{
-                    UIImage *animatedImage = [UIImage sd_imageWithData:jxlData];
-                    self.imageView2.image = animatedImage;
-                });
+                WriteTempJXLFile(jxlData, imageURL.lastPathComponent);
             }
         });
     }];
@@ -66,6 +69,7 @@ - (void)viewDidLoad {
             }];
             if (jxlData) {
                 NSLog(@"Animated JPEG-XL encode success, bytes: %lu", (unsigned long)jxlData.length);
+                WriteTempJXLFile(jxlData, imageURL.lastPathComponent);
             }
         });
     }];
@@ -92,19 +96,17 @@ - (void)testHDREncoding {
 - (void)encodeJXLWithImage:(UIImage *)image {
     NSCParameterAssert(image);
     NSDictionary *frameSetting = @{
-        @(JXL_ENC_FRAME_SETTING_EFFORT) : @(10),
-        @(JXL_ENC_FRAME_SETTING_BROTLI_EFFORT) : @(11)
+        @(JXL_ENC_FRAME_SETTING_EFFORT) : @(7),
+//        @(JXL_ENC_FRAME_SETTING_BROTLI_EFFORT) : @(11)
     };
     // fastest encoding speed but largest compressed size, you can adjust options here
     NSData *data = [SDImageJPEGXLCoder.sharedCoder encodedDataWithImage:image format:SDImageFormatJPEGXL options:@{
 //        SDImageCoderEncodeCompressionQuality : @0.68,
-        SDImageCoderEncodeJXLDistance : @(3.0),
+        SDImageCoderEncodeJXLDistance : @(1.0),
         SDImageCoderEncodeJXLFrameSetting : frameSetting,
     }];
     NSCParameterAssert(data);
-    NSString *tempOutputPath = [NSTemporaryDirectory() stringByAppendingPathComponent:@"iso-hdr-demo.jxl"];
-    [data writeToFile:tempOutputPath atomically:YES];
-    NSLog(@"Written encoded JXL to : %@", tempOutputPath);
+    WriteTempJXLFile(data, @"iso-hdr-demo.jxl");
 
     CIImage *ciimage = [CIImage imageWithData:data];
     NSString *desc = [ciimage description];

SDWebImageJPEGXLCoder/Classes/SDImageJPEGXLCoder.m

@@ -29,23 +29,6 @@
 }
 #endif
 
-// Should moved to SDWebImage Core
-#include <sys/sysctl.h>
-static int computeHostNumLogicalCores(void) {
-  uint32_t count;
-  size_t len = sizeof(count);
-  sysctlbyname("hw.logicalcpu", &count, &len, NULL, 0);
-  if (count < 1) {
-    int nm[2];
-    nm[0] = CTL_HW;
-    nm[1] = HW_AVAILCPU;
-    sysctl(nm, 2, &count, &len, NULL, 0);
-    if (count < 1)
-      return -1;
-  }
-  return count;
-}
-
 static void FreeImageData(void *info, const void *data, size_t size) {
     free((void *)data);
 }
@@ -386,6 +369,11 @@ - (NSData *)encodedDataWithFrames:(NSArray<SDImageFrame *> *)frames loopCount:(N
         }
         distance = JxlEncoderDistanceFromQuality(compressionQuality * 100.0);
     }
+    // calculate multithread count
+    size_t threadCount = [options[SDImageCoderEncodeJXLThreadCount] unsignedIntValue];
+    if (threadCount == 0) {
+        threadCount = JxlThreadParallelRunnerDefaultNumWorkerThreads();
+    }
 
     NSMutableData *output = [NSMutableData data];
     BOOL success = NO;
@@ -402,9 +390,14 @@ - (NSData *)encodedDataWithFrames:(NSArray<SDImageFrame *> *)frames loopCount:(N
     }
     JxlEncoderFrameSettings* frame_settings = JxlEncoderFrameSettingsCreate(enc, NULL);
     // setup basic info for whole encoding
-    JxlEncoderStatus jret = SetupEncoderForPrimaryImage(enc, frame_settings, imageRef, orientation, distance, hasAnimation, loopCount, options);
+    void* runner = NULL;
+    if (threadCount > 1) {
+        runner = JxlThreadParallelRunnerCreate(NULL, threadCount);
+    }
+    JxlEncoderStatus jret = SetupEncoderForPrimaryImage(enc, frame_settings, runner, imageRef, orientation, distance, hasAnimation, loopCount, options);
     if (jret != JXL_ENC_SUCCESS) {
         JxlEncoderDestroy(enc);
+        JxlThreadParallelRunnerDestroy(runner);
         return nil;
     }
 
@@ -413,6 +406,7 @@ - (NSData *)encodedDataWithFrames:(NSArray<SDImageFrame *> *)frames loopCount:(N
         success = [self sd_encodeFrameWithEnc:enc frameSettings:frame_settings frame:imageRef orientation:orientation duration:0 options:options output:output];
         if (!success) {
             JxlEncoderDestroy(enc);
+            JxlThreadParallelRunnerDestroy(runner);
             return nil;
         }
         // finish input and ready for output
@@ -430,6 +424,7 @@ - (NSData *)encodedDataWithFrames:(NSArray<SDImageFrame *> *)frames loopCount:(N
             // earily break
             if (!success) {
                 JxlEncoderDestroy(enc);
+                JxlThreadParallelRunnerDestroy(runner);
                 return nil;
             }
             // last frame
@@ -448,6 +443,7 @@ - (NSData *)encodedDataWithFrames:(NSArray<SDImageFrame *> *)frames loopCount:(N
     // destroying the decoder also frees JxlEncoderFrameSettings
 //    free(frame_settings);
     JxlEncoderDestroy(enc);
+    JxlThreadParallelRunnerDestroy(runner);
 
     if (jret != JXL_ENC_SUCCESS) {
         return nil;
@@ -456,7 +452,7 @@ - (NSData *)encodedDataWithFrames:(NSArray<SDImageFrame *> *)frames loopCount:(N
 }
 
 // see: https://github.com/libjxl/libjxl/blob/main/lib/jxl/roundtrip_test.cc#L165
-JxlEncoderStatus EncodeWithEncoder(JxlEncoder* enc, NSMutableData *compressed) {
+static JxlEncoderStatus EncodeWithEncoder(JxlEncoder* enc, NSMutableData *compressed) {
     // increase output buffer by 64 bytes once a time
     [compressed increaseLengthBy:64];
     uint8_t* next_out = compressed.mutableBytes;
@@ -482,7 +478,7 @@ JxlEncoderStatus EncodeWithEncoder(JxlEncoder* enc, NSMutableData *compressed) {
     return JXL_ENC_SUCCESS;
 }
 
-JxlEncoderStatus SetupEncoderForPrimaryImage(JxlEncoder *enc, JxlEncoderFrameSettings *frame_settings, CGImageRef imageRef, CGImagePropertyOrientation orientation, float distance, BOOL hasAnimation, NSUInteger loopCount, NSDictionary *options) {
+static JxlEncoderStatus SetupEncoderForPrimaryImage(JxlEncoder *enc, JxlEncoderFrameSettings *frame_settings, void* runner, CGImageRef imageRef, CGImagePropertyOrientation orientation, float distance, BOOL hasAnimation, NSUInteger loopCount, NSDictionary *options) {
     // bitmap info from CGImage
     size_t width = CGImageGetWidth(imageRef);
     size_t height = CGImageGetHeight(imageRef);
@@ -625,13 +621,7 @@ JxlEncoderStatus SetupEncoderForPrimaryImage(JxlEncoder *enc, JxlEncoderFrameSet
         return jret;
     }
 
-    /* This needs to be set each time the encoder is reset */
-    size_t threadCount = [options[SDImageCoderEncodeJXLThreadCount] unsignedIntValue];
-    if (threadCount == 0) {
-        threadCount = computeHostNumLogicalCores();
-    }
-    if (threadCount > 1) {
-        void* runner = JxlThreadParallelRunnerCreate(NULL, threadCount);
+    if (runner) {
         jret = JxlEncoderSetParallelRunner(enc, JxlThreadParallelRunner, runner);
     }