gpujpeg_decoder_get_image_info(): fill interleaved

+ print with gpujpegtool

Author: MartinPulec

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.8.0 FATAL_ERROR)
 # change version also in configure.ac
-project(gpujpeg VERSION 0.25.5 LANGUAGES C CUDA)
+project(gpujpeg VERSION 0.25.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,8 @@
+2024-11-11 - 0.25.6
+----------
+- gpujpeg_decoder_get_image_info(): fill also interleaved (+ print
+with gpujpegtool)
+
 2024-10-08 - 0.25.5
 ----------
 - added gpujpeg_decoder_create_with_params() (+ struct

configure.ac

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

src/gpujpeg_reader.c

@@ -1535,12 +1535,12 @@ int
 gpujpeg_reader_get_image_info(uint8_t *image, size_t image_size, struct gpujpeg_image_parameters *param_image, struct gpujpeg_parameters *param, int *segment_count)
 {
     int segments = 0;
-    int interleaved = 0;
     int unused[4];
     uint8_t unused2[4];
     enum gpujpeg_color_space header_color_space = GPUJPEG_NONE;
     uint8_t *image_end = image + image_size;
 
+    param->interleaved = 0;
     param->restart_interval = 0;
 
     // Check first SOI marker
@@ -1602,7 +1602,7 @@ gpujpeg_reader_get_image_info(uint8_t *image, size_t image_size, struct gpujpeg_
                 assert(length > 3);
                 int comp_count = (int) gpujpeg_reader_read_byte(image); // comp count in the segment
                 if (comp_count > 1) {
-                    interleaved = 1;
+                    param->interleaved = 1;
                 }
                 if (segment_count == NULL) { // if not counting segments, we can skip the rest
                     eoi_presented = 1;
@@ -1675,7 +1675,8 @@ gpujpeg_reader_get_image_info(uint8_t *image, size_t image_size, struct gpujpeg_
 
         if (param->sampling_factor[1].horizontal == 1 && param->sampling_factor[1].vertical == 1
                 && param->sampling_factor[2].horizontal == 1 && param->sampling_factor[2].vertical == 1) {
-            int sum = interleaved << 16 | param->sampling_factor[0].horizontal << 8 |  param->sampling_factor[0].vertical; // NOLINT
+            int sum = param->interleaved << 16 | param->sampling_factor[0].horizontal << 8 |
+                      param->sampling_factor[0].vertical; // NOLINT
             switch (sum) {
                 case 1<<16 | 1<<8 | 1: param_image->pixel_format = GPUJPEG_444_U8_P012; break;   // NOLINT
                 case 0<<16 | 1<<8 | 1: param_image->pixel_format = GPUJPEG_444_U8_P0P1P2; break; // NOLINT

src/main.c

@@ -134,6 +134,7 @@ static int print_image_info_jpeg(const char *filename, int verbose) {
     if (gpujpeg_decoder_get_image_info(jpeg, len, &params_image, &params, &segment_count) == 0) {
         print_gpujpeg_image_parameters(params_image, false,
                                        gpujpeg_subsampling_get_name(params.comp_count, params.sampling_factor));
+        printf("interleaved: %d\n", params.interleaved);
         if ( segment_count ) {
             printf("segment count: %d (DRI = %d)\n", segment_count, params.restart_interval);
         }