cleanup

Moved the preprocessor common structs to gpujpeg_preprocessor.h and keep
in gpujpeg_preprocessor_common.cuh only utils.

The naming may not be ideal but this is to avoid including the .cuh file
with gpujpeg_common_internal.h for struct gpujpeg_postprocess definition
since gpujpeg_preprocessor_common.cuh file includes gpujpeg_common_internal.h
in turn (for subsampling utility fns).

+ small improvements if recent code (eg. indent)

Author: MartinPulec

src/gpujpeg_common_internal.h

@@ -41,7 +41,7 @@
 #include <stdlib.h>
 #include "../libgpujpeg/gpujpeg_common.h"
 #include "../libgpujpeg/gpujpeg_type.h"
-#include "gpujpeg_preprocessor_common.cuh"
+#include "gpujpeg_preprocessor.h" // struct gpujpeg_preprocessor
 #include "gpujpeg_util.h"
 
 // static_assert compat

src/gpujpeg_postprocessor.cu

@@ -33,11 +33,11 @@
  * to raw image. It also does color space transformations.
  */
 
-#define PREPROCESSOR_INTERNAL_API
-#include "gpujpeg_preprocessor_common.cuh"
+#include "gpujpeg_postprocessor.h"
 
 #include "gpujpeg_colorspace.h"
-#include "gpujpeg_postprocessor.h"
+#include "gpujpeg_preprocessor.h" // common structs
+#include "gpujpeg_preprocessor_common.cuh" // utils
 #include "gpujpeg_util.h"
 
 /**
@@ -500,7 +500,7 @@ gpujpeg_preprocessor_decoder_copy_planar_data(struct gpujpeg_coder * coder, cuda
 int
 gpujpeg_postprocessor_decode(struct gpujpeg_coder* coder, cudaStream_t stream)
 {
-    if (coder->preprocessor.kernel == nullptr) {
+    if ( coder->preprocessor.kernel == nullptr ) {
         return gpujpeg_preprocessor_decoder_copy_planar_data(coder, stream);
     }
 

src/gpujpeg_preprocessor.cu

@@ -33,11 +33,11 @@
  * computational kernels. It also does color space transformations.
  */
 
-#define PREPROCESSOR_INTERNAL_API
-#include "gpujpeg_preprocessor_common.cuh"
+#include "gpujpeg_preprocessor.h"
 
 #include "gpujpeg_colorspace.h"
-#include "gpujpeg_preprocessor.h"
+#include "gpujpeg_encoder_internal.h"
+#include "gpujpeg_preprocessor_common.cuh"
 #include "gpujpeg_util.h"
 
 /**
@@ -359,7 +359,7 @@ gpujpeg_preprocessor_encoder_init(struct gpujpeg_coder* coder)
         coder->preprocessor.kernel = (void*)gpujpeg_preprocessor_select_encode_kernel<GPUJPEG_YCBCR_BT709>(coder);
     }
 
-    if ( coder->preprocessor.kernel == NULL ) {
+    if ( coder->preprocessor.kernel == nullptr ) {
         return -1;
     }
 

src/gpujpeg_preprocessor.h

@@ -1,6 +1,6 @@
 /**
  * @file
- * Copyright (c) 2011-2021, CESNET z.s.p.o
+ * Copyright (c) 2011-2025, CESNET
  * Copyright (c) 2011, Silicon Genome, LLC.
  *
  * All rights reserved.
@@ -31,12 +31,48 @@
 #ifndef GPUJPEG_PREPROCESSOR_H
 #define GPUJPEG_PREPROCESSOR_H
 
-#include "gpujpeg_encoder_internal.h"
+#ifndef __cplusplus
+#include <stdbool.h>
+#endif
+
+#include "../libgpujpeg/gpujpeg_type.h"
+
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct gpujpeg_coder;
+struct gpujpeg_encoder;
+
+/**
+ * Preprocessor/postprocessor data for component
+ // */
+struct gpujpeg_preprocessor_data_component
+{
+    uint8_t* d_data;
+    int data_width;
+    struct gpujpeg_component_sampling_factor sampling_factor;
+};
+
+/**
+ * Preprocessor/postprocessor data
+ */
+struct gpujpeg_preprocessor_data
+{
+    struct gpujpeg_preprocessor_data_component comp[GPUJPEG_MAX_COMPONENT_COUNT];
+};
+
+/**
+ * Preprocessor/postprocessor state
+ */
+struct gpujpeg_preprocessor
+{
+    void* kernel;       // function poitner
+    bool input_flipped; // [preprocess only] input is flipped
+    struct gpujpeg_preprocessor_data data;
+};
+
 /**
  * Init preprocessor encoder
  *

src/gpujpeg_preprocessor_common.cuh

@@ -30,43 +30,15 @@
 #ifndef GPUJPEG_PREPROCESSOR_COMMON_CUH_DCC657E3_2EDF_47E2_90F4_F7CA26829E81
 #define GPUJPEG_PREPROCESSOR_COMMON_CUH_DCC657E3_2EDF_47E2_90F4_F7CA26829E81
 
+#include <cassert>
+#include <cstdint>
+
 #include "../libgpujpeg/gpujpeg_common.h"
 #include "../libgpujpeg/gpujpeg_type.h"
-
-#ifndef __cplusplus
-#include <stdbool.h>
-#endif
+#include "gpujpeg_common_internal.h"
 
 #define RGB_8BIT_THREADS 256
 
-/**
- * Preprocessor data for component
- */
-struct gpujpeg_preprocessor_data_component
-{
-    uint8_t* d_data;
-    int data_width;
-    struct gpujpeg_component_sampling_factor sampling_factor;
-};
-
-/**
- * Preprocessor data
- */
-struct gpujpeg_preprocessor_data
-{
-    struct gpujpeg_preprocessor_data_component comp[GPUJPEG_MAX_COMPONENT_COUNT];
-};
-
-struct gpujpeg_preprocessor {
-    void* kernel; // function poitner
-    bool input_flipped; // [preprocess only] input is flipped
-    struct gpujpeg_preprocessor_data data;
-};
-
-#ifdef PREPROCESSOR_INTERNAL_API
-#include "gpujpeg_common_internal.h"
-#include <cassert>
-#include <cstdint>
 /** Value that means that sampling factor has dynamic value */
 #define GPUJPEG_DYNAMIC 16
 
@@ -135,7 +107,6 @@ gpujpeg_preprocessor_make_sampling_factor_i(int comp_count, int numerator_h, int
            coder->component[1].sampling_factor.horizontal, coder->component[1].sampling_factor.vertical,               \
            coder->component[2].sampling_factor.horizontal, coder->component[2].sampling_factor.vertical,               \
            coder->component[3].sampling_factor.horizontal, coder->component[3].sampling_factor.vertical)
-#endif // defined PREPROCESSOR_INTERNAL_API
 
 #endif // defined GPUJPEG_PREPROCESSOR_COMMON_CUH_DCC657E3_2EDF_47E2_90F4_F7CA26829E81
 /* vi: set expandtab sw=4: */