xvai-loi 0.1.47 → 0.1.48

package/co.txt

@@ -1 +1 @@
-xvaiLoi101049
+xvaiLoi101118

package/package.json

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

@@ -2174,7 +2174,8 @@ function safeKeepRanges(start, end, silences, words, shorten) {
       tay = [];
     }
     for (const r of tay) {
-      const a = Math.max(start, +r.t0 - 0.03), b = Math.min(end, +r.t1 + 0.03);
+      const dem = Array.isArray(r.ids) ? 0 : 0.03;
+      const a = Math.max(start, +r.t0 - dem), b = Math.min(end, +r.t1 + dem);
       if (b - a >= 0.08) cuts.push({ t0: a, t1: b });
     }
     cuts.sort((x, y) => x.t0 - y.t0);
@@ -10150,7 +10151,7 @@ dangKy("cmAnh", (g, d, tuoi, W4, H2, _n, _s, dai2) => {
     g.fillStyle = "rgba(0,0,0," + (0.22 * kc).toFixed(3) + ")";
     g.fillRect(0, 0, W4, H2);
     const k = eOut(tuoi / 0.28);
-    const cxK = d.pip && _n ? 0.68 * W4 : W4 / 2, wK = d.pip && _n ? 0.56 * W4 : 0.88 * W4;
+    const cxK = d.pip && _n ? 0.7 * W4 : W4 / 2, wK = d.pip && _n ? 0.5 * W4 : 0.88 * W4;
     chu2(g, d.chu, cxK, 0.6 * H2 + (1 - k) * 70 * H2 / 1920, 112 * H2 / 1920, d.do1 ? "do" : "kw", kep12(tuoi / 0.15) * kc, wK);
     if (d.chu2) chu2(g, d.chu2, cxK, 0.6 * H2 + 125 * H2 / 1920 + (1 - k) * 70 * H2 / 1920, 96 * H2 / 1920, d.do2 ? "do" : "vang", kep12((tuoi - 0.35) / 0.15) * kc, wK);
   }
@@ -11862,6 +11863,68 @@ function lapCuongMe(o) {
           lanCuoi[ten2] = x.f;
           nThem++;
         }
+        {
+          const bd2 = (t) => boDau2(String(t || "").toLocaleLowerCase("vi"));
+          const wt = W22.map((w) => bd2(w.t));
+          let nB = 0;
+          const ly = [];
+          G4.__n4bLy = ly;
+          for (const ten2 of chuaDung.filter((t) => t.indexOf("anh:") === 0)) {
+            const cum3 = bd2(ten2.slice(4)).split(/[^a-z0-9]+/).filter(Boolean);
+            if (cum3.length < 2) {
+              ly.push([ten2, "cum<2"]);
+              continue;
+            }
+            let k = -1;
+            for (let i = 0; i + cum3.length <= wt.length; i++) if (cum3.every((c, j) => wt[i + j] === c)) {
+              k = i;
+              break;
+            }
+            if (k < 0) {
+              ly.push([ten2, "khong thay cum", cum3.join(" ")]);
+              continue;
+            }
+            const f2 = W22[k].f;
+            if (f2 < 1.2) {
+              ly.push([ten2, "f<1,2", f2]);
+              continue;
+            }
+            const de2 = sp.filter((x) => x.f < f2 + 1.8 && x.f + x.d > f2 && x.bo !== "phong");
+            if (de2.some((x) => x.khoa || x.hang || x.doc || ["card", "chia", "kinh", "anh", "toi"].indexOf(x.bo) >= 0)) {
+              ly.push([ten2, "chan", f2, de2.map((x) => x.bo).join(",")]);
+              continue;
+            }
+            const dd = de2.find((x) => x.bo === "depth" && (x.giant || x.chu) && Math.abs(x.f - f2) < 1.2);
+            if (dd) {
+              ghiL("doi", dd, "N4b: depth -> anh " + ten2);
+              dd.bo = "anh";
+              dd.ten = ten2;
+              dd.chu = String(dd.giant || dd.chu || "").split(String.fromCharCode(10)).join(" ");
+              dd.giant = "";
+            } else {
+              if (de2.some((x) => x.bo === "depth" && f2 - x.f < 1.2)) {
+                ly.push([ten2, "depth sat", f2]);
+                continue;
+              }
+              for (const x of de2) {
+                if (f2 - x.f >= 1) x.d = +(f2 - x.f - 0.05).toFixed(2);
+                else {
+                  const j = sp.indexOf(x);
+                  if (j >= 0 && !(x.giant || x.chu)) sp.splice(j, 1);
+                }
+              }
+              if (!dat(+f2.toFixed(2), 1.8, { uuTien: UT.anh, bo: "anh", ten: ten2, chu: "", keu: "whoosh-nhanh", chuoi: 1 }, 0, 0.01)) {
+                ly.push([ten2, "dat hong", f2]);
+                continue;
+              }
+              ghiL("them", { bo: "anh", f: f2, d: 1.8 }, "N4b anh theo loi " + ten2);
+            }
+            lanCuoi[ten2] = f2;
+            nThem++;
+            nB++;
+          }
+          G4.__n4b = nB;
+        }
         G4.__chuoiTramThem = nThem;
         ghiL("bo", { bo: "chuoi-tram" }, "chuoi tram: them " + nThem + " anh trong " + spans.length + " khoang trong");
         sp.sort((p, q) => p.f - q.f);
@@ -11869,6 +11932,7 @@ function lapCuongMe(o) {
     }
     G4.__lichSp = sp.map((s, i) => ({ i, id: s.id, yChu: s.yChu, coChu: s.coChu, fx: s.fx, stX: s.stX, stY: s.stY, f: +s.f.toFixed(2), d: +s.d.toFixed(2), bo: s.bo, giant: s.giant || "", chu: s.chu || "", chu2: s.chu2 || "", st: s.st || "", ten: s.ten || "", tieu: s.tieu || "", khoa: s.khoa ? 1 : 0 }));
   }
+  const thanhO = (t) => N >= 2 && t >= f1 - 0.1 && t < hetMuc;
   bc = "B7 phat the";
   const stTr = { n: 0 }, keuTr = {};
   let iH = 0;
@@ -11942,10 +12006,10 @@ function lapCuongMe(o) {
       if (LG) {
         napHinhLogo(LG.slug);
         s.logoTo = LG;
-        s.logoY = Math.max(0.12, (s.yChu ?? 0.2) - 0.105);
+        s.logoY = Math.max(thanhO(s.f) ? 0.12 : 0.075, (s.yChu ?? 0.2) - 0.105);
       }
     }
-    if (s.logoTo && !s.logoY && !s.anNguoi) s.logoY = 0.12;
+    if (s.logoTo && !s.logoY && !s.anNguoi) s.logoY = thanhO(s.f) ? 0.12 : 0.1;
     if (s.logoTo) the(a, bT, { loai: "cmSticker", logo: s.logoTo.slug, hex: s.logoTo.hex, x: 0.5, y: s.logoY ?? 0.34, r: s.logoY ? 0.05 : 0.13, tre: 0.12 });
     {
       const st = s.st === "none" ? "" : s.st || "";
@@ -12021,7 +12085,7 @@ function lapCuongMe(o) {
         logo: L.slug,
         hex: L.hex,
         x: de2.length ? 0.88 : 0.5,
-        y: de2.length ? 0.14 : yL,
+        y: de2.length ? thanhO(a0) ? 0.14 : 0.075 : yL,
         /* 10/10 cm59 77–79 s (máy soát nay thấy logo): góc phải y 0,075 đè số '5/6' thanh tiến độ (0,058–0,086) → 0,14 */
         r: de2.length ? 0.05 : 0.085,
         tre: 0
@@ -19467,7 +19531,7 @@ function datCauLenh(a) {
   on2 = true;
   window.addEventListener("message", async (ev) => {
     const d = ev.data;
-    if (!d || d.xvaiLoi101049 !== true) return;
+    if (!d || d.xvaiLoi101118 !== 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) => {
@@ -20153,7 +20217,7 @@ var SuaLich = ({ ten, onDong }) => {
 };
 
 // loi/vo-flow.tsx
-var PHIEN_BAN = "loi-1010AW";
+var PHIEN_BAN = "loi-1010BA";
 var TRONG = () => migrateProject({ id: crypto.randomUUID(), name: "D\u1EF1 \xE1n m\u1EDBi", scenes: [], timeline: [], images: [null, null, null] });
 var nut4 = "px-3 py-1.5 rounded-lg border border-[#2C4A73] text-[11px] font-bold text-[#A2B2C9] hover:text-[#F6D178] hover:border-[#F6D178]/60";
 var Vo = () => {