xvai-loi 0.1.51 → 0.1.52

package/co.txt

@@ -1 +1 @@
-xvaiLoi101326
+xvaiLoi101845

package/package.json

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

@@ -1475,21 +1475,26 @@ async function analyzeFaceMap(src, step = 0.5, cancel = () => false, onStatus =
   video.muted = true;
   video.preload = "auto";
   video.playsInline = true;
-  await new Promise((ok, err) => {
-    const timer = setTimeout(() => {
-      vd209c("faceMap", "loadeddata", 6e4);
-      err(new Error("N\u1EA1p video \u0111\u1EC3 nh\u1EADn m\u1EB7t qu\xE1 60 s."));
-    }, 6e4);
-    video.onloadeddata = () => {
-      clearTimeout(timer);
-      ok();
-    };
-    video.onerror = () => {
-      clearTimeout(timer);
-      err(new Error("Kh\xF4ng m\u1EDF \u0111\u01B0\u1EE3c video \u0111\u1EC3 nh\u1EADn m\u1EB7t."));
-    };
-    video.src = src;
-  });
+  try {
+    await new Promise((ok, err) => {
+      const timer = setTimeout(() => {
+        vd209c("faceMap", "loadeddata", 12e3);
+        err(new Error("N\u1EA1p video \u0111\u1EC3 nh\u1EADn m\u1EB7t qu\xE1 12 s."));
+      }, 12e3);
+      video.onloadeddata = () => {
+        clearTimeout(timer);
+        ok();
+      };
+      video.onerror = () => {
+        clearTimeout(timer);
+        err(new Error("Kh\xF4ng m\u1EDF \u0111\u01B0\u1EE3c video \u0111\u1EC3 nh\u1EADn m\u1EB7t."));
+      };
+      video.src = src;
+    });
+  } catch (e) {
+    video.src = "";
+    return await faceMapWC(src, step, cancel, onStatus, maxSide, landmarker, t0);
+  }
   const scale = Math.min(1, maxSide / Math.max(video.videoWidth, video.videoHeight));
   const canvas = document.createElement("canvas");
   canvas.width = Math.max(2, Math.round(video.videoWidth * scale));
@@ -1530,6 +1535,33 @@ async function analyzeFaceMap(src, step = 0.5, cancel = () => false, onStatus =
   video.load();
   return { step, width: vw, height: vh, samples, ms: Math.round(performance.now() - t0), engine: "mediapipe-face-landmarker-0.10.20" };
 }
+async function faceMapWC(src, step, cancel, onStatus, maxSide, landmarker, t0) {
+  onStatus("Nh\u1EADn m\u1EB7t (gi\u1EA3i m\xE3 WebCodecs)\u2026");
+  const M = await import(
+    /* @vite-ignore */
+    "https://cdn.jsdelivr.net/npm/mediabunny@1.61.1/+esm"
+  );
+  const inp = new M.Input({ source: new M.BlobSource(await (await fetch(src)).blob()), formats: M.ALL_FORMATS }), tr = await inp.getPrimaryVideoTrack(), dur = await inp.computeDuration();
+  const vw = tr.displayWidth, vh = tr.displayHeight, sc = Math.min(1, maxSide / Math.max(vw, vh)), canvas = document.createElement("canvas");
+  canvas.width = Math.max(2, Math.round(vw * sc));
+  canvas.height = Math.max(2, Math.round(vh * sc));
+  const ctx = canvas.getContext("2d", { willReadFrequently: true }), sink = new M.CanvasSink(tr, { width: canvas.width, height: canvas.height, fit: "fill", poolSize: 2 }), ts2 = [];
+  for (let t = 0; t < dur; t += step) ts2.push(t);
+  const samples = [];
+  let i = 0;
+  for await (const w of sink.canvasesAtTimestamps(ts2)) {
+    if (cancel()) break;
+    const t = Math.round(ts2[i++] * 100) / 100;
+    if (!w) {
+      samples.push(sampleFromLandmarks(t, void 0));
+      continue;
+    }
+    ctx.drawImage(w.canvas, 0, 0, canvas.width, canvas.height);
+    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" };
+}
 function faceMapSummary(map) {
   const n = map.samples.length, hit2 = map.samples.filter((s) => s.face).length;
   const avgH = hit2 ? map.samples.filter((s) => s.face).reduce((a, s) => a + s.face.h, 0) / hit2 : 0;
@@ -2161,6 +2193,13 @@ function safeKeepRanges(start, end, silences, words, shorten) {
     if (cuts.length && a < cuts[cuts.length - 1].t1) continue;
     cuts.push({ t0: a, t1: b });
   }
+  {
+    const wl = words[words.length - 1];
+    if (wl && Number.isFinite(wl.t1) && end - wl.t1 > 1.2) {
+      const a = Math.max(start, wl.t1 + 0.75);
+      if (!cuts.some((c) => c.t1 >= end - 0.05 && c.t0 <= a)) cuts.push({ t0: a, t1: end });
+    }
+  }
   {
     let tay = [];
     try {
@@ -7247,7 +7286,8 @@ function matRa(fm, a, b, le, z = 1, zc = [0.5, 0.5]) {
   const q = (v, i) => 0.5 + (zc[i] + (v - zc[i]) * z - 0.5) * 1.111;
   return [
     q(Math.min(...ss.map((x) => x.face.x)), 0) - le[0],
-    q(Math.min(...ss.map((x) => x.headTop ?? x.face.y)), 1) - le[1],
+    q(Math.min(...ss.map((x) => Math.min(x.headTop ?? 1, x.face.y - x.face.h * 0.3))), 1) - le[1],
+    /* 10/10 cm71 (chữ phụ đè tóc khi CÓ bản đồ mặt): headTop = điểm 10 − 0,18 mặt = mép trán, chưa có tóc → đỉnh tóc ≈ điểm 10 − 0,30 mặt (đọc lúc dùng, đúng cả bản đồ cũ) */
     q(Math.max(...ss.map((x) => x.face.x + x.face.w)), 0) + le[2],
     q(Math.max(...ss.map((x) => x.chin ?? x.face.y + x.face.h)), 1) + le[3]
   ];
@@ -9519,6 +9559,17 @@ var eSoft = (x) => {
 var FB = "'Be Vietnam Pro', 'Segoe UI', sans-serif";
 var CAM = "rgb(232,112,52)";
 var VANG = "rgb(255,214,60)";
+var napPhongViet = () => {
+  try {
+    const d = globalThis.document;
+    if (!d || !d.fonts) return Promise.resolve(0);
+    const mau7 = "\u1EA0\u1EB6\u1EAC\u1EB8\u1EC6\u1ECA\u1ECC\u1ED8\u1EE2\u1EE4\u1EF0\u1EF4 \u1EA1\u1EB7\u1EAD\u1EB9\u1EC7\u1ECB\u1ECD\u1ED9\u1EE3\u1EE5\u1EF1\u1EF5 \u0110\xC0\u1EA2\xC3\xC1\xC8\u1EBA\u1EBC\xC9\u1EC0\u1EC2\u1EC4\u1EBE";
+    return Promise.all(["700", "800", "900", "italic 700", "italic 800", "italic 900"].map((k) => d.fonts.load(k + " 64px 'Be Vietnam Pro'", mau7).catch(() => 0)));
+  } catch (e) {
+    return Promise.resolve(0);
+  }
+};
+napPhongViet();
 var mo2 = (tuoi, dai2, vao = 0.15, ra = 0.15) => kep12(Math.min(tuoi / vao, (dai2 - tuoi) / ra));
 function nenCam(W4, H2, toi = false) {
   return nho2("cmNen" + (toi ? "T" : "") + W4 + "x" + H2, () => {
@@ -9589,6 +9640,7 @@ function kieuChu() {
 }
 function chu2(g, txt, x, y, px, kieu, a = 1, maxW = 0) {
   if (!txt || a <= 0) return;
+  txt = String(txt).normalize("NFC");
   g.save();
   g.globalAlpha = a;
   const KC = kieu === "brand" || kieu === "cam" ? {} : kieuChu();
@@ -9684,6 +9736,100 @@ function locFx(fx) {
   if (fx.xam) a.push("grayscale(" + Math.min(1, Math.abs(+fx.xam)).toFixed(2) + ")");
   return a.join(" ");
 }
+var NUA_DUOI_CY = 0.63;
+function sNuaDuoi(F) {
+  return F ? Math.max(0.5, Math.min(1, 0.26 / Math.max(0.08, F[2] - F[0]))) : 0.75;
+}
+function tfTam(g, W4, H2, F, s, cy) {
+  const cx = F ? (F[0] + F[2]) / 2 : 0.5, fy = F ? (F[1] + F[3]) / 2 : 0.4;
+  g.translate(W4 / 2 - cx * W4 * s, cy * H2 - fy * H2 * s);
+  g.scale(s, s);
+}
+var dauCache = /* @__PURE__ */ new WeakMap();
+function hopNguoi(p, key) {
+  if (!p) return null;
+  const kc = key || p;
+  if (dauCache.has(kc)) return dauCache.get(kc);
+  let r = null;
+  try {
+    const c = new OffscreenCanvas(36, 64), x = c.getContext("2d", { willReadFrequently: true });
+    x.drawImage(p, 0, 0, 36, 64);
+    const d = x.getImageData(0, 0, 36, 64).data;
+    let top = -1, l = 36, rr = -1;
+    for (let y = 0; y < 64 && top < 0; y++) for (let i = 7; i < 29; i++) if (d[(y * 36 + i) * 4 + 3] > 128) {
+      top = y;
+      break;
+    }
+    if (top >= 0) {
+      let wm = 0;
+      for (let y = top; y < Math.min(64, top + 26); y++) {
+        let a0 = -1, b0 = -1;
+        for (let i = 0; i < 36; i++) if (d[(y * 36 + i) * 4 + 3] > 128) {
+          if (a0 < 0) a0 = i;
+          b0 = i;
+        }
+        if (a0 < 0) continue;
+        const w = b0 - a0 + 1;
+        if (y > top + 3 && wm > 0 && (w < wm * 0.8 || w > wm * 1.35)) break;
+        if (w > wm) wm = w;
+        l = Math.min(l, a0);
+        rr = Math.max(rr, b0);
+      }
+      r = [l / 36, top / 64, (rr + 1) / 36, Math.min(1, top / 64 + 1.3 * ((rr + 1 - l) / 36) * (p.width / p.height))];
+    }
+  } catch (e) {
+    r = null;
+  }
+  dauCache.set(kc, r);
+  return r;
+}
+globalThis.__dauCanh = (d, nen2, W4, H2) => dauCanh(d, nen2, W4, H2);
+function dauCanh(d, nen2, W4, H2) {
+  if (!nen2 || !d) return null;
+  if (dauCache.has(d)) return dauCache.get(d);
+  return hopNguoi(nguoi(nen2, W4, H2), d);
+}
+function phongDinh(F, z) {
+  if (!F || !(z > 1.001)) return F;
+  const fy = (F[1] + F[3]) / 2;
+  return [F[0], Math.max(0, fy - (fy - F[1]) * z), F[2], F[3]];
+}
+function datChuNhan(g, W4, H2, F, giant, chu22, pxG, pxC, kieuG, maxW, tren = 0.075) {
+  const KC = kieuChu(), FBc = KC.font ? "'" + KC.font + "', " + FB : FB;
+  const do1 = (txt2, px, k2) => {
+    if (!txt2) return { px: 0, h: 0 };
+    const ng = k2 === "brand" || k2 === "cam" || KC.nghieng === false ? "" : "italic ";
+    g.save();
+    g.font = ng + "900 " + px.toFixed(1) + "px " + FBc;
+    const dong = String(txt2).split(String.fromCharCode(10));
+    const w = Math.max(...dong.map((x) => g.measureText(x).width));
+    g.restore();
+    const p2 = w > maxW ? px * maxW / w : px, lh = p2 * (k2 === "giant" ? 1.12 : 1.15);
+    return { px: p2, h: (dong.length - 1) * lh + lh * 1.05 };
+  };
+  const a = do1(giant, pxG, kieuG), b = do1(chu22, pxC, "vang"), gap = chu22 ? 0.012 * H2 : 0;
+  let need = a.h + b.h + gap;
+  const dinh = ((F ? F[1] : 0.2) - 0.038) * H2, top0 = tren * H2;
+  let k = 1, y0 = top0, truoc = false, txt = giant;
+  if (dinh - top0 < need * 0.55 && String(giant || "").indexOf(String.fromCharCode(10)) >= 0) {
+    const g1 = String(giant).split(String.fromCharCode(10)).map((x) => x.trim()).join(" "), a1 = do1(g1, pxG, kieuG), need1 = a1.h + b.h + gap;
+    if (dinh - top0 >= need1 * 0.55) {
+      txt = g1;
+      a.px = a1.px;
+      a.h = a1.h;
+      need = need1;
+    }
+  }
+  if (dinh - top0 >= need * 0.55) k = Math.min(1, (dinh - top0) / need);
+  else {
+    const n0 = (F ? Math.max(0.62, F[3] + 0.04) : 0.66) * H2, n1 = 0.83 * H2;
+    k = Math.max(0.5, Math.min(1, (n1 - n0) / need));
+    y0 = Math.min(n0, n1 - need * k);
+    truoc = true;
+  }
+  const hG = a.h * k, hC = b.h * k;
+  return { yG: (y0 + hG / 2) / H2, yC: (y0 + hG + gap + hC / 2) / H2, pxG: a.px * k, pxC: b.px * k, truoc, txt };
+}
 function tf(g, W4, H2, F, s, yDau) {
   const cx = F ? (F[0] + F[2]) / 2 : 0.5, top = F ? F[1] : 0.2;
   g.translate(W4 / 2 - cx * W4 * s, yDau * H2 - top * H2 * s);
@@ -9918,8 +10064,15 @@ function taiLieu(g, ds2, tuoi, W4, H2, a) {
   g.restore();
 }
 dangKy("cmNen", (g, d, tuoi, W4, H2, nen2, _s, dai2) => {
+  if (d.bo === "chia" && d.ten && nen2 && !(d.dong && d.dong.length) && !/^vat:/.test(String(d.ten))) {
+    const im0 = khungTS(d.ten, tuoi);
+    if (im0 && im0.height > im0.width * 1.15) {
+      KHOI2.cmAnh(g, { ...d, bo: "anh", pip: 1 }, tuoi, W4, H2, nen2, _s, dai2);
+      return;
+    }
+  }
   if (d.bo === "chia" && d.ten && nen2 && !(d.dong && d.dong.length) && !khungTS(d.ten, tuoi)) d = { ...d, bo: "cut", giant: d.chu, chu: void 0, ten: void 0, huong: 2, yDau: 0.36 };
-  const a = mo2(tuoi, dai2, d.vao ?? 0.07, d.ra ?? 0.07), F = d.F || null, ka = eOut(tuoi / 0.25);
+  const a = mo2(tuoi, dai2, d.vao ?? 0.07, d.ra ?? 0.07), F = d.F || (/^(chia|card|cut|depth|tron)$/.test(String(d.bo)) ? dauCanh(d, nen2, W4, H2) : null), ka = eOut(tuoi / 0.25);
   if (a <= 0) return;
   g.save();
   g.globalAlpha = a;
@@ -9928,15 +10081,19 @@ dangKy("cmNen", (g, d, tuoi, W4, H2, nen2, _s, dai2) => {
     if (fS) g.filter = fS;
   }
   const kS = 1;
-  const p = (d.bo === "card" || d.bo === "depth" || d.bo === "cut" && !d.anNguoi) && nen2 ? nguoi(nen2, W4, H2) : null;
+  const p = (d.bo === "depth" || d.bo === "cut" && !d.anNguoi) && nen2 ? nguoi(nen2, W4, H2) : null;
   const hv = d.huong ?? -1, kv = 1 - Math.pow(1 - Math.min(1, tuoi / 0.35), 3), ox = hv === 0 ? -(1 - kv) * 0.3 * W4 : hv === 1 ? (1 - kv) * 0.3 * W4 : 0, oy = hv === 2 ? (1 - kv) * 0.1 * H2 : 0;
   const zk = d.z && nen2 ? 1 + (d.z - 1) * (1 - eOut(Math.min(1, tuoi / 0.6))) : d.phong && nen2 ? 1 + (d.phong - 1) * (tuoi < 0.42 ? 1 : 1 - eOut((tuoi - 0.42) / 0.33)) : 1;
+  if (F && (d.bo === "depth" || d.bo === "cut")) {
+    const fx = (F[0] + F[2]) / 2, fy = (F[1] + F[3]) / 2, cxs = d.bo === "cut" ? 0.5 : fx;
+    globalThis.__dauMH = [cxs - (fx - F[0]) * zk, fy - (fy - F[1]) * zk, cxs + (F[2] - fx) * zk, fy + (F[3] - fy) * zk];
+  }
   if (d.bo === "card" || d.bo === "cut" || d.bo === "toi") {
     g.drawImage(nenCam(W4, H2, d.bo === "toi" || !!d.toiNen), 0, 0);
     if (d.bo === "card" && nen2) {
       g.save();
       g.translate(ox, oy);
-      const yT = Math.min(0.715, (d.yDau ?? 0.46) + 0.255), x = 0.07 * W4, y = yT * H2, w = 0.86 * W4, h = (0.985 - yT) * H2, r = 46 * W4 / 1080, s = d.s || 1;
+      const yT = 0.5, x = 0.07 * W4, y = yT * H2, w = 0.86 * W4, h = (0.985 - yT) * H2, r = 46 * W4 / 1080, s = d.s || 1;
       hop3(g, "the:card", x, y, x + w, y + h);
       g.save();
       g.shadowColor = "rgba(0,0,0,0.45)";
@@ -9949,36 +10106,21 @@ dangKy("cmNen", (g, d, tuoi, W4, H2, nen2, _s, dai2) => {
       g.save();
       bo(g, x, y, w, h, r);
       g.clip();
-      tfE(g, W4, H2, F, s, d.yDau ?? 0.42, kS);
+      tfTam(g, W4, H2, F, sNuaDuoi(F), NUA_DUOI_CY);
       g.drawImage(nen2, 0, 0, W4, H2);
       g.restore();
+      void s;
       g.save();
       bo(g, x, y, w, h, r);
       g.lineWidth = 4 * W4 / 1080;
       g.strokeStyle = "rgba(255,255,255,0.35)";
       g.stroke();
       g.restore();
-      if (p) {
-        g.save();
-        tfE(g, W4, H2, F, s, d.yDau ?? 0.42, kS);
-        g.drawImage(p, 0, 0, W4, H2);
-        g.restore();
-      }
       g.restore();
     } else if (d.bo === "cut" && p && !d.anNguoi) {
       g.save();
       g.translate(ox, oy);
-      tfE(
-        g,
-        W4,
-        H2,
-        F,
-        d.s || 1,
-        d.yDau ?? 0.36,
-        kS,
-        zk
-        /* 09/10 lát 2 ⑧: phóng chồng */
-      );
+      F ? tfTam(g, W4, H2, F, zk, (F[1] + F[3]) / 2) : tfE(g, W4, H2, F, 1, 0.2, kS, zk);
       g.drawImage(p, 0, 0, W4, H2);
       g.restore();
     }
@@ -9999,7 +10141,8 @@ dangKy("cmNen", (g, d, tuoi, W4, H2, nen2, _s, dai2) => {
         c.drawImage(nen2, 0, 0, W4, H2);
       }, Math.round(0.012 * W4), "brightness(0.8)");
       const kz = eOut(Math.min(1, tuoi / 0.5));
-      tfE(g, W4, H2, F, (d.s || 1.05) * (1 - 0.3 * kz), 0.5 + 0.015 * kz, kS);
+      tfTam(g, W4, H2, F, sNuaDuoi(F) * (1 + 0.12 * (1 - kz)), NUA_DUOI_CY);
+      void kS;
       g.drawImage(nen2, 0, 0, W4, H2);
     }
     g.restore();
@@ -10066,17 +10209,28 @@ dangKy("cmNen", (g, d, tuoi, W4, H2, nen2, _s, dai2) => {
     g.drawImage(nen2, cx - cxF * W4 * s, cy - 0.08 * r - cyF * H2 * s, W4 * s, H2 * s);
     g.restore();
   }
+  let daC2 = false;
   if (d.bo === "depth") {
-    const yG = d.yChu ?? 0.24, truoc = d.yChu != null && F && yG > F[1] - 0.06 && yG < F[3];
-    const veChu = () => chu2(g, d.giant, W4 / 2, yG * H2 + (d.z ? 0 : (1 - ka) * 70 * H2 / 1920), 165 * (d.coChu || 1) * H2 / 1920, "giant", d.z ? 1 : kep12(tuoi / 0.2), 0.76 * W4);
+    const F6 = phongDinh(F || hopNguoi(p, d), d.z || d.phong || 1), L6 = d.yChu == null && F6 ? datChuNhan(g, W4, H2, F6, d.giant, /\n/.test(String(d.giant || "")) ? "" : d.chu2 || "", 165 * (d.coChu || 1) * H2 / 1920, 96 * H2 / 1920, "giant", 0.76 * W4, d.thanh ? 0.1 : 0.075) : null;
+    daC2 = !!(L6 && d.chu2 && !/\n/.test(String(d.giant || "")));
+    const yG = L6 ? L6.yG : d.yChu ?? 0.24, truoc = L6 ? L6.truoc : !!(d.yChu != null && F && yG > F[1] - 0.06 && yG < F[3]);
+    const veChu = () => {
+      chu2(g, L6 && L6.txt || d.giant, W4 / 2, yG * H2 + (d.z ? 0 : (1 - ka) * 70 * H2 / 1920), L6 ? L6.pxG : 165 * (d.coChu || 1) * H2 / 1920, "giant", d.z ? 1 : kep12(tuoi / 0.2), 0.76 * W4);
+      if (daC2 && L6) chu2(g, d.chu2, W4 / 2, L6.yC * H2, L6.pxC, d.do2 ? "do" : "vang", kep12((tuoi - 0.35) / 0.15), 0.76 * W4);
+    };
     if (!truoc) veChu();
     if (p) {
       if (zk > 1.001) phongK(g, p, W4, H2, F, zk);
       else g.drawImage(p, 0, 0, W4, H2);
     }
     if (truoc) veChu();
-  } else if (d.giant) chu2(g, d.giant, W4 / 2, (d.yChu ?? (d.v3 ? 0.145 : d.bo === "toi" ? 0.4 : d.bo === "tron" ? 0.25 : 0.2)) * H2 + (1 - ka) * 70 * H2 / 1920, (d.cam ? 170 : d.v3 ? 108 : 132) * (d.coChu || 1) * H2 / 1920, d.cam ? "cam" : d.do ? "do" : "kw", kep12(tuoi / 0.06), 0.78 * W4);
-  if (d.chu2 && d.bo !== "chia" && !(d.bo === "depth" && /\n/.test(String(d.giant || "")))) chu2(g, d.chu2, W4 / 2, (d.bo === "depth" ? (d.yChu ?? 0.24) + 0.02 : d.yChu ?? (d.bo === "toi" ? 0.4 : d.bo === "tron" ? 0.25 : 0.2)) * H2 + (/\n/.test(String(d.giant || "")) ? 290 : d.cam ? 200 : 150) * (d.coChu || 1) * H2 / 1920, 96 * H2 / 1920 * (d.z ? 1 + 0.7 * (1 - eOut((tuoi - 0.35) / 0.35)) : 1), d.do2 ? "do" : d.bo === "cut" || d.bo === "tron" || d.bo === "toi" ? "kw" : "vang", kep12((tuoi - 0.35) / 0.15), 0.76 * W4);
+  } else if (d.giant) {
+    const F6c = phongDinh(F || hopNguoi(p, d), d.z || d.phong || 1), L6c = d.bo === "cut" && d.yChu == null && F6c && !d.v3 ? datChuNhan(g, W4, H2, F6c, d.giant, d.chu2 || "", (d.cam ? 170 : 132) * (d.coChu || 1) * H2 / 1920, 96 * H2 / 1920, d.cam ? "cam" : "kw", 0.78 * W4, d.thanh ? 0.1 : 0.075) : null;
+    daC2 = !!(L6c && d.chu2);
+    if (L6c && d.chu2) chu2(g, d.chu2, W4 / 2, L6c.yC * H2, L6c.pxC, d.do2 ? "do" : "kw", kep12((tuoi - 0.35) / 0.15), 0.76 * W4);
+    chu2(g, L6c && L6c.txt || d.giant, W4 / 2, (L6c ? L6c.yG : d.yChu ?? (d.v3 ? 0.145 : d.bo === "toi" ? 0.4 : d.bo === "tron" ? 0.25 : 0.2)) * H2 + (1 - ka) * 70 * H2 / 1920, L6c ? L6c.pxG : (d.cam ? 170 : d.v3 ? 108 : 132) * (d.coChu || 1) * H2 / 1920, d.cam ? "cam" : d.do ? "do" : "kw", kep12(tuoi / 0.06), 0.78 * W4);
+  }
+  if (d.chu2 && !daC2 && d.bo !== "chia" && !(d.bo === "depth" && /\n/.test(String(d.giant || "")))) chu2(g, d.chu2, W4 / 2, (d.bo === "depth" ? (d.yChu ?? 0.24) + 0.02 : d.yChu ?? (d.bo === "toi" ? 0.4 : d.bo === "tron" ? 0.25 : 0.2)) * H2 + (/\n/.test(String(d.giant || "")) ? 290 : d.cam ? 200 : 150) * (d.coChu || 1) * H2 / 1920, 96 * H2 / 1920 * (d.z ? 1 + 0.7 * (1 - eOut((tuoi - 0.35) / 0.35)) : 1), d.do2 ? "do" : d.bo === "cut" || d.bo === "tron" || d.bo === "toi" ? "kw" : "vang", kep12((tuoi - 0.35) / 0.15), 0.76 * W4);
   const vt = d.v3 && taiSan(d.v3), dl = String(d.giant || "").indexOf(String.fromCharCode(10)) >= 0;
   if (vt) {
     const p2 = eSoft((tuoi - 0.1) / 0.3), hh = (dl ? 0.2 : 0.26) * H2 * (0.9 + 0.1 * p2), ww = Math.min(hh * vt.width / vt.height, 0.6 * W4), h2 = ww * vt.height / vt.width;
@@ -10085,7 +10239,20 @@ dangKy("cmNen", (g, d, tuoi, W4, H2, nen2, _s, dai2) => {
     g.shadowColor = "rgba(60,20,0,0.45)";
     g.shadowBlur = 0.03 * W4;
     g.shadowOffsetY = 0.015 * W4;
-    g.drawImage(vt, W4 / 2 - ww / 2, (dl ? 0.355 : 0.3) * H2 - h2 / 2, ww, h2);
+    let yv = (dl ? 0.355 : 0.3) * H2, hv2 = h2, wv = ww;
+    {
+      const Fv = phongDinh(F || hopNguoi(p, d), d.z || d.phong || 1), day = Fv ? (Fv[1] - 0.02) * H2 : H2;
+      if (yv + hv2 / 2 > day) {
+        const t0v = (dl ? 0.26 : 0.2) * H2, cao = day - t0v;
+        if (cao < 0.08 * H2) hv2 = 0;
+        else {
+          hv2 = Math.min(hv2, cao);
+          wv = hv2 * vt.width / vt.height;
+          yv = t0v + hv2 / 2;
+        }
+      }
+    }
+    if (hv2 > 0) g.drawImage(vt, W4 / 2 - wv / 2, yv - hv2 / 2, wv, hv2);
     g.restore();
   }
   if (d.tieu) chu2(g, d.tieu, W4 / 2, 0.135 * H2 + (1 - ka) * 70 * H2 / 1920, 122 * H2 / 1920, "brand", kep12(tuoi / 0.15), 0.76 * W4);
@@ -10524,7 +10691,19 @@ dangKy("cmKinh", (g, d, tuoi, W4, H2, nen2, _s, dai2) => {
 dangKy("cmSticker", (g, d, tuoi, W4, H2, _n, _s, dai2) => {
   const a = kep13(Math.min(1, (dai2 - tuoi) / 0.07));
   if (a > 0 && d.logo) return veLogo(g, d.logo, d.hex, (d.x ?? 0.5) * W4, (d.y ?? 0.17) * H2, (d.r ?? 0.085) * W4, tuoi - (d.tre ?? 0), a);
-  if (a > 0) veSticker3(g, d.st, (d.x ?? 0.82) * W4, (d.y ?? 0.3) * H2, (d.r ?? 0.065) * W4, tuoi - (d.tre ?? 0.25), a);
+  if (a > 0) {
+    const G3 = globalThis, r = d.r ?? 0.065, ry = r * W4 / H2;
+    let x = d.x ?? 0.82, y = d.y ?? 0.3;
+    const B = G3.__dauMH || (G3.__dauCanh && _n ? G3.__dauCanh(d, _n, W4, H2) : null);
+    if (B) {
+      const dung = (cx, cy) => cx - r >= 0.02 && cx + r <= 0.98 && cy - ry >= 0.09 && cy + ry <= 0.9 && (cx + r < B[0] - 0.02 || cx - r > B[2] + 0.02 || cy + ry < B[1] - 0.02 || cy - ry > B[3] + 0.02);
+      const yc = Math.min(0.86, B[3] + 0.04 + ry), c = [[x, y], [1 - x, y], [x < 0.5 ? 0.13 : 0.87, yc], [x < 0.5 ? 0.87 : 0.13, yc]].find((p) => dung(p[0], p[1]));
+      if (!c) return;
+      x = c[0];
+      y = c[1];
+    }
+    veSticker3(g, d.st, x * W4, y * H2, r * W4, tuoi - (d.tre ?? 0.25), a);
+  }
 });
 
 // flow-src/engine/khoiCuongMe.ts
@@ -10742,7 +10921,7 @@ function lapCuongMe(o) {
         return;
       }
     }
-    muc.push({ f: f2, c, ten: suaChu(sach2(m.ten || "")) || tenRieng(suaChu(String(m.tu || "")).split(/\s+/)), mo: suaChu(sach2(m.mo || "")), kq: (Array.isArray(m.kq) ? m.kq : []).map((x) => suaChu(sach2(String(x)))).filter(Boolean).slice(0, 3) });
+    muc.push({ f: f2, c, cach, ten: suaChu(sach2(m.ten || "")) || tenRieng(suaChu(String(m.tu || "")).split(/\s+/)), mo: suaChu(sach2(m.mo || "")), kq: (Array.isArray(m.kq) ? m.kq : []).map((x) => suaChu(sach2(String(x)))).filter(Boolean).slice(0, 3) });
     truocM = f2 + 1;
   });
   {
@@ -10782,6 +10961,10 @@ function lapCuongMe(o) {
       muc.push({ f: c.f, c, ten: ten2 });
     });
   }
+  if (muc.length < 2) {
+    if (muc.length) ghiL("bo", { bo: "muc", f: muc[0].f, d: 0 }, "chi 1 muc \u2192 khong phai video liet ke, bo the muc: " + String(muc[0].ten || ""));
+    muc.length = 0;
+  }
   const cta = cs.filter((c) => c.f > tong * 0.7 && /comment|bình luận|cmt|lưu video|lưu lại|theo dõi|follow|đăng ký/.test(" " + c.chu.join(" ").toLocaleLowerCase("vi") + " "))[0];
   const hetMuc = cta && muc.length && cta.f > muc[muc.length - 1].f + 4 ? cta.f : tong;
   muc.forEach((m, k) => {
@@ -10789,6 +10972,8 @@ function lapCuongMe(o) {
     m.ten = m.ten || cum2(m.c.chu);
   });
   const N = muc.length, ten = muc.map((m) => m.ten);
+  const loiDem = W22.map((w) => w.t).join(" "), coBuoc = N >= 3 && (muc.filter((m) => m.cach === "ten").length >= Math.ceil(N * 0.6) || /(đầu tiên|thứ hai|thứ ba|thứ tư|tiếp theo|cuối cùng|số một|số hai|số ba|bước một|bước hai|thứ nhất)/.test(loiDem));
+  globalThis.__coBuoc = { N, coBuoc, ten: muc.filter((m) => m.cach === "ten").length };
   const sp = [];
   let ctxSt = "";
   const IC = { tien: "xu", dongho: "dongho", canhbao: "canh", tich: "tich", bieudo: "bieu", tim: "tim", khong: "none" };
@@ -10905,14 +11090,14 @@ function lapCuongMe(o) {
   })(sach2(kb?.moc || layMoc(ws, kb)).split(" "))) || hoa3(cum2(cs[0] ? cs[0].chu : []));
   const Lm = Math.min(Math.max(2.4, docGiay(moc) + 0.4), Math.max(1.2, f1 - 0.3));
   bc = "B2 moc";
-  de(0, Lm, { uuTien: UT.moc, bo: "depth", giant: haiDong4(moc, 11), chu2: N >= 2 ? N + " " + LOAI2 : "", yChu: 0.165, vao: 1e-3, z: 1.3, keu: "whoosh" });
-  if (N >= 2 && f1 - Lm > 3.4) de(Lm + 0.3, Math.min(3.2, f1 - Lm - 0.6), { uuTien: UT.moc, bo: "cut", tieu: N + " " + LOAI2, hang: muc.map((m) => m.ten).slice(0, 8), keu: "pop", st: "chuot", stX: 0.43, stY: 0.188, stR: 0.042, stTre: 1.2 });
+  de(0, Lm, { uuTien: UT.moc, bo: "depth", giant: haiDong4(moc, 11), chu2: coBuoc ? N + " " + LOAI2 : "", yChu: 0.165, vao: 1e-3, z: 1.3, keu: "whoosh" });
+  if (coBuoc && f1 - Lm > 3.4) de(Lm + 0.3, Math.min(3.2, f1 - Lm - 0.6), { uuTien: UT.moc, bo: "cut", tieu: N + " " + LOAI2, hang: muc.map((m) => m.ten).slice(0, 8), keu: "pop", st: "chuot", stX: 0.43, stY: 0.188, stR: 0.042, stTre: 1.2 });
   else if (N >= 2) ghiL("bo", { bo: "cut", f: Lm + 0.3, d: 3.2 }, "moc ngan (f1 - Lm <= 3,4 s) \u2192 bo hang N muc");
   bc = "B3 the muc";
   muc.forEach((m, k) => {
     const L = m.b - m.f, Lc = Math.min(2.6, Math.max(2.2, 0.3 * L));
     const sau = suaChu(m.c.chu.map(sach2).join(" ")), go2 = sau.length > 48 ? sau.slice(0, 48).replace(/\s\S*$/, "") + "\u2026" : sau;
-    de(m.f, Lc, { uuTien: UT.card, bo: "card", tieu: hoa3(m.ten), so: k + 1, N, nhom: LOAI2, ui: { ten: m.ten, anh: "trang:" + String(m.ten).toLocaleLowerCase("vi").replace(/[^\p{L}\p{N}]+/gu, ""), go: m.mo ? "/" + String(m.ten).toLocaleLowerCase("vi").normalize("NFD").replace(/[̀-ͯ]/g, "").replace(/đ/g, "d").replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "") + " " + m.mo.toLocaleLowerCase("vi") : go2.toLocaleLowerCase("vi"), kq: m.kq }, keu: "whoosh-nhanh" });
+    de(m.f, Lc, { uuTien: UT.card, bo: "card", tieu: hoa3(m.ten), so: coBuoc ? k + 1 : void 0, N, nhom: LOAI2, ui: !/SKILL|CÔNG CỤ|TOOL|APP/i.test(LOAI2) ? void 0 : { ten: m.ten, anh: "trang:" + String(m.ten).toLocaleLowerCase("vi").replace(/[^\p{L}\p{N}]+/gu, ""), go: m.mo ? "/" + String(m.ten).toLocaleLowerCase("vi").normalize("NFD").replace(/[̀-ͯ]/g, "").replace(/đ/g, "d").replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "") + " " + m.mo.toLocaleLowerCase("vi") : go2.toLocaleLowerCase("vi"), kq: m.kq }, keu: "whoosh-nhanh" });
     if (L >= 10 && !(kb?.canh || []).length) {
       const c = cs.filter((x) => x.f >= m.f + Lc + 2 && x.f + 2.4 <= m.b - 1).sort((p, q) => Math.abs(p.f - (m.f + L * 0.6)) - Math.abs(q.f - (m.f + L * 0.6)))[0];
       if (c) {
@@ -11081,7 +11266,7 @@ function lapCuongMe(o) {
         const m = a + k * (b - a) / (n + 1), i = W22.findIndex((w) => w.f >= m - 0.3);
         if (i < 0 || W22[i].f > b - 2.3) continue;
         const km = muc.findIndex((x) => W22[i].f >= x.f + 8 && W22[i].f < x.b - 4.5);
-        if (km >= 0 && !muc[km].nhac && (muc[km].nhac = dat(W22[i].f, 2.4, { uuTien: UT.nhac, bo: "cut", tieu: hoa3(muc[km].ten), so: km + 1, N, nhom: LOAI2, hang: muc[km].kq && muc[km].kq.length ? muc[km].kq : void 0, keu: "pop" }, 0.5))) continue;
+        if (km >= 0 && !muc[km].nhac && (muc[km].nhac = dat(W22[i].f, 2.4, { uuTien: UT.nhac, bo: "cut", tieu: hoa3(muc[km].ten), so: coBuoc ? km + 1 : void 0, N, nhom: LOAI2, hang: muc[km].kq && muc[km].kq.length ? muc[km].kq : void 0, keu: "pop" }, 0.5))) continue;
       }
     });
   }
@@ -12013,7 +12198,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;
+  const thanhO = (t) => coBuoc && t >= f1 - 0.1 && t < hetMuc;
   bc = "B7 phat the";
   const stTr = { n: 0 }, keuTr = {};
   let iH = 0;
@@ -12065,7 +12250,8 @@ function lapCuongMe(o) {
       phong: s.phong,
       ra: s.ra,
       chu2: s.chu2,
-      yChu: s.yChu ?? (Fs ? Math.max(0.15, Math.min(0.26, Fs[1] - 0.05)) : 0.2)
+      thanh: thanhO(s.f) || thanhO(s.f + s.d - 0.05) ? 1 : void 0,
+      yChu: (s.bo === "depth" || s.bo === "cut") && !s.khoa ? void 0 : s.yChu ?? (Fs ? Math.max(0.15, Math.min(0.26, Fs[1] - 0.05)) : 0.2)
     });
     {
       const chu3 = (String(s.giant || "") + " " + String(s.chu || "") + " " + String(s.chu2 || "")).toLocaleLowerCase("vi"), xau = /tốn|mất|mỏi|khổ|oan|sai|lỗi|đau|chậm|dừng|đừng|cực|vô hồn|tránh/.test(chu3), tien = /tiền|triệu|view|đô|\$|doanh|ads|spend/.test(chu3), so4 = /\d|x10/.test(chu3);
@@ -12220,7 +12406,7 @@ function lapCuongMe(o) {
       if (!q.tu.length) q.t1 = q.t0;
     });
   }
-  if (N >= 2) the(nguon3(f1), nguon3(f1) + Math.min(hetMuc, tong) - 0.05 - f1, { loai: "cmTien", rel: muc.map((m) => +(m.f - f1).toFixed(2)) });
+  if (coBuoc) the(nguon3(f1), nguon3(f1) + Math.min(hetMuc, tong) - 0.05 - f1, { loai: "cmTien", rel: muc.map((m) => +(m.f - f1).toFixed(2)) });
   o.lichCm = globalThis.__lichCm = {
     N,
     muc: muc.map((m) => [+m.f.toFixed(2), m.ten]),
@@ -13283,6 +13469,13 @@ async function renderNhanh(ff, clips, files, audio, cards, nen2, options, paint,
       } catch (e) {
       }
     }
+    {
+      const o = cu && cu.rung && cu.rung.o;
+      if (o && typeof o.get !== "function") {
+        if (Array.isArray(o.__map)) cu.rung.o = new Map(o.__map);
+        else cu = null;
+      }
+    }
     S0.rung = cu ? (S0.dau = cu.dau, Promise.resolve(cu.rung)) : (async () => {
       S0.dau = await coDau(M, tr, lo + 4.5, hi - 4.5).catch(() => false);
       if (!rungOn) return null;
@@ -13293,7 +13486,7 @@ async function renderNhanh(ff, clips, files, audio, cards, nen2, options, paint,
       }
     })().then((r) => {
       NHO.set(kRung + "|" + rungOn, { rung: r, dau: S0.dau });
-      const js = JSON.stringify({ rung: r, dau: S0.dau }, (_k, x) => ArrayBuffer.isView(x) ? Array.from(x) : x);
+      const js = JSON.stringify({ rung: r, dau: S0.dau }, (_k, x) => x instanceof Map ? { __map: Array.from(x.entries()) } : ArrayBuffer.isView(x) ? Array.from(x) : x);
       try {
         localStorage.setItem(LSR, js);
       } catch (e) {
@@ -13500,6 +13693,7 @@ async function renderNhanh(ff, clips, files, audio, cards, nen2, options, paint,
         if (d > 0 && T >= t.T0 && T < t.T1) day += H2 * d * Math.max(0, Math.min(1, (T - t.T0) / 0.3, (t.T1 - T) / 0.3));
       }
       if (day > 0) g.drawImage(nenCv, 0, day);
+      globalThis.__dauMH = null;
       for (const t of ds2) {
         if (T < t.T0 || T >= t.T1) continue;
         if (t.doan) {
@@ -17552,7 +17746,7 @@ function dsTaiSan(kieu, kb) {
   });
   (kb?.muc || []).slice(0, 8).forEach((m) => {
     const ten2 = String(m && m.ten || "").trim();
-    if (ten2) ds2.push(["trang:" + ten2.toLocaleLowerCase("vi").replace(/[^\p{L}\p{N}]+/gu, ""), 'A realistic desktop browser screenshot of the GitHub repository page of the AI skill "' + ten2.slice(0, 40) + '"' + (m.mo ? " (" + String(m.mo).slice(0, 60) + ")" : "") + ', dark GitHub theme, repository name and README title clearly reading "' + ten2.slice(0, 40) + '", short bullet list, file tree, crisp readable UI text, no people, no watermark', "16:9"]);
+    if (ten2) ds2.push(["trang:" + ten2.toLocaleLowerCase("vi").replace(/[^\p{L}\p{N}]+/gu, ""), !/SKILL|CÔNG CỤ|CONG CU|TOOL|APP/i.test(String(kb?.nhom || "")) ? 'Cinematic photorealistic wide scene illustrating "' + ten2.slice(0, 40) + '"' + (m.mo ? ": " + String(m.mo).slice(0, 60) : "") + ", Vietnamese everyday context, natural light, clear single subject, no text, no letters, no watermark" : 'A realistic desktop browser screenshot of the GitHub repository page of the AI skill "' + ten2.slice(0, 40) + '"' + (m.mo ? " (" + String(m.mo).slice(0, 60) + ")" : "") + ', dark GitHub theme, repository name and README title clearly reading "' + ten2.slice(0, 40) + '", short bullet list, file tree, crisp readable UI text, no people, no watermark', "16:9"]);
   });
   const TRAN_ANH = (() => {
     try {
@@ -17828,6 +18022,10 @@ function ghepKichBan(words, kichBan) {
 // flow-src/services/exportFlow.ts
 async function handleExport(currentProject, setExporting, setExportedBlob, addLog, khung) {
   if (!currentProject || currentProject.timeline.length === 0) return;
+  try {
+    await napPhongViet();
+  } catch (e) {
+  }
   window.__khoVideoDa = /* @__PURE__ */ new Set();
   {
     const kbg = String(currentProject.kichBanGoc || window.__kichBanGoc || "").trim(), ws0 = currentProject.speechDraft?.analysis?.words;
@@ -19592,7 +19790,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.50/nap.js";
+var LOI_URL = "https://cdn.jsdelivr.net/npm/xvai-loi@0.1.51/nap.js";
 var TRONG_LOI = !!globalThis.__xvaiReact;
 try {
   if (!TRONG_LOI) setTimeout(() => {
@@ -19622,7 +19820,7 @@ function datCauLenh(a) {
   on2 = true;
   window.addEventListener("message", async (ev) => {
     const d = ev.data;
-    if (!d || d.xvaiLoi101326 !== true) return;
+    if (!d || d.xvaiLoi101845 !== 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) => {
@@ -20326,7 +20524,7 @@ var SuaLich = ({ ten, onDong }) => {
 };
 
 // loi/vo-flow.tsx
-var PHIEN_BAN = "loi-1010BO";
+var PHIEN_BAN = "loi-1010BV";
 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 = () => {