dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-11-20 04:18:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

force "-pass 6" if -psnr or -size is used but -pass isn't.

Browse Source 
This is to prevent users shooting in the foot using -psnr or
-size alone and not getting the expected result.

Change-Id: I67a3289e4ec0a2a813c98807f2ec5e600f52dc63
This commit is contained in:
Pascal Massimino 2016-02-13 10:22:32 +01:00
parent 3ef1ce98b9
commit 4ed650a13d
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/cwebp.c
View File

@ -972,6 +972,11 @@ int main(int argc, const char *argv[]) {
" encoding. Ignoring this option!\n"); " encoding. Ignoring this option!\n");
} }
} }
// If a target size or PSNR was given, but somehow the -pass option was
// omitted, force a reasonable value.
if (config.target_size > 0 || config.target_PSNR > 0) {
if (config.pass == 1) config.pass = 6;
}
if (!WebPValidateConfig(&config)) { if (!WebPValidateConfig(&config)) {
fprintf(stderr, "Error! Invalid configuration.\n"); fprintf(stderr, "Error! Invalid configuration.\n");

10
man/cwebp.1
View File

@ -1,5 +1,5 @@
.\" Hey, EMACS: -*- nroff -*- .\" Hey, EMACS: -*- nroff -*-
.TH CWEBP 1 "December 14, 2015" .TH CWEBP 1 "February 11, 2016"
.SH NAME .SH NAME
cwebp \- compress an image file to a WebP file cwebp \- compress an image file to a WebP file
.SH SYNOPSIS .SH SYNOPSIS
@ -118,16 +118,20 @@ or without alpha).
.BI \-size " int .BI \-size " int
Specify a target size (in bytes) to try and reach for the compressed output. Specify a target size (in bytes) to try and reach for the compressed output.
Compressor will make several pass of partial encoding in order to get as Compressor will make several pass of partial encoding in order to get as
close as possible to this target. close as possible to this target. If both \fB\-size\fP and \fB\-psnr\fP
as used, \fB\-size\fP value will prevail.
.TP .TP
.BI \-psnr " float .BI \-psnr " float
Specify a target PSNR (in dB) to try and reach for the compressed output. Specify a target PSNR (in dB) to try and reach for the compressed output.
Compressor will make several pass of partial encoding in order to get as Compressor will make several pass of partial encoding in order to get as
close as possible to this target. close as possible to this target. If both \fB\-size\fP and \fB\-psnr\fP
as used, \fB\-size\fP value will prevail.
.TP .TP
.BI \-pass " int .BI \-pass " int
Set a maximum number of passes to use during the dichotomy used by Set a maximum number of passes to use during the dichotomy used by
options \fB\-size\fP or \fB\-psnr\fP. Maximum value is 10, default is 1. options \fB\-size\fP or \fB\-psnr\fP. Maximum value is 10, default is 1.
If options \fB\-size\fP or \fB\-psnr\fP were used, but \fB\-pass\fP wasn't
specified, a default value of '6' passes will be used.
.TP .TP
.B \-af .B \-af
Turns auto\-filter on. This algorithm will spend additional time optimizing Turns auto\-filter on. This algorithm will spend additional time optimizing