From 39b00910aeb6fa5fb68e8cc785c1c93bfb281c01 Mon Sep 17 00:00:00 2001
From: andrews05 <andrew@digerati.co.nz>
Date: Sun, 9 Jul 2023 10:54:58 +1200
Subject: [PATCH] Use stronger compression in eval (#509)

---
 src/lib.rs                                    |  14 ++++++++++++--
 src/main.rs                                   |   4 ++--
 .../files/grayscale_8_should_be_palette_4.png | Bin 16844 -> 2719 bytes
 tests/flags.rs                                |   3 +--
 tests/regression.rs                           |   4 ++--
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 1ad15e6b..9c26a40c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -646,8 +646,18 @@ fn optimize_raw<T: Deflater>(
     max_size: Option<usize>,
     deflater: &T,
 ) -> Option<PngData> {
-    // Must use normal (lazy) compression, as faster ones (greedy) are not representative
-    let eval_compression = 5;
+    // Libdeflate has four algorithms: 1-4 = 'greedy', 5-7 = 'lazy', 8-9 = 'lazy2', 10-12 = 'near-optimal'
+    // 5 is the minimumm required for a decent evaluation result
+    // 7 is not noticeably slower than 5 and improves evaluation of filters in 'fast' mode (o2 and lower)
+    // 8 is a little slower but not noticeably when used only for reductions (o3 and higher)
+    // 9 is not appreciably better than 8
+    // 10 and higher are quite slow - good for filters but only good for reductions if matching the main zc level
+    let eval_compression = match opts.deflate {
+        Deflaters::Libdeflater { compression } => {
+            if opts.fast_evaluation { 7 } else { 8 }.min(compression)
+        }
+        _ => 8,
+    };
     // None and Bigrams work well together, especially for alpha reductions
     let eval_filters = indexset! {RowFilter::None, RowFilter::Bigrams};
     // This will collect all versions of images and pick one that compresses best
diff --git a/src/main.rs b/src/main.rs
index 422e79d9..9afc43fa 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -180,7 +180,7 @@ fn main() {
         )
         .arg(
             Arg::new("fast")
-                .help("Use fast filter evaluation")
+                .help("Use fast filter evaluation (helpful when you have more filters enabled than CPU cores)")
                 .long("fast")
                 .action(ArgAction::SetTrue),
         )
@@ -242,7 +242,7 @@ fn main() {
         )
         .arg(
             Arg::new("zopfli")
-                .help("Use the slower but better compressing Zopfli algorithm")
+                .help("Use the slow but stronger Zopfli compressor (recommended use is with all filters and `--fast` enabled)")
                 .short('Z')
                 .long("zopfli")
                 .action(ArgAction::SetTrue),
diff --git a/tests/files/grayscale_8_should_be_palette_4.png b/tests/files/grayscale_8_should_be_palette_4.png
index 66138edb19b6f2ab3522ed66329ac9cb60f6789f..2edd6dbf107d826a8f5e7698c3d382488839c33a 100644
GIT binary patch
literal 2719
zcmd7UYg7^l76)*&Z8RHoj4{c4loskKU&E-SgJz*%;WMYAL`Ty|vCKd)@{w99=9_%r
z0}V*ccV_t}&787L2z;WcDGh?9jEW&R>NaQhoIShyq4~J?oO|xM_tXD=`;omo;Oc6+
zY5)L0-3<Zr0RWVwUpia$%K;EOHlX`uDB*nI#{u<hJ@J=i$29~B2LS8@{@F@^q7o1Q
zpaye;Ir~QYFHAaI_p|%%PT=>ahR0Ls{rYH&lhhF_t!7iqc%todQTuD(oFbJe_3{K9
z>#gRV?)bfs1Ma*X)exkuY*tl+u`LLHEL|g&t7L7z&sF7x=oU!-yZ@7;){ZI&lJL^)
zYpGy~;%_Mnk-V?G5DOjsxJv5sM?(|v$>b}W5k4stR{n&%zJ%Z!(BE6?Pwa;%ewx18
z+Kjn_t%fKNkKWvv{Mm{W@aT=^uJ|pv*V%M?2KLbF7!w62Wj_BbMoKWJN^CYi-e4U;
z1fVJVLlrYj9dD|z>V26$tM9Ia=*k&<_7ul%vu;rpt<nO!XE@JAWwz{?o$I76LNEVq
zy#8g%)D}#qF%th-JvYPe^FGd+mD!UuCawru3oMNtKD<kx6}^O+3>sO>R<D*vj83Rg
zH1c9@ZwHqS<VDD|=}Bg+$@o^E&x|B>Qsj!7kdb5)?;#_!80sVC<ptA=r#f%G^rm%Y
zjuD)VlpI}ONAl{bN|w_mN=MgWdDIDO1!C}rX{`y1yTI*^$HT7io}j2gRo94?V?u|Z
zcYQ{C`r(K?18(tdyd)?M`QDhBM#A5*nQR@~x3Z@Ckgkso@wT&|q-r@HpBK4~UKkCq
zV5GV@y3SX{<+*=UnfZ2QJ^93a-7d{xP&rkSYOqz(+%c4`zXp29JR&AJsm?hI5!cgK
zOkE{rL)p}tR9!<O-vKznyi4SWtjf*G4!i3oVUoF8<lTl~-<NO%)T2F6&G3_BpC}b}
zR})x0bCH?gk3Vx($Y3fp5RYA?%SdpaIrBHpAmHS=RfmRu7CV0}XE?@gFvXd>ps2ml
zaMM!6jd0joZD1&MrT+>i>z6$XT8TbjyLKd$4uZ10tif;Jos2R(cqJJvK{wQ>1w6Ce
zT&Crb4Gc|2^f+WC$CJ9D9;Cq(Ey0F>wsRv2Qp7<)Nb6y*j*f0U@v<TL&6S2TWo}~E
zfY71dme!^9u8r&{#>>^XTSP6V%Fn_R3=_f$cH90+rXG66nrWH=Jd;`91P<R&K|@LJ
zZmHK@eWCRbK37G2fa|0Wz{%S1LgWVl?2dwIlHS_2+g2DYWqkBICQaw@=i#I0_t34A
zri@AN%45w#hxpP|1H)BshY7Dgepy*fWhn~+d~ckrk*AAB;2Q<S!DBsmGA;T*%9X2@
z<kRMF54O)LZXLMfyo6kbRbD3xi|k#pobtEHS~Awi`Qq=P3B!g5GGUKzq*%6gu0;O8
z*8-nj`x|!%%L95|nr*9aAPWu;9U_HMYvYU~^~k-4ht2J^5kHQOShg<@l9B7C>n@&$
zqkiwba(?#ktP1M>Mf~e~m!}e>0zoj%82Rf;B)xu)X;S}SNwd{mz`2i+`bJ$pT_nq(
zSp{}{KA?HO_k%QJDzK-R%I(BSU*u98DlF{bp0^rkKiygz8p>tGlprH-_j@_Iw2Po(
zvWbnHd0NG?D}LOjMg>hN_SEyQD;V>1if8Af1uy##V5eSnK?RAs4tYjQ*0+Ey#C1R-
zVGih_?ekuhvJ11b4FB23TFjiOJSAUjKf1nRR;k=iyzQ3rxQKI&014tzvceS)r;+Sr
zO68dd7``3SCNC8AtA8kY?pPrqAf(OWIV(1&whKJR>?;(ZTN?9gKa^^QBc)RCGF#bY
zxpn;8G}<>lP;7B&afjvAbP1|svNY!e$X486*|Kmfe=YU`^#ao1=NfMcZ3eS7=@D{J
z-tETWBZZF&z42Y3@prAFqr<X18CPC@S{DR8vDp8UX;IsbCOccYJiDPO_V-YXzS*_g
zZucQs9Ac&wp7*S>Oz<h^9HNKDQ(^YJ?T`_Fmduz>FA8%t<J~#@Gd*VJ<-gb+O<@FG
zlh$Tvmkb8??**^B-xP91Absem9yk6aym2oB1LYjt7Ic<x(WK$pf3$>y7gChrh2J|Q
z#ZYm~f)9V^{pf-Va-W%nXSU%i7qMoerZ<!LqZe0ln?oA@$ogdLZDh~h<v2lgIjI*&
zf38F6X{PHeZHG;0fpufd_FP@-AQo)We%(7NwUeIrVU6eZdi^jr*yxnTLao~W7F>NV
z9BV{<QJ`fGFKk}c4o*Bu@m~y!8>>l<VOLaiR&*3C6vah0`1vjE7ZvWF+%TPv9PY{V
zYH3UZdKm%bYCK_TwmmBs30bw-fcM=7-8>ZVD2WKMvzCyE!w%2RuoA1W=irm<C$D^2
z3BE^+nCTJwa08{%3YECoZoAFO3xvABc`RvZPH6BZ`cB08#)J=p4aCq+ldWt&cwz8z
zMlg#{@s}HHvKtd3{O1cpz{oiFt+Ln7eok!~_ckx*)!9O<!~>R}WVFq|zL$0FOky8a
z<P!cn;Dy>DZi~bs8I;Dt5v=>3?`_k(<iFC4nkXEbl^F}q-DRPptY7&_2b%7>e8Y(F
zMTa+mVv84p?r}v9c%8?eTm!l~#zO2B?fkwU1>AyKixE^7%a4faR_5x=TVSnL+hqH&
zWgQylf~i7BnSn5a5>*RCA5JNFP^&$8iHI7w&h0xBjpF8V>+l6Gb-L(^l!B-_z1T1!
zYHXGp;t`FS_=XE76qtX~+Q^q2BQ#x<I!K(HMhbFcdtgo+V`O9P(smu6zJHrx9UhOv
zW41(6fQh1Jr{cH9_pnOMf9axpfw5xz6g~m3gdgE<MeV<A_(;j6QnLd-cS-^5fNz}=
z#ievi=FnBD1vb-A`v@7vHY@HUziOL?;<(ej^4B*s*W;5mwuSKwll8B^SpskTQ9?+#
z1KKEkf4pO=e<7}`EKoU}@-@k%24BP!?h`P-#vUX7=pOLfBjT@cC=>BCDtU*k$A8)h
z)>H#QcK;VhjC0*f0~0g<LPAeWVfSB2$lC*c@pT+EF(Am)fRGdaOS|$dfH-g*ldwZo
Q`A>Pexp=_pkN=YR59}Q#00000

literal 16844
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

diff --git a/tests/flags.rs b/tests/flags.rs
index 65dcb5fd..1384a97f 100644
--- a/tests/flags.rs
+++ b/tests/flags.rs
@@ -11,7 +11,6 @@ use std::ops::Deref;
 use std::path::Path;
 use std::path::PathBuf;
 
-const GRAYSCALE: u8 = 0;
 const RGB: u8 = 2;
 const INDEXED: u8 = 3;
 const RGBA: u8 = 6;
@@ -597,7 +596,7 @@ fn fix_errors() {
         }
     };
 
-    assert_eq!(png.raw.ihdr.color_type.png_header_code(), GRAYSCALE);
+    assert_eq!(png.raw.ihdr.color_type.png_header_code(), INDEXED);
     assert_eq!(png.raw.ihdr.bit_depth, BitDepth::Eight);
 
     // Cannot check if pixels are equal because image crate cannot read corrupt (input) PNGs
diff --git a/tests/regression.rs b/tests/regression.rs
index 9382f27a..99a9938b 100644
--- a/tests/regression.rs
+++ b/tests/regression.rs
@@ -177,8 +177,8 @@ fn issue_52_05() {
         None,
         RGBA,
         BitDepth::Eight,
-        INDEXED,
-        BitDepth::One,
+        RGB,
+        BitDepth::Eight,
     );
 }