decoder: add option to set RLE for TGA file write

also accessible as an option int gpujpegtool

GPUJPEG 0.27.2

Author: MartinPulec

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10.0 FATAL_ERROR)
 # change version also in configure.ac
-project(gpujpeg VERSION 0.27.1 LANGUAGES C CUDA)
+project(gpujpeg VERSION 0.27.2 LANGUAGES C CUDA)
 
 # options
 set(BUILD_OPENGL OFF CACHE STRING "Build with OpenGL support, options are: AUTO ON OFF")

NEWS.md

@@ -1,3 +1,10 @@
+2025-05-19 - 0.27.2
+----------
+
+- gpujpegtool: add -H/--fullhelp for addtional opts
+- added gpujpeg_endoder_set_option with GPUJPEG_ENCODER_OPT_TGA_RLE
+- added gpujpegtool option -O for the options
+
 2025-05-14 - 0.27.1
 ----------
 

configure.ac

@@ -1,6 +1,6 @@
 AC_PREREQ([2.65])
 # change version also in CMakeLists.txt
-AC_INIT([libgpujpeg],[0.27.1],[https://github.com/CESNET/GPUJPEG/issues],[libgpujpeg],[https://github.com/CESNET/GPUJPEG])
+AC_INIT([libgpujpeg],[0.27.2],[https://github.com/CESNET/GPUJPEG/issues],[libgpujpeg],[https://github.com/CESNET/GPUJPEG])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_AUX_DIR([.])

libgpujpeg/gpujpeg_decoder.h

@@ -1,6 +1,6 @@
 /**
  * @file
- * Copyright (c) 2011-2024, CESNET
+ * Copyright (c) 2011-2025, CESNET
  * Copyright (c) 2011, Silicon Genome, LLC.
  *
  * All rights reserved.
@@ -267,6 +267,18 @@ gpujpeg_decoder_set_output_format(struct gpujpeg_decoder* decoder,
 GPUJPEG_API int
 gpujpeg_decoder_get_image_info(uint8_t *image, size_t image_size, struct gpujpeg_image_parameters *param_image, struct gpujpeg_parameters *param, int *segment_count);
 
+/// use RLE when writing TGA with gpujpeg_image_save_to_file (default is true), 0 or 1 please note that the option is
+/// global so it affects all decoder instances
+#define GPUJPEG_DECODER_OPT_TGA_RLE "dec_tga_rle"
+/**
+ * sets decoder option
+ * @retval GPUJPEG_NOERR  option was sucessfully set
+ * @retval GPUJPEG_ERROR  invalid argument passed
+ */
+GPUJPEG_API int
+gpujpeg_decoder_set_option(struct gpujpeg_decoder* decoder, const char *opt, const char* val);
+
+
 #ifdef __cplusplus
 }
 #endif

src/gpujpeg_decoder.c

@@ -39,6 +39,7 @@
 #include "gpujpeg_postprocessor.h"
 #include "gpujpeg_reader.h"
 #include "gpujpeg_util.h"
+#include "utils/image_delegate.h" //  for image_delegate_stbi_tga_set_rle
 
 /* Documented at declaration */
 void
@@ -476,6 +477,24 @@ gpujpeg_decoder_set_output_format(struct gpujpeg_decoder* decoder, enum gpujpeg_
     decoder->req_pixel_format = pixel_format;
 }
 
+GPUJPEG_API int
+gpujpeg_decoder_set_option(struct gpujpeg_decoder* decoder, const char *opt, const char* val)
+{
+    if ( decoder == NULL || opt == NULL || val == NULL ) {
+        return GPUJPEG_ERROR;
+    }
+    if ( strcmp(opt, GPUJPEG_DECODER_OPT_TGA_RLE) == 0 ) {
+        if ( val[0] != '0' && val[0] != '1' ) {
+            ERROR_MSG("Unexpeceted value %s for " GPUJPEG_DECODER_OPT_TGA_RLE "\n", val);
+            return GPUJPEG_ERROR;
+        }
+        image_delegate_stbi_tga_set_rle(val[0] == '1');
+        return GPUJPEG_NOERR;
+    }
+    ERROR_MSG("Invalid decoder option: %s!\n", opt);
+    return GPUJPEG_ERROR;
+}
+
 /* Documented at declaration */
 int
 gpujpeg_decoder_destroy(struct gpujpeg_decoder* decoder)

src/main.c

@@ -85,7 +85,8 @@ print_help(bool full)
            "   -V  --version          print GPUJPEG version\n"
            );
     if ( full ) {
-        printf("   -b, --debug            debug helpers (reset GPU for leakcheck, dump infile if not regular)\n");
+        printf("   -b, --debug            debug helpers (reset GPU for leakcheck, dump infile if not regular)\n"
+               "   -O dec_tga_rle=[0|1]   set decoder option\n");
     }
     else {
         printf("   -H, --fullhelp         print all options\n");
@@ -275,6 +276,46 @@ debug_dump_infile(const char* filename, const uint8_t* image_data, size_t image_
     }
 }
 
+enum { CODER_OPTS_COUNT = 10 };
+struct coder_opts
+{
+    char* opt;
+    char* val;
+};
+static bool
+assign_decoder_opt(struct coder_opts* opts, char *optarg)
+{
+    char *opt = optarg;
+    char *delim = strchr(optarg, '=');
+    if ( delim == NULL ) {
+        fprintf(stderr, "No value for %s!\n", optarg);
+        return false;
+    }
+    *delim = '\0';
+    char *val = delim + 1;
+    for ( int i = 0; i < CODER_OPTS_COUNT; ++i ) {
+        if ( opts[i].opt == NULL ) {
+            opts[i].opt = opt;
+            opts[i].val = val;
+            return true;
+        }
+    }
+    fprintf(stderr, "Too much optiosn!\n");
+    return false;
+}
+static bool
+set_decoder_opts(struct gpujpeg_decoder* decoder, const struct coder_opts* opts)
+{
+    while ( (*opts).opt != NULL ) {
+        if ( gpujpeg_decoder_set_option(decoder, (*opts).opt, (*opts).val) != 0 ) {
+            return false;
+        }
+        opts++;
+    }
+
+    return true;
+}
+
 #ifndef GIT_REV
 #define GIT_REV "unknown"
 #endif
@@ -308,6 +349,7 @@ main(int argc, char *argv[])
     int iterate = 1;
     _Bool use_opengl = 0;
     bool debug = false;
+    struct coder_opts decoder_options[CODER_OPTS_COUNT + 1] = {0};
 
     // Flags
     struct options opts = {.subsampling = GPUJPEG_SUBSAMPLING_UNKNOWN,
@@ -351,7 +393,7 @@ main(int argc, char *argv[])
     int ch = '\0';
     int optindex = 0;
     char* pos = 0;
-    while ( (ch = getopt_long(argc, argv, "CD:HI:LNRS::Vabc:edf:ghin:oq:r:s:v", longopts, &optindex)) != -1 ) {
+    while ( (ch = getopt_long(argc, argv, "CD:HI:LNO:RS::Vabc:edf:ghin:oq:r:s:v", longopts, &optindex)) != -1 ) {
         switch (ch) {
         case 'a':
             opts.keep_alpha = true;
@@ -465,6 +507,11 @@ main(int argc, char *argv[])
         case 'b':
             debug = true;
             break;
+        case 'O':
+            if ( !assign_decoder_opt(decoder_options, optarg) ) {
+                return 1;
+            }
+            break;
         case '?':
             return -1;
         default:
@@ -684,7 +731,7 @@ main(int argc, char *argv[])
 
         // Create decoder
         struct gpujpeg_decoder* decoder = gpujpeg_decoder_create(NULL);
-        if ( decoder == NULL ) {
+        if ( decoder == NULL || !set_decoder_opts(decoder, decoder_options) ) {
             fprintf(stderr, "Failed to create decoder!\n");
             return -1;
         }

src/utils/image_delegate.c

@@ -456,6 +456,13 @@ tst_image_probe_delegate(const char* filename, enum gpujpeg_image_file_format fo
     return tst_image_parse_filename(filename, param_image, &unused);
 }
 
+// for stbi_save_delegate
+void
+image_delegate_stbi_tga_set_rle(bool enabled)
+{
+    stbi_write_tga_with_rle = enabled;
+}
+
 static int
 stbi_save_delegate(const char* filename, const struct gpujpeg_image_parameters* param_image, const char* data)
 {

src/utils/image_delegate.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020, CESNET z.s.p.o
+ * Copyright (c) 2020-2025, CESNET
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -70,6 +70,9 @@ image_load_delegate_t gpujpeg_get_image_load_delegate(enum gpujpeg_image_file_fo
 image_probe_delegate_t gpujpeg_get_image_probe_delegate(enum gpujpeg_image_file_format format);
 image_save_delegate_t gpujpeg_get_image_save_delegate(enum gpujpeg_image_file_format format);
 
+void
+image_delegate_stbi_tga_set_rle(bool enabled);
+
 #ifdef __cplusplus
 } // extern "C"
 #endif // defined __cplusplus