danvics/oxipng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make better use of estimated_output_size

Browse source
This commit is contained in:
Andrew 2023-05-07 19:58:37 +12:00
parent 9a500941d8
commit cf772a9778
1 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/lib.rs
View file

@ -564,7 +564,12 @@ fn optimize_png(
// Do this first so that reductions can ignore certain chunks such as bKGD // Do this first so that reductions can ignore certain chunks such as bKGD
perform_strip(png, opts); perform_strip(png, opts);
if let Some(new_png) = optimize_raw(png.raw.clone(), opts, deadline, Some(idat_original_size)) { let max_size = if opts.force {
None
} else {
Some(png.estimated_output_size())
};
if let Some(new_png) = optimize_raw(png.raw.clone(), opts, deadline, max_size) {
png.raw = new_png.raw; png.raw = new_png.raw;
png.idat_data = new_png.idat_data; png.idat_data = new_png.idat_data;
} }
@ -611,7 +616,7 @@ fn optimize_raw(
mut png: Arc<PngImage>, mut png: Arc<PngImage>,
opts: &Options, opts: &Options,
deadline: Arc<Deadline>, deadline: Arc<Deadline>,
max_idat_size: Option<usize>, max_size: Option<usize>,
) -> Option<PngData> { ) -> Option<PngData> {
// Must use normal (lazy) compression, as faster ones (greedy) are not representative // Must use normal (lazy) compression, as faster ones (greedy) are not representative
let eval_compression = 5; let eval_compression = 5;
@ -673,15 +678,10 @@ fn optimize_raw(
}; };
if trial.compression > 0 && trial.compression <= eval_compression { if trial.compression > 0 && trial.compression <= eval_compression {
// No further compression required // No further compression required
let idat_data = eval_result.image.idat_data; Some((trial, eval_result.image.idat_data))
if opts.force || idat_data.len() < max_idat_size.unwrap_or(usize::MAX) {
Some((trial, idat_data))
} else {
None
}
} else { } else {
debug!("Trying: {}", trial.filter); debug!("Trying: {}", trial.filter);
let best_size = AtomicMin::new(if opts.force { None } else { max_idat_size }); let best_size = AtomicMin::new(max_size);
perform_trial(&eval_result.image.filtered, opts, trial, &best_size) perform_trial(&eval_result.image.filtered, opts, trial, &best_size)
} }
} else { } else {
@ -712,7 +712,7 @@ fn optimize_raw(
debug!("Trying: {} filters", results.len()); debug!("Trying: {} filters", results.len());
let best_size = AtomicMin::new(if opts.force { None } else { max_idat_size }); let best_size = AtomicMin::new(max_size);
let results_iter = results.into_par_iter().with_max_len(1); let results_iter = results.into_par_iter().with_max_len(1);
let best = results_iter.filter_map(|trial| { let best = results_iter.filter_map(|trial| {
if deadline.passed() { if deadline.passed() {
@ -730,34 +730,37 @@ fn optimize_raw(
}) })
}; };
if let Some((opts, idat_data)) = best { if let Some((trial, idat_data)) = best {
debug!("Found better combination:"); let image = PngData {
debug!(
" zc = {} f = {:8} {} bytes",
opts.compression,
opts.filter,
idat_data.len()
);
return Some(PngData {
raw: png, raw: png,
// The filtered data has not been retained here, but we don't need to return it // The filtered data has not been retained here, but we don't need to return it
filtered: vec![], filtered: vec![],
idat_data, idat_data,
}); };
if image.estimated_output_size() < max_size.unwrap_or(usize::MAX) {
debug!("Found better combination:");
debug!(
" zc = {} f = {:8} {} bytes",
trial.compression,
trial.filter,
image.idat_data.len()
);
return Some(image);
}
} }
} else if let Some(result) = eval_result { } else if let Some(result) = eval_result {
// If idat_recoding is off and reductions were attempted but ended up choosing the baseline, // If idat_recoding is off and reductions were attempted but ended up choosing the baseline,
// we should still check if the evaluator compressed the baseline smaller than the original. // we should still check if the evaluator compressed the baseline smaller than the original.
let idat_data = &result.image.idat_data; let image = result.image;
if idat_data.len() < max_idat_size.unwrap_or(usize::MAX) { if image.estimated_output_size() < max_size.unwrap_or(usize::MAX) {
debug!("Found better combination:"); debug!("Found better combination:");
debug!( debug!(
" zc = {} f = {:8} {} bytes", " zc = {} f = {:8} {} bytes",
eval_compression, eval_compression,
result.filter, result.filter,
idat_data.len() image.idat_data.len()
); );
return Some(result.image); return Some(image);
} }
} }