parent
3f3fbb6f60
commit
f2c16696a5
6 changed files with 1073 additions and 0 deletions
|
|
@ -1,5 +1,7 @@
|
|||
**Version 0.5.0 (unreleased)**
|
||||
- [SEMVER_MINOR] Palette entries can now reduced, on by default ([#11](https://github.com/shssoichiro/oxipng/issues/11))
|
||||
- Don't report that we are in pretend mode if verbosity is set to none
|
||||
- Add cargo bench suite ([#7](https://github.com/shssoichiro/oxipng/issues/7))
|
||||
|
||||
**Version 0.4.0**
|
||||
- Performance optimizations
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ homepage = "https://github.com/shssoichiro/oxipng"
|
|||
repository = "https://github.com/shssoichiro/oxipng"
|
||||
exclude = [
|
||||
"tests/*",
|
||||
"bench/*",
|
||||
]
|
||||
|
||||
[lib]
|
||||
|
|
|
|||
267
benches/deflate.rs
Normal file
267
benches/deflate.rs
Normal file
|
|
@ -0,0 +1,267 @@
|
|||
#![feature(test)]
|
||||
|
||||
extern crate test;
|
||||
extern crate oxipng;
|
||||
|
||||
use oxipng::png;
|
||||
use test::Bencher;
|
||||
use std::collections::HashSet;
|
||||
use std::path::Path;
|
||||
use std::path::PathBuf;
|
||||
|
||||
fn get_opts(input: &Path) -> oxipng::Options {
|
||||
let mut filter = HashSet::new();
|
||||
filter.insert(0);
|
||||
let mut compression = HashSet::new();
|
||||
compression.insert(9);
|
||||
let mut memory = HashSet::new();
|
||||
memory.insert(9);
|
||||
let strategies = HashSet::new();
|
||||
|
||||
oxipng::Options {
|
||||
backup: false,
|
||||
out_file: input.with_extension("out.png").to_owned(),
|
||||
out_dir: None,
|
||||
stdout: false,
|
||||
pretend: true,
|
||||
recursive: false,
|
||||
fix_errors: false,
|
||||
force: true,
|
||||
clobber: true,
|
||||
create: true,
|
||||
preserve_attrs: false,
|
||||
verbosity: None,
|
||||
filter: filter,
|
||||
interlace: None,
|
||||
compression: compression,
|
||||
memory: memory,
|
||||
strategies: strategies,
|
||||
window: 15,
|
||||
bit_depth_reduction: false,
|
||||
color_type_reduction: false,
|
||||
palette_reduction: false,
|
||||
idat_recoding: true,
|
||||
strip: png::Headers::None,
|
||||
use_heuristics: false,
|
||||
}
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_16_bits_strategy_0(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_16.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.strategies.insert(0);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_8_bits_strategy_0(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_rgb_8.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.strategies.insert(0);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_4_bits_strategy_0(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_4_should_be_palette_4.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.strategies.insert(0);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_2_bits_strategy_0(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_2_should_be_palette_2.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.strategies.insert(0);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_1_bits_strategy_0(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_1_should_be_palette_1.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.strategies.insert(0);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_16_bits_strategy_1(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_16.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.strategies.insert(1);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_8_bits_strategy_1(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_rgb_8.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.strategies.insert(1);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_4_bits_strategy_1(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_4_should_be_palette_4.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.strategies.insert(1);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_2_bits_strategy_1(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_2_should_be_palette_2.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.strategies.insert(1);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_1_bits_strategy_1(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_1_should_be_palette_1.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.strategies.insert(1);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_16_bits_strategy_2(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_16.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.strategies.insert(2);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_8_bits_strategy_2(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_rgb_8.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.strategies.insert(2);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_4_bits_strategy_2(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_4_should_be_palette_4.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.strategies.insert(2);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_2_bits_strategy_2(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_2_should_be_palette_2.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.strategies.insert(2);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_1_bits_strategy_2(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_1_should_be_palette_1.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.strategies.insert(2);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_16_bits_strategy_3(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_16.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.strategies.insert(3);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_8_bits_strategy_3(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_rgb_8.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.strategies.insert(3);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_4_bits_strategy_3(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_4_should_be_palette_4.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.strategies.insert(3);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_2_bits_strategy_3(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_2_should_be_palette_2.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.strategies.insert(3);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_1_bits_strategy_3(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_1_should_be_palette_1.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.strategies.insert(3);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
377
benches/filters.rs
Normal file
377
benches/filters.rs
Normal file
|
|
@ -0,0 +1,377 @@
|
|||
#![feature(test)]
|
||||
|
||||
extern crate test;
|
||||
extern crate oxipng;
|
||||
|
||||
use oxipng::png;
|
||||
use test::Bencher;
|
||||
use std::collections::HashSet;
|
||||
use std::path::Path;
|
||||
use std::path::PathBuf;
|
||||
|
||||
fn get_opts(input: &Path) -> oxipng::Options {
|
||||
let filter = HashSet::new();
|
||||
let mut compression = HashSet::new();
|
||||
compression.insert(0);
|
||||
let mut memory = HashSet::new();
|
||||
memory.insert(9);
|
||||
let mut strategies = HashSet::new();
|
||||
strategies.insert(0);
|
||||
|
||||
oxipng::Options {
|
||||
backup: false,
|
||||
out_file: input.with_extension("out.png").to_owned(),
|
||||
out_dir: None,
|
||||
stdout: false,
|
||||
pretend: true,
|
||||
recursive: false,
|
||||
fix_errors: false,
|
||||
force: true,
|
||||
clobber: true,
|
||||
create: true,
|
||||
preserve_attrs: false,
|
||||
verbosity: None,
|
||||
filter: filter,
|
||||
interlace: None,
|
||||
compression: compression,
|
||||
memory: memory,
|
||||
strategies: strategies,
|
||||
window: 15,
|
||||
bit_depth_reduction: false,
|
||||
color_type_reduction: false,
|
||||
palette_reduction: false,
|
||||
idat_recoding: true,
|
||||
strip: png::Headers::None,
|
||||
use_heuristics: false,
|
||||
}
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_16_bits_filter_0(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_16.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(0);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_8_bits_filter_0(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_rgb_8.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(0);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_4_bits_filter_0(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_4_should_be_palette_4.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(0);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_2_bits_filter_0(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_2_should_be_palette_2.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(0);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_1_bits_filter_0(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_1_should_be_palette_1.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(0);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_16_bits_filter_1(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_16.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(1);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_8_bits_filter_1(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_rgb_8.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(1);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_4_bits_filter_1(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_4_should_be_palette_4.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(1);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_2_bits_filter_1(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_2_should_be_palette_2.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(1);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_1_bits_filter_1(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_1_should_be_palette_1.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(1);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_16_bits_filter_2(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_16.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(2);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_8_bits_filter_2(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_rgb_8.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(2);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_4_bits_filter_2(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_4_should_be_palette_4.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(2);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_2_bits_filter_2(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_2_should_be_palette_2.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(2);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_1_bits_filter_2(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_1_should_be_palette_1.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(2);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_16_bits_filter_3(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_16.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(3);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_8_bits_filter_3(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_rgb_8.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(3);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_4_bits_filter_3(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_4_should_be_palette_4.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(3);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_2_bits_filter_3(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_2_should_be_palette_2.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(3);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_1_bits_filter_3(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_1_should_be_palette_1.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(3);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_16_bits_filter_4(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_16.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(4);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_8_bits_filter_4(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_rgb_8.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(4);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_4_bits_filter_4(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_4_should_be_palette_4.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(4);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_2_bits_filter_4(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_2_should_be_palette_2.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(4);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_1_bits_filter_4(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_1_should_be_palette_1.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(4);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_16_bits_filter_5(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_16.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(5);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_8_bits_filter_5(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_rgb_8.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(5);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_4_bits_filter_5(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_4_should_be_palette_4.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(5);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_2_bits_filter_5(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_2_should_be_palette_2.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(5);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deflate_1_bits_filter_5(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_1_should_be_palette_1.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.filter.insert(5);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
158
benches/interlacing.rs
Normal file
158
benches/interlacing.rs
Normal file
|
|
@ -0,0 +1,158 @@
|
|||
#![feature(test)]
|
||||
|
||||
extern crate test;
|
||||
extern crate oxipng;
|
||||
|
||||
use oxipng::png;
|
||||
use test::Bencher;
|
||||
use std::collections::HashSet;
|
||||
use std::path::Path;
|
||||
use std::path::PathBuf;
|
||||
|
||||
fn get_opts(input: &Path) -> oxipng::Options {
|
||||
let mut filter = HashSet::new();
|
||||
filter.insert(0);
|
||||
let mut compression = HashSet::new();
|
||||
compression.insert(0);
|
||||
let mut memory = HashSet::new();
|
||||
memory.insert(9);
|
||||
let mut strategies = HashSet::new();
|
||||
strategies.insert(0);
|
||||
|
||||
oxipng::Options {
|
||||
backup: false,
|
||||
out_file: input.with_extension("out.png").to_owned(),
|
||||
out_dir: None,
|
||||
stdout: false,
|
||||
pretend: true,
|
||||
recursive: false,
|
||||
fix_errors: false,
|
||||
force: true,
|
||||
clobber: true,
|
||||
create: true,
|
||||
preserve_attrs: false,
|
||||
verbosity: None,
|
||||
filter: filter,
|
||||
interlace: None,
|
||||
compression: compression,
|
||||
memory: memory,
|
||||
strategies: strategies,
|
||||
window: 15,
|
||||
bit_depth_reduction: false,
|
||||
color_type_reduction: false,
|
||||
palette_reduction: false,
|
||||
idat_recoding: true,
|
||||
strip: png::Headers::None,
|
||||
use_heuristics: false,
|
||||
}
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_interlace_16_bits(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_16.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.interlace = Some(1);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_interlace_8_bits(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_rgb_8.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.interlace = Some(1);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_interlace_4_bits(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_4_should_be_palette_4.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.interlace = Some(1);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_interlace_2_bits(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_2_should_be_palette_2.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.interlace = Some(1);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_interlace_1_bits(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_1_should_be_palette_1.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.interlace = Some(1);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deinterlace_16_bits(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/interlaced_rgb_16_should_be_rgb_16.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.interlace = Some(0);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deinterlace_8_bits(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/interlaced_rgb_8_should_be_rgb_8.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.interlace = Some(0);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deinterlace_4_bits(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/interlaced_palette_4_should_be_palette_4.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.interlace = Some(0);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deinterlace_2_bits(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/interlaced_palette_2_should_be_palette_2.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.interlace = Some(0);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_deinterlace_1_bits(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/interlaced_palette_1_should_be_palette_1.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.interlace = Some(0);
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
268
benches/reductions.rs
Normal file
268
benches/reductions.rs
Normal file
|
|
@ -0,0 +1,268 @@
|
|||
#![feature(test)]
|
||||
|
||||
extern crate test;
|
||||
extern crate oxipng;
|
||||
|
||||
use oxipng::png;
|
||||
use test::Bencher;
|
||||
use std::collections::HashSet;
|
||||
use std::path::Path;
|
||||
use std::path::PathBuf;
|
||||
|
||||
fn get_opts(input: &Path) -> oxipng::Options {
|
||||
let mut filter = HashSet::new();
|
||||
filter.insert(0);
|
||||
let mut compression = HashSet::new();
|
||||
compression.insert(0);
|
||||
let mut memory = HashSet::new();
|
||||
memory.insert(9);
|
||||
let mut strategies = HashSet::new();
|
||||
strategies.insert(0);
|
||||
|
||||
oxipng::Options {
|
||||
backup: false,
|
||||
out_file: input.with_extension("out.png").to_owned(),
|
||||
out_dir: None,
|
||||
stdout: false,
|
||||
pretend: true,
|
||||
recursive: false,
|
||||
fix_errors: false,
|
||||
force: true,
|
||||
clobber: true,
|
||||
create: true,
|
||||
preserve_attrs: false,
|
||||
verbosity: None,
|
||||
filter: filter,
|
||||
interlace: None,
|
||||
compression: compression,
|
||||
memory: memory,
|
||||
strategies: strategies,
|
||||
window: 15,
|
||||
bit_depth_reduction: false,
|
||||
color_type_reduction: false,
|
||||
palette_reduction: false,
|
||||
idat_recoding: true,
|
||||
strip: png::Headers::None,
|
||||
use_heuristics: false,
|
||||
}
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_16_to_8_bits(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_rgb_8.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.bit_depth_reduction = true;
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_8_to_4_bits(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_8_should_be_palette_4.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.bit_depth_reduction = true;
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_8_to_2_bits(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_8_should_be_palette_2.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.bit_depth_reduction = true;
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_8_to_1_bits(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_8_should_be_palette_1.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.bit_depth_reduction = true;
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_4_to_2_bits(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_4_should_be_palette_2.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.bit_depth_reduction = true;
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_4_to_1_bits(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_4_should_be_palette_1.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.bit_depth_reduction = true;
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_2_to_1_bits(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_2_should_be_palette_1.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.bit_depth_reduction = true;
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_rgba_to_rgb_16(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgba_16_should_be_rgb_16.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.color_type_reduction = true;
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_rgba_to_rgb_8(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgba_8_should_be_rgb_8.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.color_type_reduction = true;
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_rgba_to_grayscale_alpha_16(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgba_16_should_be_grayscale_alpha_16.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.color_type_reduction = true;
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_rgba_to_grayscale_alpha_8(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgba_8_should_be_grayscale_alpha_8.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.color_type_reduction = true;
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_rgba_to_grayscale_16(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgba_16_should_be_grayscale_16.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.color_type_reduction = true;
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_rgba_to_grayscale_8(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgba_8_should_be_grayscale_8.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.color_type_reduction = true;
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_rgb_to_grayscale_16(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_16_should_be_grayscale_16.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.color_type_reduction = true;
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_rgb_to_grayscale_8(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_grayscale_8.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.color_type_reduction = true;
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_rgba_to_palette_8(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgba_8_should_be_palette_8.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.color_type_reduction = true;
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_rgb_to_palette_8(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/rgb_8_should_be_palette_8.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.color_type_reduction = true;
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_palette_duplicate_reduction(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_should_be_reduced_with_dupes.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.palette_reduction = true;
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_palette_unused_reduction(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_should_be_reduced_with_unused.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.palette_reduction = true;
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
|
||||
#[bench]
|
||||
fn bench_palette_full_reduction(b: &mut Bencher) {
|
||||
let input = test::black_box(PathBuf::from("tests/files/palette_should_be_reduced_with_both.png"));
|
||||
let mut opts = get_opts(&input);
|
||||
opts.palette_reduction = true;
|
||||
|
||||
b.iter(|| {
|
||||
oxipng::optimize(&input, &opts).ok();
|
||||
});
|
||||
}
|
||||
Loading…
Reference in a new issue