Feature/jxl

.travis.yml

@@ -10,6 +10,7 @@ addons:
       - giflib
       - jasper
       - jpeg-turbo
+      - jpeg-xl
       - libavif
       - libpng
       - libtiff
@@ -38,7 +39,7 @@ jobs:
       dist: jammy
       name: "Ubuntu 22.04 Jammy"
     - os: osx
-      osx_image: xcode14.1
+      osx_image: xcode14.2
       name: "macOS 12.6"
       env:
         - CMAKE_PREFIX_PATH="/usr/local/opt/jpeg-turbo;$CMAKE_PREFIX_PATH"

examples/c/sail/sail.c

@@ -88,8 +88,6 @@
 
     sail_destroy_image(image);
 
-    SAIL_LOG_INFO("\n*** Success ***\n");
-
     return SAIL_OK;
 }
 
@@ -127,31 +125,20 @@
     return SAIL_OK;
 }
 
-static sail_status_t probe_impl(const char *path) {
-
-    SAIL_CHECK_PTR(path);
-
-    /* Time counter. */
-    uint64_t start_time = sail_now();
-
-    struct sail_image *image;
-    const struct sail_codec_info *codec_info;
-
-    SAIL_TRY(sail_probe_file(path, &image, &codec_info));
+static void print_aligned_image_info(const struct sail_image *image) {
 
-    printf("File          : %s\n", path);
-    printf("Probe time    : %lu ms.\n", (unsigned long)(sail_now() - start_time));
-    printf("Codec         : %s [%s]\n", codec_info->name, codec_info->description);
-    printf("Codec version : %s\n", codec_info->version);
     printf("Size          : %ux%u\n", image->width, image->height);
+
     if (image->resolution == NULL) {
         printf("Resolution:   : -\n");
     } else {
         printf("Resolution:   : %.1fx%.1f\n", image->resolution->x, image->resolution->y);
     }
+
     printf("Pixel format  : %s\n", sail_pixel_format_to_string(image->source_image->pixel_format));
     printf("ICC profile   : %s\n", image->iccp == NULL ? "no" : "yes");
     printf("Interlaced    : %s\n", image->source_image->interlaced ? "yes" : "no");
+    printf("Delay         : %d ms.\n", image->delay);
 
     for (const struct sail_meta_data_node *meta_data_node = image->meta_data_node; meta_data_node != NULL; meta_data_node = meta_data_node->next) {
         const struct sail_meta_data *meta_data = meta_data_node->meta_data;
@@ -182,6 +169,28 @@
             case SAIL_VARIANT_TYPE_INVALID:        printf("<invalid value>\n");                                                     break;
         }
     }
+}
+
+static sail_status_t probe_impl(const char *path) {
+
+    SAIL_CHECK_PTR(path);
+
+    /* Time counter. */
+    uint64_t start_time = sail_now();
+
+    struct sail_image *image;
+    const struct sail_codec_info *codec_info;
+
+    SAIL_TRY(sail_probe_file(path, &image, &codec_info));
+
+    uint64_t elapsed_time = sail_now() - start_time;
+
+    printf("File          : %s\n", path);
+    printf("Codec         : %s [%s]\n", codec_info->name, codec_info->description);
+    printf("Codec version : %s\n", codec_info->version);
+    printf("Probe time    : %lu ms.\n", (unsigned long)elapsed_time);
+
+    print_aligned_image_info(image);
 
     sail_destroy_image(image);
 
@@ -200,6 +209,64 @@
     return SAIL_OK;
 }
 
+static sail_status_t decode_impl(const char *path) {
+
+    SAIL_CHECK_PTR(path);
+
+    struct sail_image *image;
+    const struct sail_codec_info *codec_info;
+
+    SAIL_TRY(sail_probe_file(path, &image, &codec_info));
+
+    printf("File          : %s\n", path);
+    printf("Codec         : %s [%s]\n", codec_info->name, codec_info->description);
+    printf("Codec version : %s\n", codec_info->version);
+
+    sail_destroy_image(image);
+
+    /* Time counter. */
+    uint64_t start_time = sail_now();
+
+    /* Decode. */
+    void *state;
+    SAIL_TRY(sail_start_loading_from_file(path, codec_info, &state));
+
+    sail_status_t status;
+    unsigned frame = 0;
+
+    while ((status = sail_load_next_frame(state, &image)) == SAIL_OK) {
+        printf("Frame #%u\n", frame++);
+        print_aligned_image_info(image);
+        sail_destroy_image(image);
+    }
+
+    if (status != SAIL_ERROR_NO_MORE_FRAMES) {
+        sail_stop_loading(state);
+        fprintf(stderr, "Error: Decoder error %d.\n", status);
+        SAIL_LOG_AND_RETURN(SAIL_ERROR_BROKEN_IMAGE);
+    }
+
+    SAIL_TRY(sail_stop_loading(state));
+
+    uint64_t elapsed_time = sail_now() - start_time;
+
+    printf("Decode time   : %lu ms.\n", (unsigned long)elapsed_time);
+
+    return SAIL_OK;
+}
+
+static sail_status_t decode(int argc, char *argv[]) {
+
+    if (argc != 3) {
+        print_invalid_argument();
+        SAIL_LOG_AND_RETURN(SAIL_ERROR_INVALID_ARGUMENT);
+    }
+
+    SAIL_TRY(decode_impl(argv[2]));
+
+    return SAIL_OK;
+}
+
 static sail_status_t list_impl(bool verbose) {
 
     const struct sail_codec_bundle_node *codec_bundle_node = sail_codec_bundle_list();
@@ -260,9 +327,13 @@
     fprintf(stderr, "       %s [-v | --version]\n", app);
     fprintf(stderr, "       %s [-h | --help]\n", app);
     fprintf(stderr, "Commands:\n");
-    fprintf(stderr, "    convert <INPUT PATH> <OUTPUT PATH> [-c | --compression <value>] - Convert one image format to another.\n");
     fprintf(stderr, "    list [-v] - List supported codecs.\n");
-    fprintf(stderr, "    probe <PATH> - Retrieve image information.\n");
+    fprintf(stderr, "\n");
+    fprintf(stderr, "    convert <INPUT PATH> <OUTPUT PATH> [-c | --compression <value>] - Convert one image format to another.\n");
+    fprintf(stderr, "\n");
+    fprintf(stderr, "    probe <PATH> - Retrieve information of the very first image found in the file.\n");
+    fprintf(stderr, "                   In most cases probing doesn't decode the image data.\n");
+    fprintf(stderr, "    decode <PATH> - Decode the whole file and print information of all its frames.\n");
 }
 
 int main(int argc, char *argv[]) {
@@ -291,6 +362,8 @@
         SAIL_TRY(list(argc, argv));
     } else if (strcmp(argv[1], "probe") == 0) {
         SAIL_TRY(probe(argc, argv));
+    } else if (strcmp(argv[1], "decode") == 0) {
+        SAIL_TRY(decode(argc, argv));
     } else {
         print_invalid_argument();
         SAIL_LOG_AND_RETURN(SAIL_ERROR_INVALID_ARGUMENT);

src/bindings/c++/image-c++.h

@@ -248,15 +248,17 @@ class SAIL_EXPORT image
     const sail::source_image& source_image() const;
 
     /*
-     * Returns the editable pixel data if any.
+     * Returns the editable pixel data if any. The channels are interleaved per pixel.
+     * The pixels are organized row by row, left to right, top to bottom.
      *
      * LOAD: Set by SAIL to valid pixel data.
      * SAVE: Must be set by a caller to valid pixel data.
      */
     void* pixels();
 
     /*
-     * Returns the constant pixel data if any.
+     * Returns the constant pixel data if any. The channels are interleaved per pixel.
+     * The pixels are organized row by row, left to right, top to bottom.
      *
      * LOAD: Set by SAIL to valid pixel data.
      * SAVE: Must be set by a caller to valid pixel data.

src/libsail-common/common.h

@@ -133,10 +133,12 @@ enum SailPixelFormat {
     SAIL_PIXEL_FORMAT_BPP64_ABGR,
 
     /*
-     * Float formats.
+     * 32-bit single-precision floating point formats.
      */
-    SAIL_PIXEL_FORMAT_BPP16_FLOAT,
     SAIL_PIXEL_FORMAT_BPP32_FLOAT,
+    SAIL_PIXEL_FORMAT_BPP64_FLOAT,
+    SAIL_PIXEL_FORMAT_BPP96_FLOAT,
+    SAIL_PIXEL_FORMAT_BPP128_FLOAT,
 
     /*
      * CMYK formats.

src/libsail-common/common_serialize.c

@@ -98,8 +98,10 @@ const char* sail_pixel_format_to_string(enum SailPixelFormat pixel_format) {
         case SAIL_PIXEL_FORMAT_BPP64_ARGB:            return "BPP64-ARGB";
         case SAIL_PIXEL_FORMAT_BPP64_ABGR:            return "BPP64-ABGR";
 
-        case SAIL_PIXEL_FORMAT_BPP16_FLOAT:           return "BPP16-FLOAT";
         case SAIL_PIXEL_FORMAT_BPP32_FLOAT:           return "BPP32-FLOAT";
+        case SAIL_PIXEL_FORMAT_BPP64_FLOAT:           return "BPP64-FLOAT";
+        case SAIL_PIXEL_FORMAT_BPP96_FLOAT:           return "BPP96-FLOAT";
+        case SAIL_PIXEL_FORMAT_BPP128_FLOAT:          return "BPP128-FLOAT";
 
         case SAIL_PIXEL_FORMAT_BPP32_CMYK:            return "BPP32-CMYK";
         case SAIL_PIXEL_FORMAT_BPP64_CMYK:            return "BPP64-CMYK";
@@ -208,8 +210,10 @@ enum SailPixelFormat sail_pixel_format_from_string(const char *str) {
         case UINT64_C(8244605671673531226):  return SAIL_PIXEL_FORMAT_BPP64_ARGB;
         case UINT64_C(8244605671673513818):  return SAIL_PIXEL_FORMAT_BPP64_ABGR;
 
-        case UINT64_C(13817569922789251633): return SAIL_PIXEL_FORMAT_BPP16_FLOAT;
         case UINT64_C(13817570002860265711): return SAIL_PIXEL_FORMAT_BPP32_FLOAT;
+        case UINT64_C(13817570133298530580): return SAIL_PIXEL_FORMAT_BPP64_FLOAT;
+        case UINT64_C(13817570263736795449): return SAIL_PIXEL_FORMAT_BPP96_FLOAT;
+        case UINT64_C(13257949525762847397): return SAIL_PIXEL_FORMAT_BPP128_FLOAT;
 
         case UINT64_C(8244605667720923565):  return SAIL_PIXEL_FORMAT_BPP32_CMYK;
         case UINT64_C(8244605671673598258):  return SAIL_PIXEL_FORMAT_BPP64_CMYK;

src/libsail-common/image.h

@@ -55,7 +55,8 @@ struct sail_source_image;
 struct sail_image {
 
     /*
-     * Image pixels.
+     * Image pixels. The channels are interleaved per pixel. The pixels are
+     * organized row by row, left to right, top to bottom.
      *
      * LOAD: Set by SAIL to an allocated array of pixels.
      * SAVE: Must be set by a caller to an allocated array of pixels.

src/libsail-common/utils.c

@@ -312,8 +312,10 @@ unsigned sail_bits_per_pixel(enum SailPixelFormat pixel_format) {
         case SAIL_PIXEL_FORMAT_BPP64_ARGB:
         case SAIL_PIXEL_FORMAT_BPP64_ABGR: return 64;
 
-        case SAIL_PIXEL_FORMAT_BPP16_FLOAT: return 16;
-        case SAIL_PIXEL_FORMAT_BPP32_FLOAT: return 32;
+        case SAIL_PIXEL_FORMAT_BPP32_FLOAT:  return 32;
+        case SAIL_PIXEL_FORMAT_BPP64_FLOAT:  return 64;
+        case SAIL_PIXEL_FORMAT_BPP96_FLOAT:  return 96;
+        case SAIL_PIXEL_FORMAT_BPP128_FLOAT: return 128;
 
         case SAIL_PIXEL_FORMAT_BPP32_CMYK: return 32;
         case SAIL_PIXEL_FORMAT_BPP64_CMYK: return 64;

src/sail-codecs/CMakeLists.txt

@@ -4,7 +4,7 @@ add_subdirectory(common/bmp)
 
 # List of codecs
 #
-set(CODECS avif bmp gif ico jpeg jpeg2000 pcx png psd qoi svg tga tiff wal webp xbm)
+set(CODECS avif bmp gif ico jpeg jpeg2000 jpegxl pcx png psd qoi svg tga tiff wal webp xbm)
 
 list(SORT CODECS)
 

src/sail-codecs/jpegxl/CMakeLists.txt

@@ -0,0 +1,28 @@
+find_library(JPEGXL_LIBRARY jxl                 ${SAIL_CODEC_JPEGXL_REQUIRED_OPTION})
+find_library(JPEGXL_THREADS_LIBRARY jxl_threads ${SAIL_CODEC_JPEGXL_REQUIRED_OPTION})
+find_path(JPEGXL_INCLUDE_DIRS jxl/decode.h      ${SAIL_CODEC_JPEGXL_REQUIRED_OPTION})
+
+if (NOT JPEGXL_LIBRARY OR NOT JPEGXL_THREADS_LIBRARY OR NOT JPEGXL_INCLUDE_DIRS)
+    return()
+endif()
+
+# This will add the following CMake rules to the CMake config for static builds so a client
+# application links against the required dependencies:
+#
+# find_library(jxl_RELEASE_LIBRARY NAMES jxl)
+# find_library(jxl_DEBUG_LIBRARY NAMES jxl)
+# set_property(TARGET SAIL::sail-codecs APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<$<CONFIG:Release>:${jxl_RELEASE_LIBRARY}> $<$<CONFIG:Debug>:${jxl_DEBUG_LIBRARY}>)
+# find_library(jxl_threads_RELEASE_LIBRARY NAMES jxl_threads)
+# find_library(jxl_threads_DEBUG_LIBRARY NAMES jxl_threads)
+# set_property(TARGET SAIL::sail-codecs APPEND PROPERTY INTERFACE_LINK_LIBRARIES $<$<CONFIG:Release>:${jxl_threads_RELEASE_LIBRARY}> $<$<CONFIG:Debug>:${jxl_threads_DEBUG_LIBRARY}>)
+#
+set(SAIL_CODECS_FIND_DEPENDENCIES ${SAIL_CODECS_FIND_DEPENDENCIES} "find_library,jxl,jxl" PARENT_SCOPE)
+set(SAIL_CODECS_FIND_DEPENDENCIES ${SAIL_CODECS_FIND_DEPENDENCIES} "find_library,jxl_threads,jxl_threads" PARENT_SCOPE)
+
+# Common codec configuration
+#
+sail_codec(NAME jpegxl
+            SOURCES helpers.h helpers.c jpegxl.c memory.h memory.c
+            ICON jpegxl.png
+            DEPENDENCY_INCLUDE_DIRS ${JPEGXL_INCLUDE_DIRS}
+            DEPENDENCY_LIBS ${JPEGXL_LIBRARY} ${JPEGXL_THREADS_LIBRARY})