xvai-loi 0.1.63 → 0.1.65

package/co.txt

@@ -1 +1 @@
-xvaiLoi111249
+xvaiLoi111348

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xvai-loi",
-  "version": "0.1.63",
+  "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]]);
@@ -10765,11 +10839,17 @@ dangKy("cmAnh", (g, d, tuoi, W4, H2, _n, _s, dai2) => {
           wK2 = 0.76 * W4;
           yK = (c.y - hK * c.k / 2 + 0.575 * 112 / 1920 * c.k) * H2;
         } else {
+          let rT = 64;
+          for (let r = 0; r < 64 && rT === 64; r++) {
+            let m = 0;
+            for (let cc = 4; cc < 32; cc++) m += LA[r * 36 + cc];
+            if (m >= 3) rT = r;
+          }
           const ph = (y0) => {
             let n = 0, t = 0;
             for (let r = Math.floor(y0 * 64); r < Math.min(64, Math.ceil((y0 + hK) * 64)); r++) for (let cc = 4; cc < 32; cc++) {
               t++;
-              n += LA[r * 36 + cc];
+              n += LA[r * 36 + cc] * (r >= rT && r < rT + 16 ? 4 : 1);
             }
             return t ? n / t : 1;
           };
@@ -10784,7 +10864,7 @@ dangKy("cmAnh", (g, d, tuoi, W4, H2, _n, _s, dai2) => {
     if (d.chu2) chu2(g, d.chu2, xK, yK + 125 * kK * H2 / 1920 + (1 - k) * 70 * H2 / 1920, 96 * kK * H2 / 1920, d.do2 ? "do" : "vang", kep12((tuoi - 0.35) / 0.15) * kc, wK2);
   }
   if (d.pip && _n) {
-    const bw = 0.36 * W4, bh = bw * 1.2, bx = 0.06 * W4, by = 0.555 * H2 + (1 - eOut(Math.min(1, tuoi / 0.35))) * 0.05 * H2, F = d.F, Dm = dauCanh(d, _n, W4, H2), Fd = F && F[3] - F[1] > 0.45 ? F : Dm || F, top = Fd ? Fd[1] : 0.2, cam = Fd ? Math.max(Fd[3], top + 0.12) : 0.6, s = Math.max(bw / W4, bh / H2, Math.min(1.6, 0.54 * bh / (Math.max(0.08, cam - top) * H2))), cx0 = Fd ? (Fd[0] + Fd[2]) / 2 : 0.5, MK = globalThis.__matKhung, kd = d._goc || d, cx = MK ? kd.__pipCx = kd.__pipCx == null ? (MK[0] + MK[2]) / 2 : kd.__pipCx + ((MK[0] + MK[2]) / 2 - kd.__pipCx) * 0.12 : cx0;
+    const bw = 0.36 * W4, bh = bw * 1.2, bx = 0.06 * W4, by = 0.555 * H2 + (1 - eOut(Math.min(1, tuoi / 0.35))) * 0.05 * H2, F = d.F, Dm = dauCanh(d, _n, W4, H2), Fd = F && F[3] - F[1] > 0.45 ? F : Dm || F || globalThis.__matNguon, top = Fd ? Fd[1] : 0.2, cam = Fd ? Math.max(Fd[3], top + 0.12) : 0.6, s = Math.max(bw / W4, bh / H2, Math.min(1.6, 0.54 * bh / (Math.max(0.08, cam - top) * H2))), cx0 = Fd ? (Fd[0] + Fd[2]) / 2 : 0.5, MK = globalThis.__matKhung, kd = d._goc || d, cx = MK ? kd.__pipCx = kd.__pipCx == null ? (MK[0] + MK[2]) / 2 : kd.__pipCx + ((MK[0] + MK[2]) / 2 - kd.__pipCx) * 0.12 : cx0;
     hop3(g, "nguoi:pip", bx, by, bx + bw, by + bh);
     globalThis.__pipO = { k: globalThis.__khungSo, b: [bx, 0.555 * H2, bx + bw, 0.555 * H2 + bh] };
     g.save();
@@ -11702,7 +11782,7 @@ function lapCuongMe(o) {
     if (x.kieu === "anh" && dV) {
       de(f2, dV, { uuTien: UT.so + 5, bo: "anh", ten: ten2, chu: chuK, chu2: chu22, keu: "whoosh", video: 1 }, 3, datAnh);
       ghiL("video", { bo: "anh", f: f2, d: dV }, "kho video: ung vien clip " + dV.toFixed(1) + " s thay anh: " + String(x.tu || ""));
-    } else if (x.kieu === "anh") de(f2, (f2 < f1 ? 2 : 2.4) * kTram(), { uuTien: UT.anh, ...co ? [{ bo: "anh", ten: ten2, chu: chuK, chu2: chu22, keu: "whoosh" }, { bo: "chia", ten: ten2, chu: chuK, keu: "whoosh" }, { bo: "anh", ten: ten2, chu: chuK, chu2: chu22, pip: 1, keu: "whoosh" }][nAnh++ % 3] : { bo: "kinh", dong: [chuK, chu22].filter(Boolean), keu: "whoosh" } }, 3, datAnh);
+    } else if (x.kieu === "anh" && (co || chuK)) de(f2, (f2 < f1 ? 2 : 2.4) * kTram(), { uuTien: UT.anh, ...co ? [{ bo: "anh", ten: ten2, chu: chuK, chu2: chu22, keu: "whoosh" }, { bo: "chia", ten: ten2, chu: chuK, keu: "whoosh" }, { bo: "anh", ten: ten2, chu: chuK, chu2: chu22, pip: 1, keu: "whoosh" }][nAnh++ % 3] : { bo: "kinh", dong: [chuK, chu22].filter(Boolean), keu: "whoosh" } }, 3, datAnh);
     else if (x.kieu === "vat") {
       const LG = timLogo(suaChu(chuK + " " + sach2(String(x.tu || ""))))[0];
       if (LG) napHinhLogo(LG.slug);
@@ -14262,6 +14342,7 @@ async function renderNhanh(ff, clips, files, audio, cards, nen2, options, paint,
         }
         {
           globalThis.__matKhung = null;
+          globalThis.__matNguon = null;
           if (FM.length) {
             const ts2 = c.trimStart + u;
             let m = FM[0];
@@ -14269,6 +14350,7 @@ async function renderNhanh(ff, clips, files, audio, cards, nen2, options, paint,
             if (Math.abs(m.t - ts2) < 0.6) {
               const mx = (nx) => (((W4 - sw * c0) / 2 + nx * sw * c0 - sx) * z - dx) / q / W4, my = (ny) => (((H2 - sh * c0) / 2 + ny * sh * c0 - sy) * z - dy) / q / H2, top = typeof m.headTop === "number" ? Math.min(m.headTop, m.face.y) : m.face.y, cam = typeof m.chin === "number" && m.chin > m.face.y ? m.chin : m.face.y + m.face.h;
               globalThis.__matKhung = [mx(m.face.x), my(top), mx(m.face.x + m.face.w), my(cam)];
+              globalThis.__matNguon = [m.face.x, top, m.face.x + m.face.w, cam];
             }
           }
         }
@@ -16509,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);
@@ -16586,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);
@@ -18761,7 +18843,7 @@ async function handleExport(currentProject, setExporting, setExportedBlob, addLo
           }
           return -1;
         };
-        const moc = kb.canh.filter((c) => c && (c.kieu === "anh" || c.kieu === "vat")).map((c) => timTu(c.tu)).filter((i) => i >= 0).map((i) => W4[i].t0).sort((x, y) => x - y), pts = [W4[0].t0 + 3, ...moc, W4[W4.length - 1].t1 - 3];
+        const moc = kb.canh.filter((c) => c && c.tu).map((c) => timTu(c.tu)).filter((i) => i >= 0).map((i) => W4[i].t0).sort((x, y) => x - y), pts = [W4[0].t0 + 3, ...moc, W4[W4.length - 1].t1 - 3];
         let them = 0;
         for (let k = 0; k + 1 < pts.length && them < 8; k++) {
           const a0 = pts[k], b0 = pts[k + 1];
@@ -18773,7 +18855,7 @@ async function handleExport(currentProject, setExporting, setExportedBlob, addLo
             while (i >= 0 && i < i0 + 5 && i < W4.length - 3 && HU4.test(String(W4[i].text).replace(/[.,!?;:…"“”]/g, ""))) i++;
             if (i < 0 || i + 3 > W4.length) continue;
             const tu = W4.slice(i, i + 3).map((w) => String(w.text).replace(/[.,!?;:…"“”]/g, "")).join(" "), cau = W4.slice(Math.max(0, i - 5), i + 10).map((w) => w.text).join(" ");
-            kb.canh.push({ tu, kieu: "anh", chu: W4.slice(i, i + 6).map((w) => String(w.text).replace(/[.,!?;:…"“”]/g, "")).filter((x) => !HU4.test(x)).slice(0, 3).join(" ").toLocaleUpperCase("vi"), chu2: "", en: 'Cinematic photorealistic vertical photo that illustrates the meaning of this Vietnamese sentence: "' + cau + '". Vietnamese people, real everyday setting, natural light, no text, no captions.' });
+            kb.canh.push({ tu, kieu: "anh", chu: " ", chu2: "", en: 'Cinematic photorealistic vertical photo that illustrates the meaning of this Vietnamese sentence: "' + cau + '". Vietnamese people, real everyday setting, natural light, no text, no captions.' });
             them++;
           }
         }
@@ -20528,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.62/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(() => {
@@ -20558,7 +20640,7 @@ function datCauLenh(a) {
   on2 = true;
   window.addEventListener("message", async (ev) => {
     const d = ev.data;
-    if (!d || d.xvaiLoi111249 !== 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) => {