xvai-loi 0.1.70 → 0.1.72

package/co.txt

@@ -1 +1 @@
-xvaiLoi111714
+xvaiLoi111816

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xvai-loi",
-  "version": "0.1.70",
+  "version": "0.1.72",
   "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

@@ -9854,6 +9854,13 @@ function lapAnhTheoKhuon(kb, ws, K = KHUON_TOPN, toiDa = 12) {
     (c) => c && c.tu && /^(anh|ds)$/.test(String(c.kieu))
     /* 'so' vẽ thành chữ to trên người / ô tròn (cut/tron) — không phải trám */
   ).map((c) => timTu(c.tu)).filter((i) => i >= 0).map((i) => W4[i].t0).filter((t) => t > t0 && t < t1).sort((a, b) => a - b);
+  let noi2 = 0;
+  for (let i = 0; i < W4.length; i++) {
+    if (W4[i].t0 < t0 || W4[i].t1 > t1) continue;
+    noi2 += W4[i].t1 - W4[i].t0 + (i + 1 < W4.length ? Math.min(0.4, Math.max(0, W4[i + 1].t0 - W4[i].t1)) : 0);
+  }
+  const mocDu = kb.canh.filter((c) => c && c.tu && /^(anh|ds|vat)$/.test(String(c.kieu))).map((c) => timTu(c.tu)).filter((i) => i >= 0 && W4[i].t0 > t0 && W4[i].t0 < t1).length;
+  if (mocDu / Math.max(1e-6, noi2 / 60) >= 0.9 * K.tram.phut) return 0;
   const pts = [t0, ...moc, t1];
   let them = 0;
   for (let k = 0; k + 1 < pts.length && them < toiDa; k++) {
@@ -10908,7 +10915,15 @@ dangKy("cmAnh", (g, d, tuoi, W4, H2, _n, _s, dai2) => {
           }
         }
         luoiAnhCache.set(kh, U);
-        matAnhCache.set(kh, loiMatAnh(im, W4, H2));
+        let MA0 = loiMatAnh(im, W4, H2);
+        for (const tt of [0.5, 1, 1.5, 2]) {
+          const im2 = khungTS(d.ten, tt);
+          if (im2 && im2 !== im) {
+            const m2 = loiMatAnh(im2, W4, H2);
+            if (m2) MA0 = MA0 ? [Math.min(MA0[0], m2[0]), Math.min(MA0[1], m2[1]), Math.max(MA0[2], m2[2]), Math.max(MA0[3], m2[3])] : m2;
+          }
+        }
+        matAnhCache.set(kh, MA0);
       }
       const LA = luoiAnhCache.get(kh);
       if (LA) globalThis.__anhLuoi = { k: globalThis.__khungSo, L: LA };
@@ -11464,6 +11479,10 @@ function lapCuongMe(o) {
     the0(a, a + (t1 - t0), d);
   };
   const F = (fa, fb) => matRa(fm, nguon3(fa), nguon3(fb), [0, 0, 0, 0], 1, zc);
+  const tyLeMat = (fa, fb) => {
+    const a0 = nguon3(fa), b0 = nguon3(fb), ss = (fm || []).filter((x) => x && x.t >= a0 && x.t <= b0);
+    return ss.length ? ss.filter((x) => x.face).length / ss.length : 0;
+  };
   const sF = (f2, rong) => f2 ? Math.max(0.8, Math.min(1.35, rong / Math.max(0.1, f2[2] - f2[0]))) : 1;
   napTach();
   const loi2 = " " + ws.map((w) => sach3(w.text).toLocaleLowerCase("vi")).join(" ") + " ";
@@ -11864,7 +11883,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" && (co || chuK)) de(f2, (f2 < f1 ? 2 : 2.4) * kTram(), { uuTien: UT.anh, ...co ? nAnh++ % 3 === 0 || !((fb) => fb && fb[3] - fb[1] < KHUON_TOPN.nguoi.matToiDa)(F(f2, f2 + 2.4)) ? { bo: "anh", ten: ten2, chu: chuK, chu2: chu22, keu: "whoosh" } : (nAnh - 1) % 3 === 1 ? { bo: "chia", ten: ten2, chu: chuK, keu: "whoosh" } : { bo: "anh", ten: ten2, chu: chuK, chu2: chu22, pip: 1, keu: "whoosh" } : { 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 ? ((o2) => x.khuon ? { ...o2, keu: "" } : o2)(nAnh++ % 3 === 0 || !((fb) => fb && fb[3] - fb[1] < KHUON_TOPN.nguoi.matToiDa)(F(f2, f2 + 2.4)) || tyLeMat(f2, f2 + 2.4) < 0.7 ? { bo: "anh", ten: ten2, chu: chuK, chu2: chu22, keu: "whoosh" } : (nAnh - 1) % 3 === 1 ? { bo: "chia", ten: ten2, chu: chuK, keu: "whoosh" } : { bo: "anh", ten: ten2, chu: chuK, chu2: chu22, pip: 1, keu: "whoosh" }) : { bo: "kinh", dong: [chuK, chu22].filter(Boolean), keu: "whoosh" } }, 3, datAnh);
     else if (x.kieu === "vat") {
       const LG = timLogo(suaChu(chuK + " " + sach3(String(x.tu || ""))))[0];
       if (LG) napHinhLogo(LG.slug);
@@ -18394,15 +18413,32 @@ async function chuanBiKho(kb, words, bao) {
   bao?.("AI gh\xE9p " + co.length + " \u1EA3nh / clip c\xF3 s\u1EB5n v\xE0o " + can.length + " c\u1EA3nh theo ngh\u0129a...");
   const chuan = (x) => String(x || "").toLowerCase().normalize("NFD").replace(/[^a-z0-9]/g, "");
   const gTay = {};
+  const lev = (x, y) => {
+    const d = Array.from({ length: y.length + 1 }, (_, j) => j);
+    for (let i = 1; i <= x.length; i++) {
+      let p = d[0];
+      d[0] = i;
+      for (let j = 1; j <= y.length; j++) {
+        const t = d[j];
+        d[j] = Math.min(d[j] + 1, d[j - 1] + 1, p + (x[i - 1] === y[j - 1] ? 0 : 1));
+        p = t;
+      }
+    }
+    return d[y.length];
+  }, daDung = /* @__PURE__ */ new Set();
   for (const c of can) {
     const k = chuan(String(c.khoa).split(":").slice(1).join(":"));
     if (!k) continue;
     const a = co.find((x) => {
-      if (!x.ten) return false;
+      if (!x.ten || daDung.has(x.id)) return false;
       const t = chuan(String(x.ten).replace(/\.[a-z0-9]+$/i, "").replace(/^omni-[a-z0-9]+-\d+-/i, ""));
-      return t === k || t.length >= 8 && /^omni-/i.test(String(x.ten)) && k.indexOf(t) === 0;
+      if (!t) return false;
+      return t === k || t.length >= 6 && (k.indexOf(t) >= 0 || t.indexOf(k) >= 0) && Math.min(t.length, k.length) >= 0.6 * Math.max(t.length, k.length) || Math.min(t.length, k.length) >= 8 && lev(t, k) <= Math.max(1, Math.round(0.12 * Math.max(t.length, k.length)));
     });
-    if (a) gTay[c.khoa] = a.id;
+    if (a) {
+      gTay[c.khoa] = a.id;
+      daDung.add(a.id);
+    }
   }
   const gAI = can.some((c) => !gTay[c.khoa]) ? await ghepKho(can.filter((c) => !gTay[c.khoa]), co.filter((x) => x.mo)) : {};
   const g = { ...gAI, ...gTay };
@@ -18526,7 +18562,7 @@ async function napVideo(b, bao) {
 
 // flow-src/engine/taiSanAI.ts
 var NEN = ", isolated on a plain flat light grey studio background, soft even light, no shadow on background, no text, no watermark, photorealistic";
-var ANH = (x) => "Cinematic photorealistic vertical photo, " + x + ", Vietnamese people and setting, natural light, shallow depth of field, rich detail, no text, no watermark, no logo";
+var ANH = (x, i = 0) => "Cinematic photorealistic vertical photo, " + x + (i % 2 || /no faces/i.test(x) ? ", Vietnamese setting, close-up of objects, hands or place, no faces" : ", Vietnamese people and setting") + ", natural light, shallow depth of field, rich detail, no text, no watermark, no logo";
 var V3D = (x) => "A single glossy 3D render of " + x + ", bold shapes, warm orange and white palette, soft studio light" + NEN;
 var ICON = (x) => "A single glossy 3D icon of " + x + ", premium app-icon style, smooth plastic and metal materials, vivid but tasteful colors, soft studio lighting, subtle reflection, centered, isolated" + NEN;
 var ICON3D = [["xu", "a shiny gold coin with a dollar sign"], ["dongho", "a modern round alarm clock"], ["canh", "a yellow warning triangle with an exclamation mark"], ["tich", "a green rounded check mark badge"], ["sao", "a golden star"], ["tim", "a glossy red heart"], ["bieu", "a rising bar chart with an upward arrow"], ["lua", "a glowing orange fire flame"], ["tenlua", "a small white and red rocket launching upward"], ["bongden", "a glowing yellow light bulb"], ["qua", "a red gift box with a gold ribbon"], ["giohang", "a shopping cart"], ["nha", "a small modern house"], ["sach", "an open book"], ["dienthoai", "a modern smartphone"], ["cup", "a golden trophy cup"], ["khien", "a blue shield with a white check mark"], ["la", "a fresh green leaf"], ["giot", "a clear blue water drop"], ["kinhlup", "a magnifying glass"], ["sai", "a red cross X mark badge"]];
@@ -18673,7 +18709,7 @@ function dsTaiSan(kieu, kb) {
       return 20;
     }
   })();
-  (kb?.canh || []).filter((c) => c && c.tu && c.en && (c.kieu === "anh" || c.kieu === "vat")).slice(0, TRAN_ANH).forEach((c) => ds2.push([c.kieu + ":" + String(c.tu).toLocaleLowerCase("vi"), c.kieu === "anh" ? ANH(String(c.en).slice(0, 220)) : V3D(String(c.en).slice(0, 120)), c.kieu === "anh" ? "9:16" : "1:1"]));
+  (kb?.canh || []).filter((c) => c && c.tu && c.en && (c.kieu === "anh" || c.kieu === "vat")).slice(0, TRAN_ANH).forEach((c, i) => ds2.push([c.kieu + ":" + String(c.tu).toLocaleLowerCase("vi"), c.kieu === "anh" ? ANH(String(c.en).slice(0, 220), i) : V3D(String(c.en).slice(0, 120)), c.kieu === "anh" ? "9:16" : "1:1"]));
   ICON3D.forEach(([k, v]) => ds2.push(["st3d:" + k, ICON(v), "1:1"]));
   return ds2;
 }
@@ -20707,7 +20743,7 @@ function datCauLenh(a) {
   on2 = true;
   window.addEventListener("message", async (ev) => {
     const d = ev.data;
-    if (!d || d.xvaiLoi111714 !== true) return;
+    if (!d || d.xvaiLoi111816 !== 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) => {