Skip to content

Commit 55e7b16

Browse files
zvezdochiotzvezdochiot
committed
2.5.8: neat adds up all values
1 parent beef803 commit 55e7b16

File tree

10 files changed

+194
-130
lines changed

10 files changed

+194
-130
lines changed

‎CHANGELOG

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
JPEG Recompress
22
https://github.com/ImageProcessing-ElectronicPublications/jpeg-recompress
33

4+
2.5.8 "neat"
5+
6+
Neat adds up all values.
7+
48
2.5.7 "bisection"
59

610
Fix bisection

‎README.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ SSIM | `-m ssim` | [Structural similarity](http://en.wikipedia.org/wi
5858
MS-SSIM* | `-m ms-ssim` | Multi-scale structural similarity (slow!) ([2008 paper](http://foulard.ece.cornell.edu/publications/dmr_hvei2008_paper.pdf))
5959
SmallFry | `-m smallfry` | Linear-weighted BBCQ-like ([original project](https://github.com/dwbuiten/smallfry), [2011 BBCQ paper](http://spie.org/Publications/Proceedings/Paper/10.1117/12.872231) -> [LibSmallFry](https://github.com/ImageProcessing-ElectronicPublications/libsmallfry))
6060
SharpenBad | `-m shbad` | Sharpen discrepancies ([LibSmallFry](https://github.com/ImageProcessing-ElectronicPublications/libsmallfry))
61+
Correlation | `-m cor` | [Correlation](https://en.wikipedia.org/wiki/Correlation)
6162
NHW | `-m nhw` | NHW convolutional metric ([original project](https://github.com/rcanut/NHW_Neatness_Metrics) -> [LibSmallFry](https://github.com/ImageProcessing-ElectronicPublications/libsmallfry))
6263
1 pair | `-m ssimfry` | `(ssim + smallfry) / 2`
6364
2 pair | `-m ssimshb` | `(ssim + shbad) / 2`
@@ -71,15 +72,16 @@ SUMMARY | `-m sum` | `(ssim + smallfry + shbad + nhw) / 4` **DEFAULT**
7172
```
7273
Trends:
7374
```
74-
UM = 1.10*sqrt(PNSR)-6.07
75-
UM = -0.85*sqrt(MPE)+1.73
76-
UM = 2.38*cor_sigma(cor_sigma(cor_sigma(SSIM)))-0.24
77-
UM = 1.87*cor_sigma(cor_sigma(MS_SSIM))-0.02
78-
UM = 0.0747*SMALLFRY-6.91
79-
UM = 2.28*sqrt(sqrt(sqrt(1.0/NHW)))-0.97
80-
UM = 1.48*SHARPENBAD-0.26
81-
82-
cor_sigma(M) = 1.0-sqrt(1.0-M*M)
75+
UM = 2.79 * sqrt(sqrt(1.0 / MPE)) - 1.54
76+
UM = 0.95 * sqrt(PNSR) - 4.97
77+
UM = 1.95 * cor_sigma(cor_sigma(cor_sigma(SSIM))) - 0.20
78+
UM = 1.50 * cor_sigma(cor_sigma(MS_SSIM)) + 0.06
79+
UM = 0.0643 * SMALLFRY - 5.86
80+
UM = 1.11 * SHARPENBAD - 0.06
81+
UM = 2.86 * cor_sigma(cor_sigma(COR)) - 1.38
82+
UM = 0.37 * sqrt(sqrt(1.0 / NHW)) - 0.39
83+
84+
cor_sigma(M) = 1.0 - sqrt(1.0 - M * M)
8385
```
8486

8587
#### Subsampling

‎man/man1/jpeg-compare.1

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH "jpeg-compare" 2.5.5 "14 Dec 2022" "User manual"
1+
.TH "jpeg-compare" 2.5.8 "13 Jan 2023" "User manual"
22
.SH NAME
33
jpeg-compare
44
.SH DESCRIPTION
@@ -13,7 +13,7 @@ jpeg-compare [options] image1.jpg image2.jpg
1313
output program help
1414
.TP
1515
\fB\-m\fR, \fB\-\-method\fR [arg]
16-
set comparison method to one of 'fast', 'psnr', 'mpe', 'ssim', 'ms-ssim', 'smallfry', 'shbad', 'nhw', 'ssimfry', 'ssimshb', 'sum' [fast]
16+
set comparison method to one of 'fast', 'mpe', 'psnr', 'ssim', 'ms-ssim', 'smallfry', 'shbad', `cor`, 'nhw', 'ssimfry', 'ssimshb', 'sum' [fast]
1717
.TP
1818
\fB\-n\fR, \fB\-\-norm\fR
1919
UM scale metric
@@ -68,14 +68,16 @@ jpeg-compare --method ssim image1.jpg image2.jpg
6868
.PP
6969
Trends:
7070

71-
UM = 1.10*sqrt(PNSR)-6.07
72-
UM = -0.85*sqrt(MPE)+1.73
73-
UM = 2.38*cor_sigma(cor_sigma(cor_sigma(SSIM)))-0.24
74-
UM = 1.87*cor_sigma(cor_sigma(MS_SSIM))-0.02
75-
UM = 0.0747*SMALLFRY-6.91
76-
UM = 2.28*sqrt(sqrt(sqrt(1.0/NHW)))-0.97
77-
UM = 1.48*SHARPENBAD-0.26
78-
cor_sigma(M) = 1.0-sqrt(1.0-M*M)
71+
UM = 2.79 * sqrt(sqrt(1.0 / MPE)) - 1.54
72+
UM = 0.95 * sqrt(PNSR) - 4.97
73+
UM = 1.95 * cor_sigma(cor_sigma(cor_sigma(SSIM))) - 0.20
74+
UM = 1.50 * cor_sigma(cor_sigma(MS_SSIM)) + 0.06
75+
UM = 0.0643 * SMALLFRY - 5.86
76+
UM = 1.11 * SHARPENBAD - 0.06
77+
UM = 2.86 * cor_sigma(cor_sigma(COR)) - 1.38
78+
UM = 0.37 * sqrt(sqrt(1.0 / NHW)) - 0.39
79+
cor_sigma(M) = 1.0 - sqrt(1.0 - M * M)
80+
7981
.SH COPYRIGHT
8082
JPEG-Archive is copyright © 2015 Daniel G. Taylor
8183
Image Quality Assessment (IQA) is copyright 2011, Tom Distler (http://tdistler.com)

‎man/man1/jpeg-recompress.1

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH "jpeg-recompress" 2.5.5 "14 Dec 2022" "User manual"
1+
.TH "jpeg-recompress" 2.5.8 "13 Jan 2023" "User manual"
22
.SH NAME
33
jpeg-recompress
44
.SH DESCRIPTION
@@ -31,7 +31,7 @@ output program help
3131
set the number of runs to attempt [6]
3232
.TP
3333
\fB\-m\fR, \fB\-\-method\fR [arg]
34-
set comparison method to one of 'mpe', 'psnr', 'ssim', 'ms-ssim', 'smallfry', 'shbad', 'nhw', 'ssimfry', 'ssimshb', 'sum' [sum]
34+
set comparison method to one of 'mpe', 'psnr', 'ssim', 'ms-ssim', 'smallfry', 'shbad', `cor`, 'nhw', 'ssimfry', 'ssimshb', 'sum' [sum]
3535
.TP
3636
\fB\-n\fR, \fB\-\-min\fR [arg]
3737
minimum JPEG quality [40]
@@ -139,14 +139,16 @@ jpeg-recompress --quiet image.jpg compressed.jpg
139139
.PP
140140
Trends:
141141

142-
UM = 1.10*sqrt(PNSR)-6.07
143-
UM = -0.85*sqrt(MPE)+1.73
144-
UM = 2.38*cor_sigma(cor_sigma(cor_sigma(SSIM)))-0.24
145-
UM = 1.87*cor_sigma(cor_sigma(MS_SSIM))-0.02
146-
UM = 0.0747*SMALLFRY-6.91
147-
UM = 2.28*sqrt(sqrt(sqrt(1.0/NHW)))-0.97
148-
UM = 1.48*SHARPENBAD-0.26
149-
cor_sigma(M) = 1.0-sqrt(1.0-M*M)
142+
UM = 2.79 * sqrt(sqrt(1.0 / MPE)) - 1.54
143+
UM = 0.95 * sqrt(PNSR) - 4.97
144+
UM = 1.95 * cor_sigma(cor_sigma(cor_sigma(SSIM))) - 0.20
145+
UM = 1.50 * cor_sigma(cor_sigma(MS_SSIM)) + 0.06
146+
UM = 0.0643 * SMALLFRY - 5.86
147+
UM = 1.11 * SHARPENBAD - 0.06
148+
UM = 2.86 * cor_sigma(cor_sigma(COR)) - 1.38
149+
UM = 0.37 * sqrt(sqrt(1.0 / NHW)) - 0.39
150+
cor_sigma(M) = 1.0 - sqrt(1.0 - M * M)
151+
150152
.SH COPYRIGHT
151153
JPEG-Archive is copyright © 2015 Daniel G. Taylor
152154
Image Quality Assessment (IQA) is copyright 2011, Tom Distler (http://tdistler.com)

‎man/man1/webp-compress.1

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.TH "webp-compress" 2.5.5 "14 Dec 2022" "User manual"
1+
.TH "webp-compress" 2.5.8 "13 Jan 2023" "User manual"
22

33
.SH NAME
44
webp-compress
@@ -30,7 +30,7 @@ output program help
3030
set the number of runs to attempt [8]
3131
.TP
3232
\fB\-m\fR, \fB\-\-method\fR [arg]
33-
set comparison method to one of 'mpe', 'psnr', 'ssim', 'ms-ssim', 'smallfry', 'shbad', 'nhw', 'ssimfry', 'ssimshb', 'sum' [sum]
33+
set comparison method to one of 'mpe', 'psnr', 'ssim', 'ms-ssim', 'smallfry', 'shbad', `cor, 'nhw', 'ssimfry', 'ssimshb', 'sum' [sum]
3434
.TP
3535
\fB\-n\fR, \fB\-\-min\fR [arg]
3636
minimum quality [1]
@@ -107,14 +107,16 @@ webp-compress --quiet image.jpg compressed.webp
107107
.PP
108108
Trends:
109109

110-
UM = 1.10*sqrt(PNSR)-6.07
111-
UM = -0.85*sqrt(MPE)+1.73
112-
UM = 2.38*cor_sigma(cor_sigma(cor_sigma(SSIM)))-0.24
113-
UM = 1.87*cor_sigma(cor_sigma(MS_SSIM))-0.02
114-
UM = 0.0747*SMALLFRY-6.91
115-
UM = 2.28*sqrt(sqrt(sqrt(1.0/NHW)))-0.97
116-
UM = 1.48*SHARPENBAD-0.26
117-
cor_sigma(M) = 1.0-sqrt(1.0-M*M)
110+
UM = 2.79 * sqrt(sqrt(1.0 / MPE)) - 1.54
111+
UM = 0.95 * sqrt(PNSR) - 4.97
112+
UM = 1.95 * cor_sigma(cor_sigma(cor_sigma(SSIM))) - 0.20
113+
UM = 1.50 * cor_sigma(cor_sigma(MS_SSIM)) + 0.06
114+
UM = 0.0643 * SMALLFRY - 5.86
115+
UM = 1.11 * SHARPENBAD - 0.06
116+
UM = 2.86 * cor_sigma(cor_sigma(COR)) - 1.38
117+
UM = 0.37 * sqrt(sqrt(1.0 / NHW)) - 0.39
118+
cor_sigma(M) = 1.0 - sqrt(1.0 - M * M)
119+
118120
.SH COPYRIGHT
119121
JPEG-Archive is copyright © 2015 Daniel G. Taylor
120122
Image Quality Assessment (IQA) is copyright 2011, Tom Distler (http://tdistler.com)

0 commit comments

Comments
 (0)