gpujpeg_decoder: metadata ptr in result struct

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.9 LANGUAGES C CUDA)
+project(gpujpeg VERSION 0.27.10 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-10-22 - 0.27.10
+----------
+
+- provide orientation metadata by decoder
+- SPIFF: read/write the orientation
+- Exif: remove custom tag storing API
+
 2025-10-20 - 0.27.9
 ----------
 

configure.ac

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

@@ -79,6 +79,8 @@ struct gpujpeg_decoder_output
 
     /// OpenGL texture
     struct gpujpeg_opengl_texture* texture;
+
+    const struct gpujpeg_image_metadata *metadata;
 };
 
 /**

src/gpujpeg_decoder.c

@@ -463,6 +463,7 @@ gpujpeg_decoder_decode(struct gpujpeg_decoder* decoder, uint8_t* image, size_t i
                output->param_image.height, gpujpeg_pixel_format_get_name(output->param_image.pixel_format),
                gpujpeg_color_space_get_name(output->param_image.color_space));
     }
+    output->metadata = &decoder->metadata;
 
     return 0;
 }

src/gpujpeg_decoder_internal.h

@@ -69,6 +69,9 @@ struct gpujpeg_decoder
     enum gpujpeg_color_space req_color_space;
     bool ff_cs_itu601_is_709; ///< if FFmpeg specific COM marker "CS=ITU601" present, interpret the data as
                               ///< limited-range BT.709 not BT.601
+
+    /// metadata associated with last decoded image
+    struct gpujpeg_image_metadata metadata;
 };
 
 #endif // GPUJPEG_DECODER_INTERNAL_H

src/gpujpeg_reader.c

@@ -94,7 +94,7 @@ struct gpujpeg_reader
     enum gpujpeg_color_space header_color_space;
     enum gpujpeg_header_type header_type;
     bool in_spiff;
-    struct gpujpeg_image_metadata metadata;
+    struct gpujpeg_image_metadata *metadata;
     const char *comment;
 };
 
@@ -326,7 +326,7 @@ gpujpeg_reader_read_app1(uint8_t** image, struct gpujpeg_reader *reader)
     if ( strcmp((char *) type_tag, "Exif") == 0 ) {
         reader->header_color_space = GPUJPEG_YCBCR_BT601_256LVLS;
         reader->header_type = GPUJPEG_HEADER_EXIF;
-        gpujpeg_exif_parse(image, reader->image_end, reader->param.verbose, &reader->metadata);
+        gpujpeg_exif_parse(image, reader->image_end, reader->param.verbose, reader->metadata);
         return;
     }
     WARN_MSG("Skipping unsupported APP1 marker \"%s\"!\n", type_tag);
@@ -474,9 +474,9 @@ gpujpeg_reader_read_spiff_directory(uint8_t** image, struct gpujpeg_reader *read
     if ( tag == SPIFF_ENTRY_TAG_ORIENATAION ) {
         int rotation = gpujpeg_reader_read_byte(*image);
         bool flip = gpujpeg_reader_read_byte(*image);
-        reader->metadata.vals[GPUJPEG_METADATA_ORIENTATION].orient.rotation = rotation;
-        reader->metadata.vals[GPUJPEG_METADATA_ORIENTATION].orient.flip = flip;
-        reader->metadata.vals[GPUJPEG_METADATA_ORIENTATION].set = 1;
+        reader->metadata->vals[GPUJPEG_METADATA_ORIENTATION].orient.rotation = rotation;
+        reader->metadata->vals[GPUJPEG_METADATA_ORIENTATION].orient.flip = flip;
+        reader->metadata->vals[GPUJPEG_METADATA_ORIENTATION].set = 1;
         DEBUG_MSG(reader->param.verbose, "SPIFF CW rotation: %d deg%s\n", rotation * 90, flip ? ", mirrored" : "");
         *image += 2; // 2 bytes reserved
         return 0;
@@ -1551,10 +1551,14 @@ gpujpeg_reader_read_image(struct gpujpeg_decoder* decoder, uint8_t* image, size_
         .param_image = decoder->coder.param_image,
         .image_end = image + image_size,
         .ff_cs_itu601_is_709 = decoder->ff_cs_itu601_is_709,
+        .metadata = &decoder->metadata,
     };
     reader.param.restart_interval = 0;
     reader.param_image.pixel_format = decoder->req_pixel_format;
     reader.param_image.color_space = decoder->req_color_space;
+    for (unsigned i = 0; i < GPUJPEG_METADATA_COUNT; ++i) {
+        decoder->metadata.vals[i].set = false;
+    }
 
     // Check first SOI marker
     int marker_soi = gpujpeg_reader_read_marker(&image, reader.image_end, decoder->coder.param.verbose);
@@ -1653,14 +1657,6 @@ gpujpeg_reader_read_image(struct gpujpeg_decoder* decoder, uint8_t* image, size_
         return -1;
     }
 
-    if ( reader.metadata.vals[GPUJPEG_METADATA_ORIENTATION].set ) {
-        if ( reader.metadata.vals[GPUJPEG_METADATA_ORIENTATION].orient.rotation != 0 ||
-             reader.metadata.vals[GPUJPEG_METADATA_ORIENTATION].orient.flip != 0 ) {
-            WARN_MSG("Orientation %s not handled!\n",
-                     gpujpeg_orientation_get_name(reader.metadata.vals[GPUJPEG_METADATA_ORIENTATION].orient));
-        }
-    }
-
     return 0;
 }
 
@@ -1678,6 +1674,7 @@ gpujpeg_reader_get_image_info(uint8_t *image, size_t image_size, struct gpujpeg_
         .param.verbose = verbose,
         .param_image.pixel_format = GPUJPEG_PIXFMT_AUTODETECT,
         .image_end = image + image_size,
+        .metadata = &info->metadata,
     };
 
     // Check first SOI marker
@@ -1793,7 +1790,6 @@ gpujpeg_reader_get_image_info(uint8_t *image, size_t image_size, struct gpujpeg_
     info->segment_count = segments;
     info->header_type = reader.header_type;
     info->comment = reader.comment;
-    info->metadata = reader.metadata;
 
     return 0;
 }