@vosjs/studio-core 0.42.3 → 0.42.5

package/dist/index.d.ts

@@ -3801,6 +3801,16 @@ interface TrackOptions {
      * entrance's last pose to the span's end in one straight line.
      */
     notBefore?: number;
+    /**
+     * The transition windows, in output seconds: the camera rests through
+     * one (`restSpansThroughTransitions`), so no connected pan runs across
+     * it. A span that ends at a boundary ramps out on its own and the span
+     * after the window ramps in on its own, as two spans a wide gap apart.
+     */
+    rests?: readonly {
+        t: number;
+        d: number;
+    }[];
 }
 /**
  * Expand the doc's source-anchored zoom spans into a standard @vosjs/timeline

package/dist/index.js

@@ -6449,17 +6449,25 @@ function connectedWindow(o) {
   );
   return { start, land };
 }
-function withEntrance(head, build) {
-  return prependEntrance(build({ notBefore: head.at(-1)?.t }), head);
+function withEntrance(head, build, rests) {
+  return prependEntrance(build({ notBefore: head.at(-1)?.t, rests }), head);
+}
+function restsBetween(rests, tOut, nextIn) {
+  return (rests ?? []).some(
+    (w) => w.t > 0 && w.d > 0 && w.t < nextIn && w.t + w.d > tOut
+  );
 }
 var spillLimit = (tIn, tOut) => tIn + (tOut - tIn) / 2;
+function spansInOutputOrder(spans, segments) {
+  return spans.flatMap((z) => {
+    const ext = spanOutputExtent(segments, z.in, z.out, z.media);
+    return ext ? [{ z, tIn: ext.start, tOut: ext.end }] : [];
+  }).sort((a, b) => a.tIn - b.tIn || a.tOut - b.tOut);
+}
 function zoomTrackFromDoc(zoom, segments, style = ZOOM_STYLES[DEFAULT_ZOOM_STYLE], opts = {}) {
   const notBefore = opts.notBefore ?? -Infinity;
   const panEase = style.panEase;
-  const mapped = [...zoom].sort((a, b) => a.in - b.in).flatMap((z) => {
-    const ext = spanOutputExtent(segments, z.in, z.out, z.media);
-    return ext ? [{ z, tIn: ext.start, tOut: ext.end }] : [];
-  });
+  const mapped = spansInOutputOrder(zoom, segments);
   const { keyframes, push: push2 } = trackEmitter();
   const placedAt = (z) => z.screen && z.focusMode !== "auto" ? z.screen : null;
   const placed = mapped.some(({ z }) => placedAt(z) !== null);
@@ -6490,7 +6498,7 @@ function zoomTrackFromDoc(zoom, segments, style = ZOOM_STYLES[DEFAULT_ZOOM_STYLE
     }
     const arrived = keyframes.at(-1)?.t ?? tIn;
     const next = mapped.at(i + 1);
-    const pan = next && next.tIn - tOut <= style.chainGap ? connectedWindow({
+    const pan = next && next.tIn - tOut <= style.chainGap && !restsBetween(opts.rests, tOut, next.tIn) ? connectedWindow({
       arrived,
       tOut,
       landBy: next.tIn + style.rampInOverlap * transitionMult(next.z.transition),
@@ -6567,10 +6575,7 @@ function tiltTrackFromDoc(tilt, segments, motion = {}, opts = {}) {
   const panDur = motion.pan ?? TILT_PAN;
   const panEase = TILT_PAN_EASE;
   const rest = [0, 0];
-  const mapped = [...tilt].sort((a, b) => a.in - b.in).flatMap((z) => {
-    const ext = spanOutputExtent(segments, z.in, z.out, z.media);
-    return ext ? [{ z, tIn: ext.start, tOut: ext.end }] : [];
-  });
+  const mapped = spansInOutputOrder(tilt, segments);
   const { keyframes, push: push2 } = trackEmitter();
   let chained = false;
   for (let i = 0; i < mapped.length; i++) {
@@ -6589,7 +6594,7 @@ function tiltTrackFromDoc(tilt, segments, motion = {}, opts = {}) {
     }
     const arrived = keyframes.at(-1)?.t ?? tIn;
     const next = mapped.at(i + 1);
-    const swing = next && next.tIn - tOut <= chainGap ? connectedWindow({
+    const swing = next && next.tIn - tOut <= chainGap && !restsBetween(opts.rests, tOut, next.tIn) ? connectedWindow({
       arrived,
       tOut,
       landBy: next.tIn,
@@ -6624,10 +6629,7 @@ function camTrackFromDoc(cam, spans, segments, W, H = 1080) {
     z.size != null ? clampCamSize(z.size) : rest[2]
   ];
   const panEase = CAM_PAN_EASE;
-  const mapped = [...spans].sort((a, b) => a.in - b.in).flatMap((z) => {
-    const ext = spanOutputExtent(segments, z.in, z.out, z.media);
-    return ext ? [{ z, tIn: ext.start, tOut: ext.end }] : [];
-  });
+  const mapped = spansInOutputOrder(spans, segments);
   const { keyframes, push: push2 } = trackEmitter();
   let chained = false;
   for (let i = 0; i < mapped.length; i++) {
@@ -6909,9 +6911,24 @@ var SETUP = `async (ctx) => {
     ;(ns.videoBlobs || (ns.videoBlobs = new Map())).set(src, fetched)
     return URL.createObjectURL(fetched)
   }
+  // Every element handed out by this SETUP, so two players never share one.
+  // A take may name one file as two media (the same shot as a teaser and in
+  // full), or as a media and the footage; the by-src cache would hand both
+  // ONE element, and ON_FRAME's concat rule, which pauses every media that
+  // is not under the playhead, then paused the playing clip every frame under
+  // the other name: play/pause churn, the element falling behind the clock,
+  // and a drift-guard seek every ~0.3 s that read as a stuck picture jumping
+  // forward. A second claim on the same bytes gets its OWN element, kept in
+  // the cache under a slot of its own so a warm LOAD reuses it like the first.
+  const claimed = new Set()
   const load = async (src, muted) => {
-    let v = cache.get(src)
-    if (v) return v
+    let key = src
+    let v = cache.get(key)
+    for (let n = 2; v && claimed.has(v); n++) {
+      key = src + '#' + n
+      v = cache.get(key)
+    }
+    if (v) { claimed.add(v); return v }
     let url = src
     if (ctx.data.videoFetchMode === 'blob') {
       try { url = await toBlobUrl(src) }
@@ -6931,7 +6948,8 @@ var SETUP = `async (ctx) => {
       v.onerror = () => rej(new Error('[studio] video failed to load' + (v.error ? ' (' + v.error.code + (v.error.message ? ': ' + v.error.message : '') + ')' : '')))
       v.load()
     })
-    cache.set(src, v)
+    cache.set(key, v)
+    claimed.add(v)
     return v
   }
   // Shots: the "video" is a still image \u2014 drawImage accepts it directly and the
@@ -7375,7 +7393,7 @@ var ON_FRAME = `(ctx, content, dt) => {
   // The card under the playhead: another media's own card fields over the
   // take's frame (resolved at lowering), the take's frame for the primary.
   var cfr = amId && actM && actM.frame ? actM.frame : frame
-  if (r.media) for (var amK in r.media) { var amE = r.media[amK]; if (amK !== amId && amE && amE.pause && amE.paused === false) amE.pause() }
+  if (r.media) for (var amK in r.media) { var amE = r.media[amK]; if (amK !== amId && amE && amE !== video && amE.pause && amE.paused === false) amE.pause() }
   if (amId) {
     if (r.video && r.video.pause && r.video.paused === false) r.video.pause()
     if (r.cam && r.cam.pause && r.cam.paused === false) r.cam.pause()
@@ -8860,7 +8878,8 @@ function lowerToComposition(input) {
   );
   const zoomTrack = withEntrance(
     entranceZoomKeyframes(cardEnter(doc.frame)),
-    (opts) => zoomTrackFromDoc(zoomSpans, rated, zoomStyle, opts)
+    (opts) => zoomTrackFromDoc(zoomSpans, rated, zoomStyle, opts),
+    transitions
   );
   const pins = resolvePins(doc, layout, camera, zoomTrack);
   const pinsData = pinsDataOf(doc, pins);
@@ -8960,7 +8979,7 @@ function lowerToComposition(input) {
         TILT_SPAN_MIN
       ) : [];
       const spans = tilts.length ? (opts) => tiltTrackFromDoc(tilts, rated, zoomStyle.tilt, opts) : () => void 0;
-      const track = withEntrance(head, spans);
+      const track = withEntrance(head, spans, transitions);
       return track ? { tiltTrack: track } : {};
     })(),
     // The card's pose through its enter and its exit: [scale, dy, opacity]
@@ -9063,7 +9082,8 @@ function docZoomTrack(input) {
   );
   return withEntrance(
     entranceZoomKeyframes(cardEnter(doc.frame)),
-    (opts) => zoomTrackFromDoc(spans, rated, zoomStyle, opts)
+    (opts) => zoomTrackFromDoc(spans, rated, zoomStyle, opts),
+    transitions
   );
 }
 function resolvePins(doc, layout, camera, zoomTrack) {