xvai-loi 0.1.88 → 0.1.90

package/co.txt

@@ -1 +1 @@
-xvaiLoi120538
+xvaiLoi120612

package/package.json

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

@@ -10536,7 +10536,7 @@ function docDemo(g, d, tuoi, W4, hT) {
   g.restore();
 }
 function taiLieu(g, ds2, tuoi, W4, H2, a) {
-  const x = 0.12 * W4, y = 0.16 * H2, w = 0.76 * W4, dh = 0.034 * H2, h = 0.06 * H2 + ds2.length * dh + 0.02 * H2, k = eSoft(tuoi / 0.3);
+  const n = Math.max(1, ds2.length), dh = Math.min(0.06 * H2, Math.max(0.034 * H2, 0.22 * H2 / n)), h = 0.06 * H2 + n * dh + 0.02 * H2, x = 0.12 * W4, y = 0.16 * H2 + Math.max(0, (0.3 * H2 - h) / 2), w = 0.76 * W4, k = eSoft(tuoi / 0.3);
   g.save();
   g.globalAlpha = a;
   g.translate(W4 / 2, y + h / 2);
@@ -10554,14 +10554,14 @@ function taiLieu(g, ds2, tuoi, W4, H2, a) {
   g.fillStyle = CAM;
   g.fillRect(x, y, w, 0.05 * H2);
   g.restore();
-  g.font = "900 " + (0.022 * H2).toFixed(1) + "px " + FB;
+  g.font = "900 " + (0.026 * H2).toFixed(1) + "px " + FB;
   g.fillStyle = "#fff";
   g.textBaseline = "middle";
   g.textAlign = "left";
   g.fillText("C\xC0I \u0110\u1EB6T " + ds2.length + " M\u1EE4C", x + 0.04 * W4, y + 0.025 * H2);
   ds2.forEach((t, i) => {
-    const yy = y + 0.07 * H2 + i * dh, tick = tuoi > 0.5 + i * 0.18;
-    g.font = "700 " + (0.02 * H2).toFixed(1) + "px " + FB;
+    const yy = y + 0.06 * H2 + (i + 0.5) * dh, tick = tuoi > 0.5 + i * 0.18;
+    g.font = "700 " + (0.55 * dh).toFixed(1) + "px " + FB;
     g.fillStyle = "rgb(40,40,48)";
     g.fillText(t, x + 0.11 * W4, yy, w - 0.15 * W4);
     g.strokeStyle = tick ? "rgb(30,180,90)" : "rgba(0,0,0,0.25)";
@@ -18825,6 +18825,13 @@ function lichDoan(clips) {
     });
     t += Math.max(0, e - s);
   });
+  {
+    const nen2 = ra.filter((x) => /^(cmNen|cmAnh|cmKinh)$/.test(String(x.doan && x.doan.loai))).sort((p, q) => p.T0 - q.T0);
+    for (let i = 0; i + 1 < nen2.length; i++) {
+      const x = nen2[i], y = nen2[i + 1];
+      if (y.T0 > x.T0 + 0.05 && y.T0 < x.T1 && x.T1 - y.T0 < 0.1) x.T1 = y.T0;
+    }
+  }
   globalThis.__doanRoi = [...new Set(clips.flatMap((c) => (c.textMoments || []).filter((m) => m.kind === "doan" && !da.has(m))))].map((m) => [+(+m.t0).toFixed(2), +(+m.t1).toFixed(2), m.doan?.loai, m.doan?.bo, m.doan?.giant, clips.filter((c) => c.trimEnd > m.t0 - 1 && c.trimStart < m.t0 + 1).map((c) => [+c.trimStart.toFixed(3), +c.trimEnd.toFixed(3)])]);
   return ra;
 }
@@ -21022,7 +21029,7 @@ function datCauLenh(a) {
   on2 = true;
   window.addEventListener("message", async (ev) => {
     const d = ev.data;
-    if (!d || d.xvaiLoi120538 !== true) return;
+    if (!d || d.xvaiLoi120612 !== 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) => {