gpujpegtool: inline help for opts

Author: MartinPulec

libgpujpeg/gpujpeg_decoder.h

@@ -277,7 +277,8 @@ gpujpeg_decoder_get_image_info(uint8_t *image, size_t image_size, struct gpujpeg
  */
 GPUJPEG_API int
 gpujpeg_decoder_set_option(struct gpujpeg_decoder* decoder, const char *opt, const char* val);
-
+GPUJPEG_API void
+gpujpeg_decoder_print_options();
 
 #ifdef __cplusplus
 }

libgpujpeg/gpujpeg_encoder.h

@@ -254,6 +254,8 @@ gpujpeg_encoder_suggest_restart_interval(const struct gpujpeg_image_parameters*
  */
 GPUJPEG_API int
 gpujpeg_encoder_set_option(struct gpujpeg_encoder* encoder, const char* opt, const char* val);
+GPUJPEG_API void
+gpujpeg_encoder_print_options();
 
 /**
  * Destory JPEG encoder

src/gpujpeg_decoder.c

@@ -497,6 +497,13 @@ gpujpeg_decoder_set_option(struct gpujpeg_decoder* decoder, const char *opt, con
     return GPUJPEG_ERROR;
 }
 
+GPUJPEG_API void
+gpujpeg_decoder_print_options()
+{
+    printf("\t" GPUJPEG_DEC_OPT_TGA_RLE_BOOL "=[" GPUJPEG_VAL_FALSE "|" GPUJPEG_VAL_TRUE
+           "] - set decoder option (not) to output RLE TGA\n");
+}
+
 /* Documented at declaration */
 int
 gpujpeg_decoder_destroy(struct gpujpeg_decoder* decoder)

src/gpujpeg_encoder.c

@@ -746,6 +746,17 @@ gpujpeg_encoder_set_option(struct gpujpeg_encoder* encoder, const char *opt, con
     ERROR_MSG("Invalid encoder option: %s!\n", opt);
     return GPUJPEG_ERROR;
 }
+GPUJPEG_API void
+gpujpeg_encoder_print_options() {
+    printf("\t" GPUJPEG_ENC_OPT_OUT "=[" GPUJPEG_ENC_OUT_VAL_PAGEABLE "|" GPUJPEG_ENC_OUT_VAL_PINNED
+           "] - compressed data buffer allocation property\n");
+    printf("\t" GPUJPEG_ENC_OPT_HDR "=[" GPUJPEG_ENC_HDR_VAL_JFIF "|" GPUJPEG_ENC_HDR_VAL_ADOBE "|" GPUJPEG_ENC_HDR_VAL_SPIFF
+           "] - output JPEG header\n");
+    printf("\t" GPUJPEG_ENC_OPT_FLIPPED_BOOL "=[" GPUJPEG_VAL_FALSE "|" GPUJPEG_VAL_TRUE
+           "] - whether is the input image should be vertically flipped (prior encode)\n");
+    printf("\t" GPUJPEG_ENC_OPT_CHANNEL_REMAP "=XYZ[W] - input channel mapping, eg. '210F' for GBRX,\n"
+        "\t\t'210' for GBR; special placeholders 'F' and 'Z' to set a channel to all-ones or all-zeros\n");
+}
 
 /* Documented at declaration */
 int

src/main.c

@@ -107,8 +107,11 @@ static void
 print_help(bool full)
 {
     printf("gpujpegtool [options] input.rgb output.jpg [input2.rgb output2.jpg ...]\n"
-           "   -h, --help             print help\n"
-           "   -v, --verbose          verbose output (multiply to increase verbosity - max 3) \n"
+           "   -h, --help             print help\n");
+    if (!full) {
+        printf("   -H, --fullhelp         print all options\n");
+    }
+    printf("   -v, --verbose          verbose output (multiply to increase verbosity - max 3) \n"
            "   -D, --device           set cuda device id (default 0)\n"
            "   -L, --device-list      list cuda devices\n"
            "\n");
@@ -145,11 +148,7 @@ print_help(bool full)
            );
     if ( full ) {
         printf("   -b, --debug            debug helpers (reset GPU for leakcheck, dump infile if not regular)\n"
-               "   -O " GPUJPEG_DEC_OPT_TGA_RLE_BOOL "=[" GPUJPEG_VAL_FALSE "|" GPUJPEG_VAL_TRUE
-               "]   set decoder option (not) to output RLE TGA; other options exist\n");
-    }
-    else {
-        printf("   -H, --fullhelp         print all options\n");
+               "   -O <key>=<value>|help  set encoder/decoder option, 'help' for list\n");
     }
     printf("recognized raw input/output file extensions: rgb, yuv, pnm... (use`gpujpegtool exts` for the full list)\n");
 }
@@ -351,18 +350,26 @@ struct coder_opts
     char* opt;
     char* val;
 };
-static bool
+static int
 assign_coder_opt(struct coder_opts* encoder_opts, struct coder_opts* decoder_opts, char* optval)
 {
+    if (strcmp(optval, "help") == 0) {
+        printf("Available options:\n");
+        printf("decoder:\n");
+        gpujpeg_decoder_print_options();
+        printf("\nencoder:\n");
+        gpujpeg_encoder_print_options();
+        return 1;
+    }
     char* opt = optval;
     char* delim = strchr(optval, '=');
     if ( delim == NULL ) {
         fprintf(stderr, "No value for %s!\n", optval);
-        return false;
+        return -1;
     }
     if ( strncmp(optval, "enc_", 4) != 0 && strncmp(optval, "dec_", 4) != 0 ) {
         fprintf(stderr, "Option should start with either enc_ or dec_, given %s!\n", optval);
-        return false;
+        return -1;
     }
     *delim = '\0';
     char *val = delim + 1;
@@ -371,11 +378,11 @@ assign_coder_opt(struct coder_opts* encoder_opts, struct coder_opts* decoder_opt
         if ( opts[i].opt == NULL ) {
             opts[i].opt = opt;
             opts[i].val = val;
-            return true;
+            return 0;
         }
     }
     fprintf(stderr, "Too much options!\n");
-    return false;
+    return -1;
 }
 static bool
 set_encoder_opts(struct gpujpeg_encoder* encoder, const struct coder_opts* opts)
@@ -612,8 +619,9 @@ main(int argc, char *argv[])
             debug = true;
             break;
         case 'O':
-            if ( !assign_coder_opt(encoder_options, decoder_options, tstr_to_mbs(optarg)) ) {
-                return 1;
+            rc = assign_coder_opt(encoder_options, decoder_options, tstr_to_mbs(optarg));
+            if (rc != 0) {
+                return rc < 0 ? 1 : 0;
             }
             break;
         case '?':