framefields 2.9.0 → 2.9.2

package/dist/{src-CK5rGVbh.mjs → src-DFEqficI.mjs}

@@ -3,10 +3,10 @@ import { F as getPrimitiveGeometry, K as mediaDecoderCache, N as generateExtrude
 import { a as preflightMediaTime, n as decodeAudioSource } from "./dist-C8Xq3zgx.mjs";
 import { t as FontManager } from "./fonts-BW0pPcvJ.mjs";
 import { s as TensorPipeline } from "./dist-Buaaj-Ul.mjs";
-import { _ as pinNodeToObject, a as COCO17_KEYPOINT_NAMES, d as VisionNode, f as VisionRunner, g as pinNodeToLandmark, h as mergeSubjectMask, m as maskObject, n as CLIP_SUBJECT, p as analyzeSequence, u as VisionBundle } from "./renderer-B0piZg9r.mjs";
+import { _ as pinNodeToObject, a as COCO17_KEYPOINT_NAMES, d as VisionNode, f as VisionRunner, g as pinNodeToLandmark, h as mergeSubjectMask, m as maskObject, n as CLIP_SUBJECT, p as analyzeSequence, u as VisionBundle } from "./renderer-B2P1vgb7.mjs";
 import { G as mediaSignalSampler, K as mergeAnimationTracks, N as collectNodeOps, P as compositorToProgram, W as lintComposition, f as LayerAnimation, q as sampleMediaTimeSignal } from "./program-CKpKkllV.mjs";
 import { C as effectFactories, H as Dither, I as ColorBalance, K as Iridescence, L as ColorKey, M as CRT, R as Contour, S as Vision, T as Ascii, Y as LayerStyle, _ as SelectiveColor, a as CustomEffect, at as Posterize, b as TileOffset, c as GradientMap, d as Levels, et as OpArt, f as Modulate, g as SSAO, h as Relight3D, ht as Vignette, i as Curves, it as Pixelate, l as HalftoneScreen, m as PBRGlass, nt as Painterly, o as DepthOfField, ot as ProceduralVFX, p as MotionBlur, pt as Toon, q as Kaleidoscope, r as Crop, s as FilmGrain, st as RGBSplit, t as ApplyLUT, u as HighPass, v as ShadowsHighlights, w as Blur, x as UnsharpMask, y as TemporalDeflicker } from "./effects-CemgqEPv.mjs";
-import { a as HeadlessMediaRenderer, n as renderFrameGrid } from "./renderer-DsEyjwfT.mjs";
+import { a as HeadlessMediaRenderer, n as renderFrameGrid } from "./renderer-DPAD6fL1.mjs";
 import { z, z as z$2 } from "zod";
 import path from "node:path";
 import fs from "node:fs/promises";
@@ -1526,9 +1526,8 @@ var ClipVision = class {
 	* subjects kept, null when it holds no subject.
 	*/
 	subject(frame, fps) {
-		const c = frame * this.fps / fps;
-		if (!this.exact && !this.options.timeRemap && Math.abs(c - Math.round(c)) > 1e-6) return void 0;
-		const sourceFrame = this.options.timeRemap || this.exact ? Math.floor(c + 1e-6) : Math.round(c);
+		const sourceFrame = this.sourceFrame(frame, fps);
+		if (sourceFrame === void 0) return void 0;
 		const s = this.subjects.get(sourceFrame);
 		if (s === void 0) return s;
 		if (s === null || !this.sourceWidth) return null;
@@ -1544,6 +1543,45 @@ var ClipVision = class {
 			detectionIndex: -1
 		};
 	}
+	/**
+	* @internal The pose matched to the subject at a source frame of the clip
+	* (`frame` at `fps`), normalized to the source size, for a render-time
+	* skeleton: undefined until that frame and its smoothing window are
+	* analysed, null when no pose matched there.
+	*/
+	pose(frame, fps) {
+		const c = this.sourceFrame(frame, fps);
+		if (c === void 0 || !this.tracksPose || !this.sourceWidth) return;
+		for (let g = c - this.smoothing; g <= c + this.smoothing; g++) if (!this.results.has(Math.max(0, g))) return void 0;
+		if (!this.results.get(c)?.kp) return null;
+		const width = this.sourceWidth;
+		const height = this.sourceHeight;
+		return {
+			width,
+			height,
+			keypoints: Array.from({ length: 17 }, (_, k) => {
+				const [x, y, visibility] = this.keypoint(k, c);
+				return {
+					x: x / width,
+					y: y / height,
+					visibility
+				};
+			})
+		};
+	}
+	/** Whether frames carry keypoints: on by default, opt-in for prompted (SAM) clips. */
+	get tracksPose() {
+		return this.exact ? this.options.pose === true : this.options.pose ?? true;
+	}
+	/**
+	* The analysed source frame a render-time read at `frame` (at `fps`) maps to;
+	* undefined for an unprompted clip read between its analysed frames.
+	*/
+	sourceFrame(frame, fps) {
+		const c = frame * this.fps / fps;
+		if (!this.exact && !this.options.timeRemap && Math.abs(c - Math.round(c)) > 1e-6) return void 0;
+		return this.options.timeRemap || this.exact ? Math.floor(c + 1e-6) : Math.round(c);
+	}
 	/** Composition frame → clip frame (fractional). */
 	clipFrame(frame) {
 		if (this.options.timeRemap) return mediaSourceTime(this.options.timeRemap, this.localFrame(frame), this.compositionFps) * this.fps;
@@ -1590,7 +1628,7 @@ var ClipVision = class {
 			await this.computeSam3(to);
 			return;
 		}
-		const wantPose = this.options.pose ?? true;
+		const wantPose = this.tracksPose;
 		const wantMask = this.options.mask ?? true;
 		this.runner ??= VisionRunner.create({
 			modelsDir: this.options.modelsDir,
@@ -1685,7 +1723,7 @@ var ClipVision = class {
 			if (!this.sourceWidth) this.setSize(image.width, image.height);
 			const prompt = settings.prompts.find((item) => item.frame === frame);
 			const result$1 = await this.sam2Tracker.process(image, frame, prompt?.points);
-			const kp = this.options.pose ? await this.matchedPose(image, result$1.mask) : null;
+			const kp = this.tracksPose ? await this.matchedPose(image, result$1.mask) : null;
 			this.storeSamFrame(frame, result$1.width, result$1.height, [result$1], kp);
 			if (this.unsaved >= 24) {
 				await this.saveCache();
@@ -1720,6 +1758,7 @@ var ClipVision = class {
 				textThreshold: settings.textThreshold,
 				maxObjects: settings.maxObjects,
 				merge: settings.merge,
+				redetect: settings.redetect,
 				precision: settings.precision,
 				acceptLicense: this.options.acceptSamLicense ?? this.options.sam3?.acceptLicense
 			});
@@ -1731,7 +1770,7 @@ var ClipVision = class {
 			if (!this.sourceWidth) this.setSize(image.width, image.height);
 			const prompt = settings.prompts.find((item) => item.frame === frame);
 			const result$1 = await this.sam3Tracker.process(image, frame, prompt);
-			const kp = this.options.pose ? await this.matchedPose(image, unionMask(result$1.objects, image)) : null;
+			const kp = this.tracksPose ? await this.matchedPose(image, unionMask(result$1.objects, image)) : null;
 			this.storeSamFrame(frame, result$1.width, result$1.height, result$1.objects, kp);
 			if (this.unsaved >= 24) {
 				await this.saveCache();
@@ -1966,7 +2005,7 @@ var ClipVision = class {
 				stat.size,
 				stat.mtimeMs,
 				this.fps,
-				o.pose ?? true,
+				this.tracksPose,
 				o.mask ?? true,
 				this.cell,
 				o.variant ?? "s",
@@ -1974,12 +2013,12 @@ var ClipVision = class {
 				...o.sam2 ? [[
 					sam?.sam2Revision(o.sam2.model),
 					o.sam2,
-					2
+					3
 				]] : [],
 				...o.sam3 && sam ? [[
 					sam.sam3Revision(await sam.sam3Precision(void 0, o.sam3.precision)),
 					o.sam3,
-					2
+					3
 				]] : []
 			]);
 			const hash = crypto.createHash("sha256").update(key).digest("hex").slice(0, 24);
@@ -8561,16 +8600,17 @@ var Composition = class Composition {
 	* frame — physics, particles — always find every frame before it.
 	*/
 	async prepareVision(frame) {
-		this.linkClipMattes();
+		this.linkClipLayers();
 		await Promise.all([...this._clipVision.values()].map((clip) => clip.ready(0, frame)));
 	}
 	/**
-	* Points matte-family `withVision` layers at the `comp.vision` clip they
-	* show, so the cutout reuses that clip's per-frame subject instead of
-	* segmenting the frame again during render. Only layers whose settings
-	* would give the same subject are linked; the rest keep their own pass.
+	* Points matte-family and skeleton `withVision` layers at the `comp.vision`
+	* clip they show, so the cutout reuses that clip's per-frame subject and the
+	* skeleton draws its matched pose, instead of analysing the frame again
+	* during render. Only layers whose settings would give the same subject are
+	* linked; the rest keep their own pass.
 	*/
-	linkClipMattes() {
+	linkClipLayers() {
 		if (this._clipVision.size === 0) return;
 		let layers;
 		const walk = (node) => {
@@ -8582,13 +8622,13 @@ var Composition = class Composition {
 					return [op.id, op];
 				}));
 				const layer = layers.get(n.id);
-				const clip = this.clipForMatte(n.src ?? n.inputHandleId, n.vision, {
+				const clip = this.clipForLayer(n.src ?? n.inputHandleId, n.vision, {
 					trimStartSec: n.trimStartSec,
 					startFrame: layer?.startFrame ?? n.startFrame,
 					timeRemap: layer?.timeRemap
 				});
 				if (clip) {
-					clip.keepSubjects();
+					if (n.vision.mode !== "skeleton") clip.keepSubjects();
 					Object.defineProperty(n.vision, CLIP_SUBJECT, {
 						value: clip,
 						enumerable: false,
@@ -8600,13 +8640,21 @@ var Composition = class Composition {
 		};
 		for (const child of this.children) walk(child);
 	}
-	clipForMatte(source, v, layer) {
+	/** The `comp.vision` clip a matte or skeleton layer of the same source reads instead of analysing. */
+	clipForLayer(source, v, layer) {
 		const mode = v.mode ?? "passthrough";
-		if (mode !== "matte" && mode !== "mask" && mode !== "crop") return;
-		if (v.matteSource === "selfie" || v.keyBackground === true || v.classes !== void 0 || v.enablePose === true || v.enableMatte === true || v.visionBundle !== void 0 || (v.maskThreshold ?? .5) !== .5 || v.featherRadius !== void 0) return;
+		const skeleton = mode === "skeleton";
+		if (mode !== "matte" && mode !== "mask" && mode !== "crop" && !skeleton) return;
+		if (v.classes !== void 0 || v.enableMatte === true || v.visionBundle !== void 0 || !skeleton && (v.matteSource === "selfie" || v.keyBackground === true || v.enablePose === true || (v.maskThreshold ?? .5) !== .5 || v.featherRadius !== void 0)) return;
 		for (const clip of this._clipVision.values()) {
 			const o = clip.options;
-			if (clip.source === source && clip.startFrame === (layer.startFrame ?? 0) && clip.trimStartSec === (layer.trimStartSec ?? 0) && remapKey(o.timeRemap) === remapKey(layer.timeRemap) && (o.variant ?? "s") === (v.variant ?? "s") && (o.confidence ?? .3) === (v.confidence ?? .3)) return clip;
+			if (clip.source === source && clip.startFrame === (layer.startFrame ?? 0) && clip.trimStartSec === (layer.trimStartSec ?? 0) && remapKey(o.timeRemap) === remapKey(layer.timeRemap) && (o.variant ?? "s") === (v.variant ?? "s") && (o.confidence ?? .3) === (v.confidence ?? .3)) {
+				if (skeleton && !clip.tracksPose) {
+					if (clip.exact) throw new Error("A skeleton layer of a prompted comp.vision clip needs `pose: true` on that clip.");
+					continue;
+				}
+				return clip;
+			}
 		}
 	}
 	/**
@@ -9819,4 +9867,4 @@ const Effect = Object.assign(Effect$1, effectFactories, {
 
 //#endregion
 export { glyphAnimator as $, wordRanges as $t, boilKeys as A, squigglePath as At, defineTheme as B, themes as Bt, audioLevelsSchema as C, span as Cn, scaleFrames as Ct, basePropsSchema as D, FRAMEFIELDS_AI_PROXY_URL as Dn, springKeys as Dt, bandEdges as E, ApiError as En, springAt as Et, constantExpression as F, surfaceFill as Ft, elevationStyle as G, transparent as Gt, drawOnKeys as H, toPathData as Ht, contrastRatio as I, targetPoint as It, evaluateEase as J, windowExpression as Jt, ellipsePath as K, typingFrames as Kt, cover as L, targetSchema as Lt, boxPath as M, staggerRanks as Mt, catmullRom as N, stepExpression as Nt, beats as O, ValidationError as On, springSettleFrames as Ot, chain as P, supersede as Pt, frameSpan as Q, wobblePoints as Qt, defineComponent as R, textLayout as Rt, ascending as S, size as Sn, safeArea as St, bakeSamples as T, sup as Tn, smoothRelease as Tt, ease as U, toSeconds as Ut, dist as V, toFrames as Vt, elevate as W, transformPathData as Wt, exitAnimation as X, withDefaults as Xt, evaluateGlyphExpression as Y, withAlpha as Yt, findRange as Z, within as Zt, after as _, italic as _n, resampleBands as _t, Media as a, PhysicsWorld2D as an, last as at, arcPath as b, parseMarkup as bn, rng as bt, section as c, Layer3D as cn, lineShift as ct, analyzeAudio as d, PersonTrack as dn, offsetCues as dt, Styles as en, hashRng as et, KeyBook as f, DEFAULT_CHART_COLORS as fn, parseColor as ft, UNIT_INDEX as g, color as gn, rendererChars as gt, Track as h, code as hn, rangeRects as ht, Light as i, PhysicsBody2D as in, isLight as it, boundsOf as j, staggerOffsets as jt, bind as k, ai as kn, springTrack as kt, bindComponent as l, Particles as ln, luminance as lt, SAFE_INSETS as m, bold as mn, quantize as mt, Effect as n, PhysicsBody3D as nn, holdFirstKeys as nt, blurRegion as o, Lighting as on, lerp2 as ot, MOTION_PRESETS as p, accent as pn, pulseKeys as pt, enterAnimation as q, valueAt as qt, Layer as r, PhysicsWorld3D as rn, inkOn as rt, editTrackedRegion as s, Transition as sn, linePath as st, Composition as t, Physics as tn, hashString as tt, z$2 as u, ClipVision as un, mix as ut, analyzeChannels as v, mark as vn, resolveMotion as vt, bakeFunction as w, sub as wn, scheduleExpression as wt, arrowPaths as x, rich as xn, round as xt, anchorPoint as y, normalizeTextSpans as yn, resolveTarget as yt, defineMeta as z, themeFrames as zt };
-//# sourceMappingURL=src-CK5rGVbh.mjs.map
+//# sourceMappingURL=src-DFEqficI.mjs.map