diff --git a/README b/README index 63da6a2f..e9eeb5a5 100644 --- a/README +++ b/README @@ -140,31 +140,32 @@ A longer list of options is available using the -longhelp command line flag: Usage: cwebp [-preset <...>] [options] in_file [-o out_file] -If input size (-s) for an image is not specified, it is assumed to be a PNG, -JPEG, TIFF or WebP file. -options: +If input size (-s) for an image is not specified, it is +assumed to be a PNG, JPEG, TIFF or WebP file. + +Options: -h / -help ............ short help -H / -longhelp ........ long help -q ............. quality factor (0:small..100:big) - -alpha_q ......... Transparency-compression quality (0..100). - -preset ....... Preset setting, one of: + -alpha_q ......... transparency-compression quality (0..100) + -preset ....... preset setting, one of: default, photo, picture, drawing, icon, text - -preset must come first, as it overwrites other parameters. - -z ............... Activates lossless preset with given + -preset must come first, as it overwrites other parameters + -z ............... activates lossless preset with given level in [0:fast, ..., 9:slowest] -m ............... compression method (0=fast, 6=slowest) -segments ........ number of segments to use (1..4) - -size ............ Target size (in bytes) - -psnr .......... Target PSNR (in dB. typically: 42) + -size ............ target size (in bytes) + -psnr .......... target PSNR (in dB. typically: 42) - -s ......... Input size (width x height) for YUV - -sns ............. Spatial Noise Shaping (0:off, 100:max) + -s ......... input size (width x height) for YUV + -sns ............. spatial noise shaping (0:off, 100:max) -f ............... filter strength (0=off..100) -sharpness ....... filter sharpness (0:most .. 7:least sharp) - -strong ................ use strong filter instead of simple (default). - -nostrong .............. use simple filter instead of strong. + -strong ................ use strong filter instead of simple (default) + -nostrong .............. use simple filter instead of strong -partition_limit . limit quality to fit the 512k limit on the first partition (0=no degradation ... 100=full) -pass ............ analysis pass number (1..10) @@ -172,41 +173,40 @@ options: -resize ........ resize picture (after any cropping) -mt .................... use multi-threading if available -low_memory ............ reduce memory usage (slower encoding) - -map ............. print map of extra info. - -print_psnr ............ prints averaged PSNR distortion. - -print_ssim ............ prints averaged SSIM distortion. - -print_lsim ............ prints local-similarity distortion. - -d .......... dump the compressed output (PGM file). - -alpha_method .... Transparency-compression method (0..1) - -alpha_filter . predictive filtering for alpha plane. - One of: none, fast (default) or best. - -alpha_cleanup ......... Clean RGB values in transparent area. - -blend_alpha ..... Blend colors against background color + -map ............. print map of extra info + -print_psnr ............ prints averaged PSNR distortion + -print_ssim ............ prints averaged SSIM distortion + -print_lsim ............ prints local-similarity distortion + -d .......... dump the compressed output (PGM file) + -alpha_method .... transparency-compression method (0..1) + -alpha_filter . predictive filtering for alpha plane, + one of: none, fast (default) or best + -alpha_cleanup ......... clean RGB values in transparent area + -blend_alpha ..... blend colors against background color expressed as RGB values written in hexadecimal, e.g. 0xc0e0d0 for red=0xc0 - green=0xe0 and blue=0xd0. - -noalpha ............... discard any transparency information. - -lossless .............. Encode image losslessly. - -hint ......... Specify image characteristics hint. - One of: photo, picture or graph + green=0xe0 and blue=0xd0 + -noalpha ............... discard any transparency information + -lossless .............. encode image losslessly + -hint ......... specify image characteristics hint, + one of: photo, picture or graph -metadata ..... comma separated list of metadata to copy from the input to the output if present. Valid values: all, none (default), exif, icc, xmp -short ................. condense printed message - -quiet ................. don't print anything. - -version ............... print version number and exit. - -noasm ................. disable all assembly optimizations. + -quiet ................. don't print anything + -version ............... print version number and exit + -noasm ................. disable all assembly optimizations -v ..................... verbose, e.g. print encoding/decoding times -progress .............. report encoding progress Experimental Options: - -jpeg_like ............. Roughly match expected JPEG size. - -af .................... auto-adjust filter strength. + -jpeg_like ............. roughly match expected JPEG size + -af .................... auto-adjust filter strength -pre ............. pre-processing filter - The main options you might want to try in order to further tune the visual quality are: -preset @@ -270,7 +270,7 @@ Use following options to convert into alternate image formats: -nofilter .... disable in-loop filtering -nodither .... disable dithering -dither .. dithering strength (in 0..100) - -alpha_dither use alpha-plane dithering if needed. + -alpha_dither use alpha-plane dithering if needed -mt .......... use multi-threading -crop ... crop output with the given rectangle -scale .......... scale the output (*after* any cropping) @@ -293,20 +293,20 @@ Usage: vwebp in_file [options] Decodes the WebP image file and visualize it using OpenGL Options are: - -version .... print version number and exit. - -noicc ....... don't use the icc profile if present. - -nofancy ..... don't use the fancy YUV420 upscaler. - -nofilter .... disable in-loop filtering. - -dither dithering strength (0..100). Default=50. - -noalphadither disable alpha plane dithering. - -mt .......... use multi-threading. - -info ........ print info. - -h ....... this help message. + -version .... print version number and exit + -noicc ....... don't use the icc profile if present + -nofancy ..... don't use the fancy YUV420 upscaler + -nofilter .... disable in-loop filtering + -dither dithering strength (0..100), default=50 + -noalphadither disable alpha plane dithering + -mt .......... use multi-threading + -info ........ print info + -h ....... this help message Keyboard shortcuts: - 'c' ................ toggle use of color profile. - 'i' ................ overlay file information. - 'q' / 'Q' / ESC .... quit. + 'c' ................ toggle use of color profile + 'i' ................ overlay file information + 'q' / 'Q' / ESC .... quit Building: --------- diff --git a/README.mux b/README.mux index ab77da51..34619c98 100644 --- a/README.mux +++ b/README.mux @@ -33,35 +33,35 @@ Usage: webpmux -get GET_OPTIONS INPUT -o OUTPUT webpmux -version GET_OPTIONS: - Extract relevant data. - icc Get ICC profile. - exif Get EXIF metadata. - xmp Get XMP metadata. - frame n Get nth frame. + Extract relevant data: + icc get ICC profile + exif get EXIF metadata + xmp get XMP metadata + frame n get nth frame SET_OPTIONS: - Set color profile/metadata. - icc file.icc Set ICC profile. - exif file.exif Set EXIF metadata. - xmp file.xmp Set XMP metadata. + Set color profile/metadata: + icc file.icc set ICC profile + exif file.exif set EXIF metadata + xmp file.xmp set XMP metadata where: 'file.icc' contains the ICC profile to be set, 'file.exif' contains the EXIF metadata to be set 'file.xmp' contains the XMP metadata to be set STRIP_OPTIONS: - Strip color profile/metadata. - icc Strip ICC profile. - exif Strip EXIF metadata. - xmp Strip XMP metadata. + Strip color profile/metadata: + icc strip ICC profile + exif strip EXIF metadata + xmp strip XMP metadata FRAME_OPTIONS(i): - Create animation. + Create animation: file_i +di+[xi+yi[+mi[bi]]] where: 'file_i' is the i'th animation frame (WebP format), - 'di' is the pause duration before next frame. - 'xi','yi' specify the image offset for this frame. - 'mi' is the dispose method for this frame (0 or 1). - 'bi' is the blending method for this frame (+b or -b). + 'di' is the pause duration before next frame, + 'xi','yi' specify the image offset for this frame, + 'mi' is the dispose method for this frame (0 or 1), + 'bi' is the blending method for this frame (+b or -b) LOOP_COUNT: Number of times to repeat the animation. @@ -72,7 +72,7 @@ BACKGROUND_COLOR: A,R,G,B where: 'A', 'R', 'G' and 'B' are integers in the range 0 to 255 specifying the Alpha, Red, Green and Blue component values respectively - [Default: 255,255,255,255]. + [Default: 255,255,255,255] INPUT & OUTPUT are in WebP format. diff --git a/examples/cwebp.c b/examples/cwebp.c index 5f97dcf7..74a262af 100644 --- a/examples/cwebp.c +++ b/examples/cwebp.c @@ -558,37 +558,37 @@ static void HelpShort(void) { static void HelpLong(void) { printf("Usage:\n"); printf(" cwebp [-preset <...>] [options] in_file [-o out_file]\n\n"); - printf("If input size (-s) for an image is not specified, " - "it is assumed to be a PNG, JPEG, TIFF or WebP file.\n"); + printf("If input size (-s) for an image is not specified, it is\n" + "assumed to be a PNG, JPEG, TIFF or WebP file.\n"); #ifdef HAVE_WINCODEC_H - printf("Windows builds can take as input any of the files handled by WIC\n"); + printf("Windows builds can take as input any of the files handled by WIC.\n"); #endif - printf("options:\n"); + printf("\nOptions:\n"); printf(" -h / -help ............ short help\n"); printf(" -H / -longhelp ........ long help\n"); printf(" -q ............. quality factor (0:small..100:big)\n"); - printf(" -alpha_q ......... Transparency-compression quality " - "(0..100).\n"); - printf(" -preset ....... Preset setting, one of:\n"); + printf(" -alpha_q ......... transparency-compression quality " + "(0..100)\n"); + printf(" -preset ....... preset setting, one of:\n"); printf(" default, photo, picture,\n"); printf(" drawing, icon, text\n"); - printf(" -preset must come first, as it overwrites other parameters.\n"); - printf(" -z ............... Activates lossless preset with given\n" + printf(" -preset must come first, as it overwrites other parameters\n"); + printf(" -z ............... activates lossless preset with given\n" " level in [0:fast, ..., 9:slowest]\n"); printf("\n"); printf(" -m ............... compression method (0=fast, 6=slowest)\n"); printf(" -segments ........ number of segments to use (1..4)\n"); - printf(" -size ............ Target size (in bytes)\n"); - printf(" -psnr .......... Target PSNR (in dB. typically: 42)\n"); + printf(" -size ............ target size (in bytes)\n"); + printf(" -psnr .......... target PSNR (in dB. typically: 42)\n"); printf("\n"); - printf(" -s ......... Input size (width x height) for YUV\n"); - printf(" -sns ............. Spatial Noise Shaping (0:off, 100:max)\n"); + printf(" -s ......... input size (width x height) for YUV\n"); + printf(" -sns ............. spatial noise shaping (0:off, 100:max)\n"); printf(" -f ............... filter strength (0=off..100)\n"); printf(" -sharpness ....... " "filter sharpness (0:most .. 7:least sharp)\n"); printf(" -strong ................ use strong filter instead " - "of simple (default).\n"); - printf(" -nostrong .............. use simple filter instead of strong.\n"); + "of simple (default)\n"); + printf(" -nostrong .............. use simple filter instead of strong\n"); printf(" -partition_limit . limit quality to fit the 512k limit on\n"); printf(" " "the first partition (0=no degradation ... 100=full)\n"); @@ -598,25 +598,25 @@ static void HelpLong(void) { printf(" -mt .................... use multi-threading if available\n"); printf(" -low_memory ............ reduce memory usage (slower encoding)\n"); #ifdef WEBP_EXPERIMENTAL_FEATURES - printf(" -444 / -422 / -gray ..... Change colorspace\n"); + printf(" -444 / -422 / -gray .... change colorspace\n"); #endif - printf(" -map ............. print map of extra info.\n"); - printf(" -print_psnr ............ prints averaged PSNR distortion.\n"); - printf(" -print_ssim ............ prints averaged SSIM distortion.\n"); - printf(" -print_lsim ............ prints local-similarity distortion.\n"); - printf(" -d .......... dump the compressed output (PGM file).\n"); - printf(" -alpha_method .... Transparency-compression method (0..1)\n"); - printf(" -alpha_filter . predictive filtering for alpha plane.\n"); - printf(" One of: none, fast (default) or best.\n"); - printf(" -alpha_cleanup ......... Clean RGB values in transparent area.\n"); - printf(" -blend_alpha ..... Blend colors against background color\n" + printf(" -map ............. print map of extra info\n"); + printf(" -print_psnr ............ prints averaged PSNR distortion\n"); + printf(" -print_ssim ............ prints averaged SSIM distortion\n"); + printf(" -print_lsim ............ prints local-similarity distortion\n"); + printf(" -d .......... dump the compressed output (PGM file)\n"); + printf(" -alpha_method .... transparency-compression method (0..1)\n"); + printf(" -alpha_filter . predictive filtering for alpha plane,\n"); + printf(" one of: none, fast (default) or best\n"); + printf(" -alpha_cleanup ......... clean RGB values in transparent area\n"); + printf(" -blend_alpha ..... blend colors against background color\n" " expressed as RGB values written in\n" " hexadecimal, e.g. 0xc0e0d0 for red=0xc0\n" - " green=0xe0 and blue=0xd0.\n"); - printf(" -noalpha ............... discard any transparency information.\n"); - printf(" -lossless .............. Encode image losslessly.\n"); - printf(" -hint ......... Specify image characteristics hint.\n"); - printf(" One of: photo, picture or graph\n"); + " green=0xe0 and blue=0xd0\n"); + printf(" -noalpha ............... discard any transparency information\n"); + printf(" -lossless .............. encode image losslessly\n"); + printf(" -hint ......... specify image characteristics hint,\n"); + printf(" one of: photo, picture or graph\n"); printf("\n"); printf(" -metadata ..... comma separated list of metadata to\n"); @@ -627,18 +627,18 @@ static void HelpLong(void) { printf("\n"); printf(" -short ................. condense printed message\n"); - printf(" -quiet ................. don't print anything.\n"); - printf(" -version ............... print version number and exit.\n"); + printf(" -quiet ................. don't print anything\n"); + printf(" -version ............... print version number and exit\n"); #ifndef WEBP_DLL - printf(" -noasm ................. disable all assembly optimizations.\n"); + printf(" -noasm ................. disable all assembly optimizations\n"); #endif printf(" -v ..................... verbose, e.g. print encoding/decoding " "times\n"); printf(" -progress .............. report encoding progress\n"); printf("\n"); printf("Experimental Options:\n"); - printf(" -jpeg_like ............. Roughly match expected JPEG size.\n"); - printf(" -af .................... auto-adjust filter strength.\n"); + printf(" -jpeg_like ............. roughly match expected JPEG size\n"); + printf(" -af .................... auto-adjust filter strength\n"); printf(" -pre ............. pre-processing filter\n"); printf("\n"); } diff --git a/examples/dwebp.c b/examples/dwebp.c index 0fc8be06..a37b05ed 100644 --- a/examples/dwebp.c +++ b/examples/dwebp.c @@ -557,7 +557,7 @@ static void Help(void) { " -nofilter .... disable in-loop filtering\n" " -nodither .... disable dithering\n" " -dither .. dithering strength (in 0..100)\n" - " -alpha_dither use alpha-plane dithering if needed.\n" + " -alpha_dither use alpha-plane dithering if needed\n" " -mt .......... use multi-threading\n" " -crop ... crop output with the given rectangle\n" " -scale .......... scale the output (*after* any cropping)\n" diff --git a/examples/vwebp.c b/examples/vwebp.c index 459a4f99..589f0832 100644 --- a/examples/vwebp.c +++ b/examples/vwebp.c @@ -372,20 +372,20 @@ static void Help(void) { printf("Usage: vwebp in_file [options]\n\n" "Decodes the WebP image file and visualize it using OpenGL\n" "Options are:\n" - " -version .... print version number and exit.\n" - " -noicc ....... don't use the icc profile if present.\n" - " -nofancy ..... don't use the fancy YUV420 upscaler.\n" - " -nofilter .... disable in-loop filtering.\n" - " -dither dithering strength (0..100). Default=50.\n" - " -noalphadither disable alpha plane dithering.\n" - " -mt .......... use multi-threading.\n" - " -info ........ print info.\n" - " -h ....... this help message.\n" + " -version .... print version number and exit\n" + " -noicc ....... don't use the icc profile if present\n" + " -nofancy ..... don't use the fancy YUV420 upscaler\n" + " -nofilter .... disable in-loop filtering\n" + " -dither dithering strength (0..100), default=50\n" + " -noalphadither disable alpha plane dithering\n" + " -mt .......... use multi-threading\n" + " -info ........ print info\n" + " -h ....... this help message\n" "\n" "Keyboard shortcuts:\n" - " 'c' ................ toggle use of color profile.\n" - " 'i' ................ overlay file information.\n" - " 'q' / 'Q' / ESC .... quit.\n" + " 'c' ................ toggle use of color profile\n" + " 'i' ................ overlay file information\n" + " 'q' / 'Q' / ESC .... quit\n" ); } diff --git a/examples/webpmux.c b/examples/webpmux.c index ec261c60..a47ae16e 100644 --- a/examples/webpmux.c +++ b/examples/webpmux.c @@ -303,51 +303,51 @@ static void PrintHelp(void) { printf("\n"); printf("GET_OPTIONS:\n"); - printf(" Extract relevant data.\n"); - printf(" icc Get ICC profile.\n"); - printf(" exif Get EXIF metadata.\n"); - printf(" xmp Get XMP metadata.\n"); + printf(" Extract relevant data:\n"); + printf(" icc get ICC profile\n"); + printf(" exif get EXIF metadata\n"); + printf(" xmp get XMP metadata\n"); #ifdef WEBP_EXPERIMENTAL_FEATURES - printf(" frgm n Get nth fragment.\n"); + printf(" frgm n get nth fragment\n"); #endif - printf(" frame n Get nth frame.\n"); + printf(" frame n get nth frame\n"); printf("\n"); printf("SET_OPTIONS:\n"); - printf(" Set color profile/metadata.\n"); - printf(" icc file.icc Set ICC profile.\n"); - printf(" exif file.exif Set EXIF metadata.\n"); - printf(" xmp file.xmp Set XMP metadata.\n"); + printf(" Set color profile/metadata:\n"); + printf(" icc file.icc set ICC profile\n"); + printf(" exif file.exif set EXIF metadata\n"); + printf(" xmp file.xmp set XMP metadata\n"); printf(" where: 'file.icc' contains the ICC profile to be set,\n"); printf(" 'file.exif' contains the EXIF metadata to be set\n"); printf(" 'file.xmp' contains the XMP metadata to be set\n"); printf("\n"); printf("STRIP_OPTIONS:\n"); - printf(" Strip color profile/metadata.\n"); - printf(" icc Strip ICC profile.\n"); - printf(" exif Strip EXIF metadata.\n"); - printf(" xmp Strip XMP metadata.\n"); + printf(" Strip color profile/metadata:\n"); + printf(" icc strip ICC profile\n"); + printf(" exif strip EXIF metadata\n"); + printf(" xmp strip XMP metadata\n"); #ifdef WEBP_EXPERIMENTAL_FEATURES printf("\n"); printf("FRAGMENT_OPTIONS(i):\n"); - printf(" Create fragmented image.\n"); + printf(" Create fragmented image:\n"); printf(" file_i +xi+yi\n"); printf(" where: 'file_i' is the i'th fragment (WebP format),\n"); - printf(" 'xi','yi' specify the image offset for this fragment." + printf(" 'xi','yi' specify the image offset for this fragment" "\n"); #endif printf("\n"); printf("FRAME_OPTIONS(i):\n"); - printf(" Create animation.\n"); + printf(" Create animation:\n"); printf(" file_i +di+[xi+yi[+mi[bi]]]\n"); printf(" where: 'file_i' is the i'th animation frame (WebP format),\n"); - printf(" 'di' is the pause duration before next frame.\n"); - printf(" 'xi','yi' specify the image offset for this frame.\n"); - printf(" 'mi' is the dispose method for this frame (0 or 1).\n"); - printf(" 'bi' is the blending method for this frame (+b or -b)." + printf(" 'di' is the pause duration before next frame,\n"); + printf(" 'xi','yi' specify the image offset for this frame,\n"); + printf(" 'mi' is the dispose method for this frame (0 or 1),\n"); + printf(" 'bi' is the blending method for this frame (+b or -b)" "\n"); printf("\n"); @@ -363,7 +363,7 @@ static void PrintHelp(void) { "specifying\n"); printf(" the Alpha, Red, Green and Blue component values " "respectively\n"); - printf(" [Default: 255,255,255,255].\n"); + printf(" [Default: 255,255,255,255]\n"); printf("\nINPUT & OUTPUT are in WebP format.\n");