encoder: enforce hdr type via opt API

deprecate gpujpeg_encoder_set_jpeg_header() in favor of the opt API

As a consequence, gpujpegtool accepts `-O enc_hdr=Adobe` (specifying
the header type explicitly was not possible until now).

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.5 LANGUAGES C CUDA)
+project(gpujpeg VERSION 0.27.6 LANGUAGES C CUDA)
 
 # options
 set(BUILD_OPENGL OFF CACHE STRING "Build with OpenGL support, options are: AUTO ON OFF")

NEWS.md

@@ -1,3 +1,9 @@
+2025-07-08 - 0.27.6
+----------
+
+- deprecate gpujpeg_encoder_set_jpeg_header() in favor of opt API
+- as the consequence, gpujpegtool is able to pass that opt (`-O enc_hdr=Adobe`)
+
 2025-06-10 - 0.27.5
 ----------
 

configure.ac

@@ -1,6 +1,6 @@
 AC_PREREQ([2.65])
 # change version also in CMakeLists.txt
-AC_INIT([libgpujpeg],[0.27.5],[https://github.com/CESNET/GPUJPEG/issues],[libgpujpeg],[https://github.com/CESNET/GPUJPEG])
+AC_INIT([libgpujpeg],[0.27.6],[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_encoder.h

@@ -188,6 +188,7 @@ gpujpeg_encoder_encode(struct gpujpeg_encoder* encoder, const struct gpujpeg_par
 GPUJPEG_DEPRECATED GPUJPEG_API int
 gpujpeg_encoder_get_stats(struct gpujpeg_encoder *encoder, struct gpujpeg_duration_stats *stats);
 
+/// do not use, use gpujpeg_encoder_set_option() with @ref GPUJPEG_ENC_OPT_HDR and @ref enc_hdr_types instead
 enum gpujpeg_header_type {
         GPUJPEG_HEADER_DEFAULT = 0, ///< for 1 or 3 channel @ref GPUJPEG_YCBCR_JPEG @ref GPUJPEG_HEADER_JFIF, for @ref
                                     ///< GPUJPEG_RGB @ref GPUJPEG_HEADER_ADOBE, @ref GPUJPEG_HEADER_SPIFF otherwise
@@ -201,8 +202,10 @@ enum gpujpeg_header_type {
  *
  * Header type should be capable of describing the resulting JPEG, eg. JFIF only for BT.601
  * full-scale YCbCr images. If not, resulting JPEG image may be incompatible with decoders.
+ *
+ * @deprecated use gpujpeg_encoder_set_option() with @ref GPUJPEG_ENC_OPT_HDR
  */
-GPUJPEG_API void
+GPUJPEG_DEPRECATED GPUJPEG_API void
 gpujpeg_encoder_set_jpeg_header(struct gpujpeg_encoder *encoder, enum gpujpeg_header_type header_type);
 
 /**
@@ -220,6 +223,14 @@ gpujpeg_encoder_suggest_restart_interval(const struct gpujpeg_image_parameters*
 #define GPUJPEG_ENC_OUT_VAL_PAGEABLE "enc_out_val_pageable"  ///< default
 #define GPUJPEG_ENC_OUT_VAL_PINNED   "enc_out_val_pinned"
 
+#define GPUJPEG_ENC_OPT_HDR          "enc_hdr"
+/// @defgroup enc_hdr_types
+/// @{
+#define GPUJPEG_ENC_HDR_VAL_JFIF     "JFIF"
+#define GPUJPEG_ENC_HDR_VAL_ADOBE    "Adobe"
+#define GPUJPEG_ENC_HDR_VAL_SPIFF    "SPIFF"
+/// @}
+
 /**
  * sets encoder option
  * @retval GPUJPEG_NOERR  option was sucessfully set

src/gpujpeg_encoder.c

@@ -31,6 +31,12 @@
 #include <assert.h>
 #include <math.h>
 #include <string.h>
+
+#ifdef _WIN32
+#include <windows.h>
+#define strcasecmp _stricmp
+#endif
+
 #include "../libgpujpeg/gpujpeg_common.h"
 #include "../libgpujpeg/gpujpeg_encoder.h"
 #include "gpujpeg_common_internal.h"
@@ -669,6 +675,19 @@ gpujpeg_encoder_set_option(struct gpujpeg_encoder* encoder, const char *opt, con
         encoder->writer->buffer_pinned = strcmp(val, GPUJPEG_VAL_TRUE) == 0;
         return GPUJPEG_NOERR;
     }
+    if ( strcmp(opt, GPUJPEG_ENC_OPT_HDR) == 0 ) {
+        if (strcasecmp(val, GPUJPEG_ENC_HDR_VAL_JFIF) == 0) {
+            encoder->header_type = GPUJPEG_HEADER_JFIF;
+        } else if (strcasecmp(val, GPUJPEG_ENC_HDR_VAL_ADOBE) == 0) {
+            encoder->header_type = GPUJPEG_HEADER_ADOBE;
+        } else if (strcasecmp(val, GPUJPEG_ENC_HDR_VAL_SPIFF) == 0) {
+            encoder->header_type = GPUJPEG_HEADER_SPIFF;
+        } else {
+            ERROR_MSG("Unknown encoder header type: %s\n", val);
+            return GPUJPEG_ERROR;
+        }
+        return GPUJPEG_NOERR;
+    }
     ERROR_MSG("Invalid encoder option: %s!\n", opt);
     return GPUJPEG_ERROR;
 }