Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[rust] Take paired percentiles from one buffer

laurenspriem5c4051b74d71
diff --git a/rust/crates/ml/src/cv/mod.rs b/rust/crates/ml/src/cv/mod.rs
index 94de859379..81882e6b4b 100644
--- a/rust/crates/ml/src/cv/mod.rs
+++ b/rust/crates/ml/src/cv/mod.rs
@@ -32,6 +32,7 @@ pub(crate) use morph::{morphology_close, morphology_erode, morphology_open};
pub(crate) use resize::{Interp, resize_f32, resize_u8};
pub(crate) use stats::{
hist_256_f32, hist_256_u8, mean_f32, mean_u8c3_masked, min_max_loc_f32, percentile_f32,
+ percentile_pair_f32,
};
pub(crate) use structuring::ellipse_kernel;
pub(crate) use transform::rotate_u8;
diff --git a/rust/crates/ml/src/cv/stats.rs b/rust/crates/ml/src/cv/stats.rs
index 9cd47a50dc..7e433e7fcc 100644
--- a/rust/crates/ml/src/cv/stats.rs
+++ b/rust/crates/ml/src/cv/stats.rs
@@ -75,12 +75,24 @@ pub(crate) fn hist_256_f32(src: &ImageF32) -> OpResult<Vec<f64>> {
Ok(bins.iter().map(|&c| c as f64).collect())
}
+fn nth(values: &mut [f32], p: f64) -> f32 {
+ let index = ((values.len() as f64 * p) as usize).min(values.len() - 1);
+ let (_, value, _) = values.select_nth_unstable_by(index, f32::total_cmp);
+ *value
+}
+
pub(crate) fn percentile_f32(src: &ImageF32, p: f64) -> OpResult<f32> {
let mut values = src.data.clone();
if values.is_empty() {
return Err("percentile_f32: empty image".to_string());
}
- let index = ((values.len() as f64 * p) as usize).min(values.len() - 1);
- let (_, value, _) = values.select_nth_unstable_by(index, f32::total_cmp);
- Ok(*value)
+ Ok(nth(&mut values, p))
+}
+
+pub(crate) fn percentile_pair_f32(src: &ImageF32, low: f64, high: f64) -> OpResult<(f32, f32)> {
+ let mut values = src.data.clone();
+ if values.is_empty() {
+ return Err("percentile_pair_f32: empty image".to_string());
+ }
+ Ok((nth(&mut values, low), nth(&mut values, high)))
}
diff --git a/rust/crates/ml/src/scan/postprocess.rs b/rust/crates/ml/src/scan/postprocess.rs
index 6d0cc8d2fd..b08113e8f2 100644
--- a/rust/crates/ml/src/scan/postprocess.rs
+++ b/rust/crates/ml/src/scan/postprocess.rs
@@ -188,8 +188,8 @@ fn enhance_grayscale_image(img: &ImageU8) -> OpResult<ImageU8> {
retinex.map_mut(f32::exp);
- let p_low = cv::percentile_f32(&retinex, 0.004)? as f64;
- let p_high = cv::percentile_f32(&retinex, 0.99)? as f64;
+ let (p_low, p_high) = cv::percentile_pair_f32(&retinex, 0.004, 0.99)?;
+ let (p_low, p_high) = (p_low as f64, p_high as f64);
let scale = if p_high > p_low {
255.0 / (p_high - p_low)
} else {
@@ -208,8 +208,8 @@ fn enhance_grayscale_image(img: &ImageU8) -> OpResult<ImageU8> {
}
let stretched8u = if mode_val >= 254 {
- let g_low = cv::percentile_f32(&gray_f, 0.01)? as f64;
- let g_high = cv::percentile_f32(&gray_f, 0.99)? as f64;
+ let (g_low, g_high) = cv::percentile_pair_f32(&gray_f, 0.01, 0.99)?;
+ let (g_low, g_high) = (g_low as f64, g_high as f64);
let scale = 255.0 / (g_high - g_low + 1e-6);
gray_f.map_to_u8(|v| clamp_255(((v - g_low as f32) as f64 * scale) as f32))
} else {