xvai-loi 0.1.86 → 0.1.88

package/co.txt

@@ -1 +1 @@
-xvaiLoi120301
+xvaiLoi120538

package/package.json

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

@@ -11549,6 +11549,12 @@ 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 yenMat = (fa, fb) => {
+    const a0 = nguon3(fa), b0 = nguon3(fb), ss = (fm || []).filter((x) => x && x.face && x.t >= a0 && x.t <= b0).map((x) => x.face);
+    if (ss.length < 2) return true;
+    const cx = ss.map((q) => q.x + q.w / 2), cy = ss.map((q) => q.y + q.h / 2), hh = ss.map((q) => q.h);
+    return Math.max(...cx) - Math.min(...cx) <= 0.12 && Math.max(...cy) - Math.min(...cy) <= 0.08 && Math.max(...hh) / Math.max(1e-6, Math.min(...hh)) <= 1.35;
+  };
   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;
@@ -11953,7 +11959,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 ? ((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 === "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 || !yenMat(f2, f2 + 3.6) ? { 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);
@@ -16023,7 +16029,12 @@ var MontagePanel = ({ project, onUpdate, onExport }) => {
 var parse2 = (text2) => {
   const a = text2.indexOf("{"), b = text2.lastIndexOf("}");
   if (a < 0 || b < a) throw new Error("AI ch\u01B0a tr\u1EA3 d\u1EEF li\u1EC7u l\u1EDDi n\xF3i.");
-  return JSON.parse(text2.slice(a, b + 1));
+  const t = text2.slice(a, b + 1);
+  try {
+    return JSON.parse(t);
+  } catch (e) {
+    return JSON.parse(t.replace(/([{,]\s*)([A-Za-z_][A-Za-z0-9_]*)\s*:/g, '$1"$2":').replace(/,\s*([}\]])/g, "$1"));
+  }
 };
 async function analyzeSpeech(project, scene, item, request, onProgress, onCache, cancel, templateMode = false, dense = false, boNhan = false) {
   const active = () => {
@@ -16054,10 +16065,18 @@ async function analyzeSpeech(project, scene, item, request, onProgress, onCache,
     let part = cached[n];
     if (!part) {
       const prompt = "Ch\xE9p CH\xCDNH X\xC1C ti\u1EBFng Vi\u1EC7t nghe \u0111\u01B0\u1EE3c, kh\xF4ng vi\u1EBFt l\u1EA1i, kh\xF4ng th\xEAm l\u1EDDi t\u1EEB ki\u1EBFn th\u1EE9c. Ch\u1ED7 im l\u1EB7ng/nh\u1EA1c kh\xF4ng c\xF3 l\u1EDDi tr\u1EA3 r\u1ED7ng. Tr\u1EA3 JSON {words:[{t0,t1,text}],unclear:[]}. M\u1ED7i text l\xE0 m\u1ED9t ti\u1EBFng/t\u1EEB nghe \u0111\u01B0\u1EE3c, timestamp gi\xE2y t\xEDnh t\u1EEB \u0111\u1EA7u t\u1EC7p \xE2m thanh n\xE0y, t\u0103ng d\u1EA7n, kh\xF4ng ch\u1ED3ng, trong 0.." + (b - a).toFixed(3) + ". Kh\xF4ng g\u1ED9p c\xE2u v\xE0o m\u1ED9t t\u1EEB. Gi\u1EEF t\xEAn ri\xEAng v\xE0 d\u1EA5u ti\u1EBFng Vi\u1EC7t. N\u1EBFu kh\xF4ng ch\u1EAFc ghi unclear, kh\xF4ng b\u1ECBa.";
-      const result = await Flow.generate.text(prompt, { audios: [{ base64: wav64(pcm.subarray(Math.round(a * 16e3), Math.round(b * 16e3))), mimeType: "audio/wav" }], thinkingLevel: "medium" });
-      calls++;
-      active();
-      const parsed = parse2(result.text), valid2 = validateWords(parsed.words, 0, b - a);
+      let parsed = null;
+      for (let lan2 = 0; lan2 < 2 && !parsed; lan2++) {
+        const result = await Flow.generate.text(prompt, { audios: [{ base64: wav64(pcm.subarray(Math.round(a * 16e3), Math.round(b * 16e3))), mimeType: "audio/wav" }], thinkingLevel: "medium" });
+        calls++;
+        active();
+        try {
+          parsed = parse2(result.text);
+        } catch (e) {
+          if (lan2) throw e;
+        }
+      }
+      const valid2 = validateWords(parsed.words, 0, b - a);
       part = { start, end, words: valid2.map((w) => ({ ...w, t0: w.t0 + a, t1: w.t1 + a })).filter((w) => (w.t0 + w.t1) / 2 >= start && (w.t0 + w.t1) / 2 < end), unclear: Array.isArray(parsed.unclear) ? parsed.unclear : [] };
     }
     parts.push(part);
@@ -21003,7 +21022,7 @@ function datCauLenh(a) {
   on2 = true;
   window.addEventListener("message", async (ev) => {
     const d = ev.data;
-    if (!d || d.xvaiLoi120301 !== true) return;
+    if (!d || d.xvaiLoi120538 !== 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) => {