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

Add evaluation reporting at trace level

Browse source
This commit is contained in:
Andrew 2023-05-06 11:41:30 +12:00
parent 59f88e705d
commit 47cad1583a
1 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/evaluate.rs
View file

@ -9,9 +9,11 @@ use crate::png::PngImage;
#[cfg(not(feature = "parallel"))] #[cfg(not(feature = "parallel"))]
use crate::rayon; use crate::rayon;
use crate::Deadline; use crate::Deadline;
use crate::PngError;
#[cfg(feature = "parallel")] #[cfg(feature = "parallel")]
use crossbeam_channel::{unbounded, Receiver, Sender}; use crossbeam_channel::{unbounded, Receiver, Sender};
use indexmap::IndexSet; use indexmap::IndexSet;
use log::trace;
use rayon::prelude::*; use rayon::prelude::*;
#[cfg(not(feature = "parallel"))] #[cfg(not(feature = "parallel"))]
use std::cell::RefCell; use std::cell::RefCell;
@ -131,9 +133,8 @@ impl Evaluator {
return; return;
} }
let filtered = image.filter_image(filter, optimize_alpha); let filtered = image.filter_image(filter, optimize_alpha);
if let Ok(idat_data) = let idat_data = deflate::deflate(&filtered, compression, &best_candidate_size);
deflate::deflate(&filtered, compression, &best_candidate_size) if let Ok(idat_data) = idat_data {
{
let new = Candidate { let new = Candidate {
image: PngData { image: PngData {
idat_data, idat_data,
@ -144,7 +145,15 @@ impl Evaluator {
is_reduction, is_reduction,
nth, nth,
}; };
best_candidate_size.set_min(new.image.estimated_output_size()); let size = new.image.estimated_output_size();
best_candidate_size.set_min(size);
trace!(
"Eval: {}-bit {:20} {:8} {} bytes",
image.ihdr.bit_depth,
image.ihdr.color_type,
filter,
size
);
#[cfg(feature = "parallel")] #[cfg(feature = "parallel")]
{ {
@ -158,6 +167,14 @@ impl Evaluator {
best => *best = Some(new), best => *best = Some(new),
} }
} }
} else if let Err(PngError::DeflatedDataTooLong(size)) = idat_data {
trace!(
"Eval: {}-bit {:20} {:8} >{} bytes",
image.ihdr.bit_depth,
image.ihdr.color_type,
filter,
size
);
} }
}); });
}); });