xvai-loi 0.1.129 → 0.1.131

package/co.txt

@@ -1 +1 @@
-xvaiLoi130717
+xvaiLoi130820

package/package.json

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

@@ -8750,17 +8750,19 @@ function lapAnhTheoKhuon(kb, ws, K = KHUON_TOPN, toiDa = 12) {
   };
   const g = 60 / K.tram.phut, t0 = W4[0].t0 + K.bien.dau, t1 = W4[W4.length - 1].t1 - K.bien.cuoi;
   {
-    let doi = 0;
-    const tDau = t0 + (t1 - t0) * K.soTrenAnh.phanDau;
-    for (const c of kb.canh) {
-      if (doi >= K.soTrenAnh.toiDa || !c || c.kieu !== "so" || !c.tu) continue;
-      const i = timTu(c.tu);
-      if (i < 0 || W4[i].t0 < t0 || W4[i].t0 > tDau) continue;
-      const cau = W4.slice(Math.max(0, i - 5), i + 10).map((w) => w.text).join(" ");
-      c.kieu = "anh";
-      c.soAnh = 1;
-      c.en = 'Cinematic photorealistic vertical photo that illustrates the meaning of this Vietnamese sentence: "' + cau + '". ' + K.tram.nhanVat[doi % 2] + " Natural light, no text, no captions.";
-      doi++;
+    const coAnh2 = (a, b) => kb.canh.filter((c) => c && c.tu && /^(anh|ds)$/.test(String(c.kieu)) && ((i) => i >= 0 && W4[i].t0 >= a && W4[i].t0 < b)(timTu(c.tu))).length >= 2, ba = (p) => t0 + (t1 - t0) * p / 3;
+    for (const [a, b] of [[t0, t0 + (t1 - t0) * K.soTrenAnh.phanDau], ...[1, 2].filter((p) => !coAnh2(ba(p), ba(p + 1))).map((p) => [ba(p), ba(p + 1)])]) {
+      let doi = 0;
+      for (const c of kb.canh) {
+        if (doi >= K.soTrenAnh.toiDa || !c || c.kieu !== "so" || !c.tu) continue;
+        const i = timTu(c.tu);
+        if (i < 0 || W4[i].t0 < a || W4[i].t0 > b) continue;
+        const cau = W4.slice(Math.max(0, i - 5), i + 10).map((w) => w.text).join(" ");
+        c.kieu = "anh";
+        c.soAnh = 1;
+        c.en = 'Cinematic photorealistic vertical photo that illustrates the meaning of this Vietnamese sentence: "' + cau + '". ' + K.tram.nhanVat[doi % 2] + " Natural light, no text, no captions.";
+        doi++;
+      }
     }
   }
   const moc = kb.canh.filter(
@@ -9767,7 +9769,7 @@ 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(im, W4 / 2 - ww / 2, (d.chu ? 0.19 : 0.24) * H2 - h2 / 2 + (1 - p2) * 0.04 * H2, ww, h2);
+      g.drawImage(im, W4 / 2 - ww / 2, (d.chu ? 0.2 : 0.24) * H2 - h2 / 2 + (1 - p2) * 0.04 * H2, ww, h2);
       g.restore();
     } else if (im) {
       const yT = 0.11 * H2, hA = hT - yT, zc = Math.max(W4 / im.width, hT / im.height);
@@ -9810,7 +9812,7 @@ dangKy("cmNen", (g, d, tuoi, W4, H2, nen2, _s, dai2) => {
     }
     g.fillStyle = "rgba(255,255,255,0.92)";
     g.fillRect(0, hT - 3 * H2 / 1920, W4, 6 * H2 / 1920);
-    if (d.chu) chu(g, d.chu, W4 / 2, hT - (d.chu2 ? 0.15 : 0.11) * H2, 100 * H2 / 1920, "kw", kep9(tuoi / 0.15) * kep9((1.9 - tuoi) / 0.3), 0.74 * W4);
+    if (d.chu) chu(g, d.chu, W4 / 2, hT - (d.chu2 ? 0.15 : im && /^vat:/.test(String(d.ten)) ? 0.07 : 0.11) * H2, 100 * H2 / 1920, "kw", kep9(tuoi / 0.15) * kep9((1.9 - tuoi) / 0.3), 0.74 * W4);
     if (d.chu2) chu(g, d.chu2, W4 / 2, hT - 0.085 * H2, 84 * H2 / 1920, d.do2 ? "do" : "vang", kep9((tuoi - 0.3) / 0.15) * kep9((1.9 - tuoi) / 0.3), 0.74 * W4);
   }
   if (zk > 1.001 && d.bo !== "cut") phongK(g, nen2, W4, H2, F, zk);
@@ -11531,7 +11533,7 @@ function lapCuongMe(o) {
   }
   {
     bc = "B6j keo tram";
-    const KEO = 2.8;
+    const KEO = +(globalThis.__keoTram ?? 2.8);
     sp.sort((p, q) => p.f - q.f);
     sp.forEach((s, k) => {
       if (!/^(anh|chia)$/.test(s.bo) || !s.ten || s.d >= KEO) return;
@@ -12077,6 +12079,7 @@ function lapCuongMe(o) {
               c.bo = "chia";
               delete c.pip;
               delete c.chu2;
+              if (c.d > 2.6) c.d = 2.6;
               continue;
             }
           }
@@ -20835,7 +20838,7 @@ function datCauLenh(a) {
   on2 = true;
   window.addEventListener("message", async (ev) => {
     const d = ev.data;
-    if (!d || d.xvaiLoi130717 !== true) return;
+    if (!d || d.xvaiLoi130820 !== 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) => {