feat(cli): added oxipng codec

src/cli/codecs/mod.rs

@@ -1,14 +1,15 @@
 use clap::Command;
 
 use self::{
- farbfeld::farbfeld, jpeg::jpeg, jpeg_xl::jpeg_xl, mozjpeg::mozjpeg, png::png, ppm::ppm,
- qoi::qoi,
+ farbfeld::farbfeld, jpeg::jpeg, jpeg_xl::jpeg_xl, mozjpeg::mozjpeg, oxipng::oxipng, png::png,
+ ppm::ppm, qoi::qoi,
 };
 
 mod farbfeld;
 mod jpeg;
 mod jpeg_xl;
 mod mozjpeg;
+mod oxipng;
 mod png;
 mod ppm;
 mod qoi;
@@ -20,6 +21,7 @@ impl Codecs for Command {
  jpeg(),
  jpeg_xl(),
  mozjpeg(),
+ oxipng(),
  png(),
  ppm(),
  qoi(),

src/cli/codecs/oxipng.rs

@@ -0,0 +1,23 @@
+use clap::{arg, value_parser, Command};
+use indoc::indoc;
+
+pub fn oxipng() -> Command {
+ Command::new("oxipng")
+ .alias("oxi")
+ .about("Encode images into PNG format using OxiPNG codec")
+ .args([
+ arg!(--interlace "Set interlace mode (progressive)"),
+ arg!(--effort <NUM> "Optimization level (0-6, or max)").long_help(indoc! {"Set the optimization level preset. The default level 2 is quite fast and provides good compression.
+ Lower levels are faster, higher levels provide better compression, though with increasingly diminishing returns.
+
+ 0 => (1 trial, determined heuristically)
+ 1 => (1 trial, determined heuristically)
+ 2 => (4 fast trials, 1 main trial)
+ 3 => (4 trials)
+ 4 => (4 trials)
+ 5 => (8 trials)
+ 6 => (10 trials)"})
+ .value_parser(value_parser!(u8).range(0..=6))
+ .default_value("2"),
+ ])
+}

src/cli/pipeline.rs

@@ -2,7 +2,10 @@ use std::{collections::BTreeMap, fs::read, path::Path};
 
 use clap::ArgMatches;
 use mozjpeg::qtable;
-use rimage::codecs::mozjpeg::{MozJpegEncoder, MozJpegOptions};
+use rimage::codecs::{
+ mozjpeg::{MozJpegEncoder, MozJpegOptions},
+ oxipng::{OxiPngEncoder, OxiPngOptions},
+};
 use zune_core::{bytestream::ZByteReader, options::EncoderOptions};
 use zune_image::{
  codecs::{
@@ -211,6 +214,18 @@ pub fn encoder(matches: &ArgMatches) -> Result<(Box<dyn EncoderTrait>, &'static
 
  Ok((Box::new(MozJpegEncoder::new_with_options(options)), "jpg"))
  }
+ "oxipng" => {
+ let mut options =
+ OxiPngOptions::from_preset(*matches.get_one::<u8>("effort").unwrap_or(&2));
+
+ options.interlace = if matches.get_flag("interlace") {
+ Some(oxipng::Interlacing::Adam7)
+ } else {
+ None
+ };
+
+ Ok((Box::new(OxiPngEncoder::new_with_options(options)), "png"))
+ }
  "png" => Ok((Box::new(PngEncoder::new()), "png")),
  "ppm" => Ok((Box::new(PPMEncoder::new()), "ppm")),
  "qoi" => Ok((Box::new(QoiEncoder::new()), "qoi")),