Skip to content

EffectCraft: An open-source motion graphics and compositing tool written by scratch in pure Rust

Merge upstream/main into trkx-face-polygon-rows

vangel76130298ef8215
diff --cc crates/track/src/face.rs
index d2dd2e577,b65dc3d81..708a05c4f
--- a/crates/track/src/face.rs
+++ b/crates/track/src/face.rs
@@@ -797,6 -778,59 +823,53 @@@ impl FaceTracker
Some(fit)
}
+ /// Connected dark features inside the fitted face, in normalized face coordinates.
+ fn feature_blobs(&self, frame: &Frame, win: &Window, skin: &[bool], luma: &[f32], outline: &[[f64; 2]], geometry: FaceGeometry) -> Vec<Blob> {
+ let FaceGeometry { center, height: b, roll } = geometry;
+ let (w, h) = (win.w, win.h);
+ // Non-skin components inside the face outline (shrunk a little: anti-aliased edges).
+ let inner: Vec<[f64; 2]> = outline.iter().map(|p| [center[0] + 0.9 * (p[0] - center[0]), center[1] + 0.9 * (p[1] - center[1])]).collect();
- let mut feat = vec![false; w * h];
- for j in 0..h {
- for i in 0..w {
- if !skin[j * w + i] && crate::mask::inside_polygon(&inner, win.layer(frame, i, j)) {
- feat[j * w + i] = true;
- }
- }
- }
++ let feat = non_skin_inside(&inner, skin, |i, j| win.layer(frame, i, j), w, h);
+ let min_area = (0.0006 * b * b).max(2.0) as usize;
+ let mut seen = vec![false; w * h];
+ let mut blobs: Vec<Blob> = vec![];
+ let skin_luma = self.skin.med[0] as f64;
++ let to_face = face_mapper(center, b, roll);
+ for j0 in 0..h {
+ for i0 in 0..w {
+ if !feat[j0 * w + i0] || seen[j0 * w + i0] {
+ continue;
+ }
+ let mut st = vec![(i0, j0)];
+ seen[j0 * w + i0] = true;
+ let mut pts = vec![];
+ while let Some((i, j)) = st.pop() {
- let q = to_face(center, b, roll, win.layer(frame, i, j));
++ let q = to_face(win.layer(frame, i, j));
+ pts.push((q, skin_luma - luma[j * w + i] as f64));
+ for dj in -1i64..=1 {
+ for di in -1i64..=1 {
+ let (a, c) = (i as i64 + di, j as i64 + dj);
+ if a < 0 || c < 0 || a as usize >= w || c as usize >= h {
+ continue;
+ }
+ let (a, c) = (a as usize, c as usize);
+ if feat[c * w + a] && !seen[c * w + a] {
+ seen[c * w + a] = true;
+ st.push((a, c));
+ }
+ }
+ }
+ }
+ if pts.len() >= min_area {
+ let n = pts.len() as f64;
+ let centroid = [pts.iter().map(|p| p.0[0]).sum::<f64>() / n, pts.iter().map(|p| p.0[1]).sum::<f64>() / n];
+ blobs.push(Blob { pts, centroid });
+ }
+ }
+ }
+ blobs
+ }
+
fn fit(&self, frame: &Frame) -> Option<FaceFit> {
let pv = &self.prev;
let b0 = pv.height;