Enable zopfli on oxipng

codecs/oxipng/Cargo.toml

@@ -12,7 +12,7 @@ wasm-opt = ["-O", "--no-validation"]
 crate-type = ["cdylib"]
 
 [dependencies]
-oxipng = { version = "9.0", default-features = false, features = ["freestanding"] }
+oxipng = { version = "9.0", default-features = false, features = ["freestanding", "zopfli"] }
 wasm-bindgen = "0.2.73"
 log = { version = "0.4.11", features = ["release_max_level_off"] }
 wasm-bindgen-rayon = { version = "1.0", optional = true }
@@ -22,4 +22,4 @@ lto = true
 opt-level = "s"
 
 [features]
-parallel = ["oxipng/parallel", "wasm-bindgen-rayon"]
+parallel = ["oxipng/parallel", "wasm-bindgen-rayon", "oxipng/zopfli"]

codecs/oxipng/src/lib.rs

@@ -1,7 +1,8 @@
 #[cfg(feature = "parallel")]
 pub use wasm_bindgen_rayon::init_thread_pool;
 
-use oxipng::{BitDepth, ColorType, Interlacing};
+use oxipng::{BitDepth, ColorType, Deflaters, Interlacing};
+use std::num::NonZeroU8;
 use wasm_bindgen::prelude::*;
 use wasm_bindgen::Clamped;
 
@@ -12,6 +13,9 @@ pub fn optimise(
     height: u32,
     level: u8,
     interlace: bool,
+    deflater: u8,
+    iterations: u8,
+    compression_level: u8,
 ) -> Vec<u8> {
     let mut options = oxipng::Options::from_preset(level);
     options.optimize_alpha = true;
@@ -20,6 +24,23 @@ pub fn optimise(
     } else {
         Interlacing::None
     });
+    match deflater {
+        0 => {
+            options.deflate = Deflaters::Libdeflater {
+                compression: compression_level,
+            }
+        }
+        1 => {
+            options.deflate = Deflaters::Zopfli {
+                iterations: Option::unwrap(NonZeroU8::new(iterations)),
+            }
+        }
+        _ => {
+            options.deflate = Deflaters::Libdeflater {
+                compression: compression_level,
+            }
+        }
+    }
 
     let raw = oxipng::RawImage::new(width, height, ColorType::RGBA, BitDepth::Eight, data.0)
         .unwrap_throw();

src/features/encoders/oxiPNG/client/index.tsx

@@ -1,11 +1,12 @@
 import { inputFieldChecked } from 'client/lazy-app/util';
-import { EncodeOptions } from '../shared/meta';
+import { defaultOptions, Deflaters, EncodeOptions } from '../shared/meta';
 import type WorkerBridge from 'client/lazy-app/worker-bridge';
 import { h, Component } from 'preact';
 import { inputFieldValueAsNumber, preventDefault } from 'client/lazy-app/util';
 import * as style from 'client/lazy-app/Compress/Options/style.css';
 import Range from 'client/lazy-app/Compress/Options/Range';
 import Checkbox from 'client/lazy-app/Compress/Options/Checkbox';
+import Select from 'client/lazy-app/Compress/Options/Select';
 
 export async function encode(
   signal: AbortSignal,
@@ -30,7 +31,11 @@ export class Options extends Component<Props, {}> {
     const options: EncodeOptions = {
       level: inputFieldValueAsNumber(form.level),
       interlace: inputFieldChecked(form.interlace),
+      deflater: inputFieldValueAsNumber(form.deflater),
+      iterations: inputFieldValueAsNumber(form.iterations, 5),
+      compressionLevel: inputFieldValueAsNumber(form.compressionLevel, 11),
     };
+
     this.props.onChange(options);
   };
 
@@ -57,6 +62,45 @@ export class Options extends Component<Props, {}> {
             Effort:
           </Range>
         </div>
+        <label class={style.optionTextFirst}>
+          Deflater:
+          <Select
+            name="deflater"
+            value={options.deflater}
+            onChange={this.onChange}
+          >
+            <option value={Deflaters.libdeflater}>Libdeflater</option>
+            <option value={Deflaters.zopfli}>Zopfli</option>
+          </Select>
+        </label>
+        {this.props.options.deflater == Deflaters.libdeflater && (
+          <div class={style.optionOneCell}>
+            <Range
+              name="compressionLevel"
+              min="1"
+              max="12"
+              step="1"
+              value={options.compressionLevel}
+              onInput={this.onChange}
+            >
+              Compression level:
+            </Range>
+          </div>
+        )}
+        {this.props.options.deflater == Deflaters.zopfli && (
+          <div class={style.optionOneCell}>
+            <Range
+              name="iterations"
+              min="1"
+              max="15"
+              step="1"
+              value={options.iterations}
+              onInput={this.onChange}
+            >
+              Iterations:
+            </Range>
+          </div>
+        )}
       </form>
     );
   }

src/features/encoders/oxiPNG/shared/meta.ts

@@ -10,9 +10,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+export const enum Deflaters {
+  libdeflater,
+  zopfli,
+}
+
 export interface EncodeOptions {
   level: number;
   interlace: boolean;
+  deflater: Deflaters;
+  iterations: number;
+  compressionLevel: number;
 }
 
 export const label = 'OxiPNG';
@@ -22,4 +30,7 @@ export const extension = 'png';
 export const defaultOptions: EncodeOptions = {
   level: 2,
   interlace: false,
+  deflater: Deflaters.libdeflater,
+  iterations: 5,
+  compressionLevel: 11,
 };

src/features/encoders/oxiPNG/worker/oxipngEncode.ts

@@ -51,5 +51,8 @@ export default async function encode(
     data.height,
     options.level,
     options.interlace,
+    options.deflater,
+    options.iterations,
+    options.compressionLevel,
   ).buffer;
 }