xvai-loi 0.1.64 → 0.1.65

package/co.txt

@@ -1 +1 @@
-xvaiLoi111325
+xvaiLoi111348

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xvai-loi",
-  "version": "0.1.64",
+  "version": "0.1.65",
   "description": "Loi dung video (Edit Video Tu Dong) nap vao tool Google Flow qua o cam engine/oCam.ts",
   "license": "UNLICENSED",
   "type": "module",

package/xvai-loi.js

@@ -1462,9 +1462,83 @@ function sampleFromLandmarks(t, lm) {
   const eyeY = ((lm[33]?.y ?? face.y) + (lm[263]?.y ?? face.y)) / 2;
   return { t, face, headTop, chin, mouth: bounds(lm, LIPS), eyeY, confidence: 1 };
 }
+var SEG = "https://storage.googleapis.com/mediapipe-models/image_segmenter/selfie_segmenter/float16/latest/selfie_segmenter.tflite";
+var segP = null;
+function napSeg() {
+  if (!segP) segP = (async () => {
+    const imp = new Function("u", "return import(u)"), mod = await imp(CDN + "/vision_bundle.mjs"), v = await mod.FilesetResolver.forVisionTasks(CDN + "/wasm");
+    return mod.ImageSegmenter.createFromOptions(v, { baseOptions: { modelAssetPath: SEG, delegate: "CPU" }, runningMode: "IMAGE", outputConfidenceMasks: true, outputCategoryMask: false });
+  })().catch(() => null);
+  return segP;
+}
+function luoiNguoi(seg2, canvas) {
+  let r = null;
+  try {
+    r = seg2.segment(canvas);
+  } catch (e) {
+    return null;
+  }
+  const m = r && r.confidenceMasks && r.confidenceMasks[0];
+  if (!m) return null;
+  const f2 = m.getAsFloat32Array(), mw = m.width, mh = m.height, g = new Uint8Array(36 * 64);
+  for (let y = 0; y < 64; y++) for (let x = 0; x < 36; x++) {
+    let s = 0, n = 0;
+    for (let yy = Math.floor(y * mh / 64); yy < Math.floor((y + 1) * mh / 64); yy++) for (let xx = Math.floor(x * mw / 36); xx < Math.floor((x + 1) * mw / 36); xx++) {
+      s += f2[yy * mw + xx];
+      n++;
+    }
+    g[y * 36 + x] = n && s / n > 0.5 ? 1 : 0;
+  }
+  try {
+    r.close && r.close();
+  } catch (e) {
+  }
+  return g;
+}
 async function detectOnCanvas(landmarker, canvas, t) {
   const res = landmarker.detect(canvas);
-  return sampleFromLandmarks(t, res && res.faceLandmarks && res.faceLandmarks[0]);
+  let s = sampleFromLandmarks(t, res && res.faceLandmarks && res.faceLandmarks[0]);
+  const seg2 = await napSeg(), g = seg2 ? luoiNguoi(seg2, canvas) : null, W4 = canvas.width, H2 = canvas.height;
+  if (!s.face && g) {
+    let r0 = -1;
+    for (let y = 0; y < 64 && r0 < 0; y++) for (let x = 0; x < 36; x++) if (g[y * 36 + x]) {
+      r0 = y;
+      break;
+    }
+    if (r0 >= 0) {
+      let c0 = 36, c1 = -1, sx = 0, n = 0;
+      for (let y = r0; y < Math.min(64, r0 + 6); y++) for (let x = 0; x < 36; x++) if (g[y * 36 + x]) {
+        c0 = Math.min(c0, x);
+        c1 = Math.max(c1, x);
+        sx += x;
+        n++;
+      }
+      const cx = (sx / Math.max(1, n) + 0.5) / 36, cy = (r0 + 4) / 64, sz = Math.max(0.16 * H2, (c1 - c0 + 1) / 36 * W4 * 2.2), x0 = Math.max(0, cx * W4 - sz / 2), y0 = Math.max(0, cy * H2 - sz / 2), cw = Math.min(W4, x0 + sz) - x0, ch = Math.min(H2, y0 + sz) - y0;
+      if (cw > 8 && ch > 8) {
+        const cv = document.createElement("canvas");
+        cv.width = 480;
+        cv.height = Math.max(2, Math.round(480 * ch / cw));
+        cv.getContext("2d").drawImage(canvas, x0, y0, cw, ch, 0, 0, cv.width, cv.height);
+        const r22 = landmarker.detect(cv), p = r22 && r22.faceLandmarks && r22.faceLandmarks[0];
+        if (p) {
+          s = sampleFromLandmarks(t, p.map((q) => ({ x: (x0 + q.x * cw) / W4, y: (y0 + q.y * ch) / H2 })));
+          s.haiTang = 1;
+        }
+      }
+    }
+  }
+  if (s.face) {
+    let dinh = -1;
+    if (g) {
+      const c0 = Math.floor(s.face.x * 36), c1 = Math.max(c0 + 1, Math.floor((s.face.x + s.face.w) * 36));
+      for (let y = 0; y < 64 && dinh < 0; y++) for (let x = c0; x < c1; x++) if (g[y * 36 + x]) {
+        dinh = y / 64;
+        break;
+      }
+    }
+    s.headTop = dinh >= 0 && dinh < s.face.y + 0.02 ? dinh : Math.max(0, s.face.y - s.face.h * 0.35);
+  }
+  return s;
 }
 async function analyzeFaceMap(src, step = 0.5, cancel = () => false, onStatus = () => {
 }, maxSide = 480) {
@@ -1533,7 +1607,7 @@ async function analyzeFaceMap(src, step = 0.5, cancel = () => false, onStatus =
   video.onseeked = null;
   video.src = "";
   video.load();
-  return { step, width: vw, height: vh, samples, ms: Math.round(performance.now() - t0), engine: "mediapipe-face-landmarker-0.10.20" };
+  return { step, width: vw, height: vh, samples, ms: Math.round(performance.now() - t0), engine: "mediapipe-face-landmarker-0.10.20+mat2" };
 }
 async function faceMapWC(src, step, cancel, onStatus, maxSide, landmarker, t0) {
   onStatus("Nh\u1EADn m\u1EB7t (gi\u1EA3i m\xE3 WebCodecs)\u2026");
@@ -1560,7 +1634,7 @@ async function faceMapWC(src, step, cancel, onStatus, maxSide, landmarker, t0) {
     samples.push(await detectOnCanvas(landmarker, canvas, t));
     if (samples.length % 10 === 0) onStatus("Nh\u1EADn m\u1EB7t " + Math.round(t) + "/" + Math.round(dur) + " s");
   }
-  return { step, width: vw, height: vh, samples, ms: Math.round(performance.now() - t0), engine: "mediapipe-face-landmarker-0.10.20+webcodecs" };
+  return { step, width: vw, height: vh, samples, ms: Math.round(performance.now() - t0), engine: "mediapipe-face-landmarker-0.10.20+webcodecs+mat2" };
 }
 function faceMapSummary(map) {
   const n = map.samples.length, hit2 = map.samples.filter((s) => s.face).length;
@@ -10001,7 +10075,7 @@ function thuLuoi(L, t) {
   }
   return o;
 }
-function luoiNguoi(p, key) {
+function luoiNguoi2(p, key) {
   if (!p || !key) return null;
   key = key._goc || key;
   if (luoiCache.has(key)) return luoiCache.get(key);
@@ -10050,7 +10124,7 @@ function datChuNhan(g, W4, H2, F, giant, chu22, pxG, pxC, kieuG, maxW, tren = 0.
     return r;
   };
   {
-    const L = luoiNguoi(pN, khoaC);
+    const L = luoiNguoi2(pN, khoaC);
     if (L && F) {
       let dinhM = null;
       {
@@ -10368,7 +10442,7 @@ dangKy("cmNen", (g, d, tuoi, W4, H2, nen2, _s, dai2) => {
   const kS = 1;
   let p = (d.bo === "depth" || d.bo === "cut" && !d.anNguoi) && nen2 ? nguoi(nen2, W4, H2) : null;
   if (p && d.bo === "cut" && F) {
-    const L0 = luoiNguoi(p, d);
+    const L0 = luoiNguoi2(p, d);
     if (L0) {
       const c0 = Math.max(0, Math.floor(F[0] * 36)), c1 = Math.min(35, Math.ceil(F[2] * 36)), r0 = Math.max(0, Math.floor(F[1] * 64)), r1 = Math.min(63, Math.ceil(F[3] * 64));
       let n = 0, t = 0;
@@ -10388,7 +10462,7 @@ dangKy("cmNen", (g, d, tuoi, W4, H2, nen2, _s, dai2) => {
     const F7 = phongDinh(F || hopNguoi(p, d), d.z || d.phong || 1);
     if (F7) {
       const t7 = datChuNhan(g, W4, H2, F7, d.giant, String(d.giant || "").indexOf(String.fromCharCode(10)) >= 0 ? "" : d.chu2 || "", 165 * (d.coChu || 1) * H2 / 1920, 96 * H2 / 1920, "giant", 0.76 * W4, d.thanh ? 0.1 : 0.075, p, d, true);
-      const L7 = luoiNguoi(p, d);
+      const L7 = luoiNguoi2(p, d);
       let day7 = 0;
       if (L7) for (let i = 60 * 36; i < 64 * 36; i++) day7 += L7[i];
       if (t7 && day7 >= 4 && (t7.vung === "het-cho" || t7.pxG < 0.6 * 165 * (d.coChu || 1) * H2 / 1920)) d = { ...d, _goc: d._goc || d, bo: "cut" };
@@ -10644,7 +10718,7 @@ dangKy("cmNen", (g, d, tuoi, W4, H2, nen2, _s, dai2) => {
   if (d.ui) theUI(g, d.ui, tuoi, W4, H2, 1);
   if (d.hang) {
     let yh = d.so ? 0.23 : 0.17, kh = 1;
-    const L2 = luoiNguoi(p || (nen2 ? nguoi(nen2, W4, H2) : null), d), F2 = F || (nen2 ? dauCanh(d, nen2, W4, H2) : null);
+    const L2 = luoiNguoi2(p || (nen2 ? nguoi(nen2, W4, H2) : null), d), F2 = F || (nen2 ? dauCanh(d, nen2, W4, H2) : null);
     if (L2 && F2) {
       const tt = d.bo === "cut" && p ? THU_HANG : 1, Lt = tt < 1 ? thuLuoi(L2, tt) : L2, Ft = tt < 1 ? [0.5 + tt * (F2[0] - 0.5), 1 - tt * (1 - F2[1]), 0.5 + tt * (F2[2] - 0.5), 1 - tt * (1 - F2[3])] : F2;
       const nr = Math.ceil(d.hang.length / (d.hang.length > 3 ? 2 : 1)), hb2 = nr * 0.078, c = datKhoiChu({ luoi: Lt, mat: [Ft[0], Ft[1] + 0.25 * (Ft[3] - Ft[1]), Ft[2], Ft[3]], dinh: Ft[1], cam: Ft[3] }, { h: hb2, w: d.hang.length > 3 ? 0.87 : 0.7 }, false, false, void 0, false, W4 / H2, [[0, 0, 1, d.so ? 0.21 : 0.17]]);
@@ -16517,7 +16591,7 @@ var ProEditPanel = (props) => {
     try {
       const heard = await heardWithRetry(cancelled);
       if (cancelled()) return;
-      let faceMap = prior && prior.fingerprint === heard.fingerprint && prior.faceMap && Array.isArray(prior.faceMap.samples) ? prior.faceMap : null;
+      let faceMap = prior && prior.fingerprint === heard.fingerprint && prior.faceMap && Array.isArray(prior.faceMap.samples) && /mat2/.test(String(prior.faceMap.engine || "")) ? prior.faceMap : null;
       if (!faceMap) try {
         const raw = atob(currentScene.videoBase64), bytes = new Uint8Array(raw.length);
         for (let i = 0; i < raw.length; i++) bytes[i] = raw.charCodeAt(i);
@@ -16594,7 +16668,7 @@ var ProEditPanel = (props) => {
       if (!d) {
         const heard = await heardWithRetry(cancelled);
         if (cancelled()) return;
-        let faceMap = prior && prior.fingerprint === heard.fingerprint && prior.faceMap && Array.isArray(prior.faceMap.samples) ? prior.faceMap : null;
+        let faceMap = prior && prior.fingerprint === heard.fingerprint && prior.faceMap && Array.isArray(prior.faceMap.samples) && /mat2/.test(String(prior.faceMap.engine || "")) ? prior.faceMap : null;
         if (!faceMap) try {
           const raw = atob(currentScene.videoBase64), bytes = new Uint8Array(raw.length);
           for (let i = 0; i < raw.length; i++) bytes[i] = raw.charCodeAt(i);
@@ -20536,7 +20610,7 @@ async function napLoi(d) {
     return "LOI: " + String(e && e.message || e).slice(0, 300);
   }
 }
-var LOI_URL = "https://cdn.jsdelivr.net/npm/xvai-loi@0.1.63/nap.js";
+var LOI_URL = "https://cdn.jsdelivr.net/npm/xvai-loi@0.1.64/nap.js";
 var TRONG_LOI = !!globalThis.__xvaiReact;
 try {
   if (!TRONG_LOI) setTimeout(() => {
@@ -20566,7 +20640,7 @@ function datCauLenh(a) {
   on2 = true;
   window.addEventListener("message", async (ev) => {
     const d = ev.data;
-    if (!d || d.xvaiLoi111325 !== true) return;
+    if (!d || d.xvaiLoi111348 !== true) return;
     const o = String(ev.origin || "");
     if (!(o.indexOf("https://flow.google.com") === 0 || o.indexOf("https://labs.google") === 0)) return;
     const tra = (kq) => {