added GPUJPEG_LL_STATUS for stats

replaces original perf_stats=1+verbose=1

+ renumbered GPUJPEG_LL_VERBOSE and above

Author: MartinPulec

libgpujpeg/gpujpeg_common.h

@@ -158,9 +158,10 @@ enum restart_int {
 enum verbosity {
     GPUJPEG_LL_QUIET = -1,  ///< suppress informative messages (but not warnings and errors)
     GPUJPEG_LL_INFO = 0,    ///< normal verbosity
-    GPUJPEG_LL_VERBOSE = 1, ///< print additional information
-    GPUJPEG_LL_DEBUG = 2,   ///< print more information, including internal ones
-    GPUJPEG_LL_DEBUG2 = 3,  ///< print maximum of information, including JPEG file internal structure
+    GPUJPEG_LL_STATUS = 1,  ///< print summary (image size, duration)
+    GPUJPEG_LL_VERBOSE = 2, ///< print additional information
+    GPUJPEG_LL_DEBUG = 3,   ///< print more information, including internal ones
+    GPUJPEG_LL_DEBUG2 = 4,  ///< print maximum of information, including JPEG file internal structure
 };
 
 /**

src/gpujpeg_common.c

@@ -2099,7 +2099,7 @@ coder_process_stats(struct gpujpeg_coder* coder)
     coder->aggregate_duration += duration_ms;
     coder->frames += 1;
 
-    if ( coder->param.verbose <= GPUJPEG_LL_QUIET ) {
+    if ( coder->param.verbose < GPUJPEG_LL_STATUS ) {
         return;
     }
 

src/gpujpeg_decoder.c

@@ -186,7 +186,7 @@ gpujpeg_decoder_init(struct gpujpeg_decoder* decoder, const struct gpujpeg_param
     struct gpujpeg_coder* coder = &decoder->coder;
 
     coder->param.verbose = param->verbose;
-    coder->param.perf_stats = param->perf_stats;
+    coder->param.perf_stats = param->perf_stats || param->verbose >= GPUJPEG_LL_STATUS;
     if (param_image->width * param_image->height * param->comp_count == 0) {
         return 0;
     }

src/gpujpeg_encoder.c

@@ -356,10 +356,11 @@ gpujpeg_encoder_encode(struct gpujpeg_encoder* encoder, const struct gpujpeg_par
     struct gpujpeg_coder* coder = &encoder->coder;
     int rc;
 
-    coder->start_time = param->perf_stats ? gpujpeg_get_time() : 0;
-
     const bool img_changed = !gpujpeg_image_parameters_equals(&coder->param_image, param_image);
     struct gpujpeg_parameters param_adjusted = adjust_params(coder, param, param_image, img_changed);
+    param_adjusted.perf_stats = param->perf_stats || param->verbose >= GPUJPEG_LL_STATUS;
+
+    coder->start_time = param_adjusted.perf_stats ? gpujpeg_get_time() : 0;
 
     // (Re)initialize encoder
     if (coder->param.quality != param->quality) {
@@ -389,7 +390,7 @@ gpujpeg_encoder_encode(struct gpujpeg_encoder* encoder, const struct gpujpeg_par
             return -1;
         }
     }
-    coder->init_end_time = param->perf_stats ? gpujpeg_get_time() : 0;
+    coder->init_end_time = param_adjusted.perf_stats ? gpujpeg_get_time() : 0;
 
     // Load input image
     if ( input->type == GPUJPEG_ENCODER_INPUT_IMAGE ) {

src/main.c

@@ -237,7 +237,7 @@ main(int argc, char *argv[])
     // Default coder parameters
     struct gpujpeg_parameters param;
     gpujpeg_set_default_parameters(&param);
-    param.perf_stats = 1;
+    param.verbose = GPUJPEG_LL_STATUS;
 
     // Default image parameters
     struct gpujpeg_image_parameters param_image;