@hyperframes/producer 0.8.149 → 0.8.150

package/dist/distributed.js

@@ -1417,9 +1417,18 @@ import {
 
 // src/services/renderMediaCollector.ts
 import { parseHTML as parseHTML2 } from "linkedom";
-import { MEDIA_RENDER_ID_ATTR, resolveAuthoredTimingWindow } from "@hyperframes/core";
+import {
+  MEDIA_RENDER_ID_ATTR,
+  normalizeRateSpec as normalizeRateSpec2,
+  resolveAuthoredTimingWindow,
+  shiftRateLane,
+  sourceTimeAt as sourceTimeAt2
+} from "@hyperframes/core";
 import {
   MEDIA_START_BASIS_ATTR,
+  compositionOriginSeconds,
+  cutToHostSlots,
+  hostInPointSeconds,
   readMediaStartBasis,
   resolveAbsoluteMediaStartSeconds
 } from "@hyperframes/core/media-timing";
@@ -1429,7 +1438,6 @@ import {
   parseAudioElements,
   resolveReferencedStart
 } from "@hyperframes/engine";
-var COMPOSITION_HOST_ATTR = "data-composition-file";
 function resolveHostEnd(host, hostStart) {
   return resolveAuthoredTimingWindow({
     start: hostStart,
@@ -1437,39 +1445,52 @@ function resolveHostEnd(host, hostStart) {
     end: host.getAttribute("data-end")
   })?.end ?? null;
 }
-var ROOT_WINDOW = { offset: 0, limit: Infinity, basis: "local" };
-function resolveHostWindow(element, document2, startCache, visiting) {
+var ROOT_WINDOW = { offset: 0, limit: Infinity, basis: "local", slots: [] };
+var COMPOSITION_HOST_SELECTOR = "[data-composition-id], [data-composition-src], [data-composition-file]";
+function enclosingHosts(element) {
   const hosts = [];
   for (let ancestor = element.parentElement; ancestor; ancestor = ancestor.parentElement) {
-    if (ancestor.hasAttribute(COMPOSITION_HOST_ATTR)) hosts.push(ancestor);
+    if (ancestor.matches(COMPOSITION_HOST_SELECTOR)) {
+      hosts.unshift(ancestor);
+    }
   }
+  return hosts;
+}
+function resolveHostWindow(element, document2, startCache, visiting) {
+  const hosts = enclosingHosts(element);
   if (hosts.length === 0) return ROOT_WINDOW;
   let offset = 0;
   let limit = Infinity;
-  for (const host of hosts.reverse()) {
+  const slots = [];
+  for (const [index, host] of hosts.entries()) {
     const hostStart = resolveReferencedStart(document2, host, startCache, visiting);
     const hostEnd = resolveHostEnd(host, hostStart);
-    if (hostEnd != null) limit = Math.min(limit, offset + hostEnd);
-    offset += hostStart;
+    if (hostEnd != null && !isRootComposition(host, index)) {
+      limit = Math.min(limit, offset + hostEnd);
+    }
+    if (hostInPointSeconds(host) > 0) {
+      slots.push({ start: offset + hostStart, end: offset + (hostEnd ?? Infinity) });
+    }
+    offset += compositionOriginSeconds(hostStart, host);
   }
+  return { offset, limit, basis: mediaStartBasis(element), slots };
+}
+var isRootComposition = (host, depth) => depth === 0 && !host.matches("[data-composition-src], [data-composition-file]");
+function mediaStartBasis(element) {
   const tag = element.tagName.toLowerCase();
-  const basis = tag === "video" || tag === "audio" ? readMediaStartBasis(element.getAttribute(MEDIA_START_BASIS_ATTR)) : "local";
-  return {
-    offset,
-    limit,
-    basis
-  };
+  return tag === "video" || tag === "audio" ? readMediaStartBasis(element.getAttribute(MEDIA_START_BASIS_ATTR)) : "local";
 }
 function collectHostWindows(html) {
   const { document: document2 } = parseHTML2(html);
   const windows = /* @__PURE__ */ new Map();
   const startCache = /* @__PURE__ */ new Map();
   const visiting = /* @__PURE__ */ new Set();
-  for (const element of document2.querySelectorAll(`[${MEDIA_RENDER_ID_ATTR}]`)) {
+  for (const element of document2.querySelectorAll("video, audio, img[src]")) {
     const renderId = element.getAttribute(MEDIA_RENDER_ID_ATTR);
-    if (!renderId) continue;
+    const id = renderId || element.getAttribute("id");
+    if (!id || !renderId && windows.has(id)) continue;
     windows.set(
-      renderId,
+      id,
       resolveHostWindow(element, document2, startCache, visiting)
     );
   }
@@ -1487,34 +1508,59 @@ function toAbsoluteWindow(start, end, window2) {
     hostStart: window2.offset,
     basis: window2.basis
   });
-  return { start: absoluteStart, end: Math.min(absoluteEnd, window2.limit) };
+  const absolute = { start: absoluteStart, end: Math.min(absoluteEnd, window2.limit) };
+  const played = cutToHostSlots(absolute, window2.slots);
+  if (played.end === played.start && absolute.end > absolute.start) return null;
+  return { start: absolute.start, end: played.end, played };
+}
+function startAtPlayed(clip, played) {
+  const head = played.start - clip.start;
+  if (head <= 0) return clip;
+  if ("loop" in clip && clip.loop) return { ...clip, start: played.start };
+  const rate = normalizeRateSpec2(clip.playbackRate);
+  return {
+    ...clip,
+    start: played.start,
+    mediaStart: clip.mediaStart + sourceTimeAt2(rate, head),
+    playbackRate: shiftRateLane(rate, head)
+  };
 }
 function collectRenderMedia(html) {
   const windows = collectHostWindows(html);
   const windowFor = (id) => windows.get(id) ?? ROOT_WINDOW;
+  const droppedMediaIds = /* @__PURE__ */ new Set();
   const videos = [];
   for (const video of parseVideoElements(html)) {
     const absolute = toAbsoluteWindow(video.start, video.end, windowFor(video.id));
-    if (absolute) videos.push({ ...video, ...absolute });
+    if (!absolute) {
+      droppedMediaIds.add(video.id);
+      continue;
+    }
+    videos.push(
+      startAtPlayed({ ...video, start: absolute.start, end: absolute.end }, absolute.played)
+    );
   }
   const images = [];
   for (const image of parseImageElements(html)) {
     const absolute = toAbsoluteWindow(image.start, image.end, windowFor(image.id));
-    if (absolute) images.push({ ...image, ...absolute });
+    if (absolute) images.push({ ...image, start: absolute.start, end: absolute.end });
+    else droppedMediaIds.add(image.id);
   }
   const audios = [];
   for (const audio of parseAudioElements(html)) {
     const elementId = audio.type === "video" ? audio.id.replace(/-audio$/, "") : audio.id;
-    const authoredEnd = audio.end > 0 ? audio.end : Infinity;
-    const absolute = toAbsoluteWindow(audio.start, authoredEnd, windowFor(elementId));
-    if (!absolute) continue;
-    audios.push({
-      ...audio,
-      start: absolute.start,
-      end: Number.isFinite(absolute.end) ? absolute.end : 0
-    });
+    const placed = placeAudio(audio, windowFor(elementId));
+    if (placed) audios.push(placed);
+    else droppedMediaIds.add(elementId);
   }
-  return { videos, audios, images };
+  return { videos, audios, images, droppedMediaIds };
+}
+function placeAudio(audio, window2) {
+  const authoredEnd = audio.end > 0 ? audio.end : Infinity;
+  const absolute = toAbsoluteWindow(audio.start, authoredEnd, window2);
+  if (!absolute) return null;
+  const end = Number.isFinite(absolute.end) ? absolute.end : 0;
+  return startAtPlayed({ ...audio, start: absolute.start, end }, absolute.played);
 }
 
 // src/services/htmlCompiler.ts
@@ -1522,6 +1568,7 @@ import {
   analyzeKeyframeIntervals,
   assertMediaPayload,
   NotMediaPayloadError as NotMediaPayloadError2,
+  parseMasterFxChain,
   probeMediaProfile as probeMediaProfile2
 } from "@hyperframes/engine";
 
@@ -3221,7 +3268,8 @@ async function compileForRender(projectDir, htmlPath, downloadDir, options = {})
   for (const [relPath, absPath] of preparedGifAssets) {
     externalAssets.set(relPath, absPath);
   }
-  const { videos, audios, images } = collectRenderMedia(html);
+  const { videos, audios, images, droppedMediaIds } = collectRenderMedia(html);
+  const masterFxChain = parseMasterFxChain(html);
   for (const video of videos) {
     if (isHttpUrl(video.src)) continue;
     const videoPath = resolve5(projectDir, video.src);
@@ -3255,6 +3303,8 @@ async function compileForRender(projectDir, htmlPath, downloadDir, options = {})
     videos,
     audios,
     images,
+    droppedMediaIds,
+    ...masterFxChain ? { masterFxChain } : {},
     unresolvedCompositions,
     externalAssets,
     width,
@@ -3687,6 +3737,7 @@ async function runCompileStage(input) {
     videos: compiled.videos,
     audios: compiled.audios,
     images: compiled.images,
+    masterFxChain: compiled.masterFxChain,
     width: compiled.width,
     height: compiled.height
   };
@@ -3749,7 +3800,7 @@ import {
   isTransientBrowserError,
   probeBeginFrameLiveness
 } from "@hyperframes/engine";
-import { fpsToNumber as fpsToNumber7 } from "@hyperframes/core";
+import { MEDIA_RENDER_ID_ATTR as MEDIA_RENDER_ID_ATTR2, fpsToNumber as fpsToNumber7, readMediaStart as readMediaStart2 } from "@hyperframes/core";
 import { extractMediaSrcMutations } from "@hyperframes/parsers";
 
 // src/services/render/stages/probeFailures.ts
@@ -3796,6 +3847,26 @@ function hasVariableBoundMedia(html, variables) {
     return Boolean(variableId && Object.hasOwn(variables, variableId));
   });
 }
+function authoredMediaStarts(html) {
+  const { document: document2 } = parseHTML5(html);
+  const starts = /* @__PURE__ */ new Map();
+  for (const media of document2.querySelectorAll("video, audio")) {
+    const id = media.getAttribute(MEDIA_RENDER_ID_ATTR2) || media.getAttribute("id");
+    if (id && !starts.has(id)) starts.set(id, readMediaStart2(media));
+  }
+  return starts;
+}
+function adoptRuntimeMediaStart(composition, el, authored) {
+  const shift = el.mediaStart - authored;
+  if (el.mediaStart <= 0 || Math.abs(shift) <= BROWSER_MEDIA_EPSILON) return;
+  const entries = el.tagName === "video" ? [
+    ...composition.videos.filter((video) => video.id === el.id),
+    ...composition.audios.filter(
+      (audio) => audio.type === "video" && audio.id === `${el.id}-audio`
+    )
+  ] : composition.audios.filter((audio) => audio.type !== "video" && audio.id === el.id);
+  for (const entry of entries) entry.mediaStart += shift;
+}
 function reconcileBrowserMediaEnd(existingEnd, projectedEnd, sourceChanged, durationInferred) {
   if (projectedEnd <= 0) return existingEnd;
   if (sourceChanged && durationInferred) return projectedEnd;
@@ -4049,6 +4120,7 @@ async function runProbeStage(input) {
         const existingVideoIds = new Set(composition.videos.map((v) => v.id));
         const existingAudioIds = new Set(composition.audios.map((a) => a.id));
         const existingImageIds = new Set(composition.images.map((image) => image.id));
+        const authoredStarts = authoredMediaStarts(compiled.html);
         pruneMutedBrowserMedia(composition, browserMedia, existingAudioIds);
         for (const el of browserMedia) {
           if (!el.src || el.src === "about:blank") continue;
@@ -4076,9 +4148,11 @@ async function runProbeStage(input) {
                   sourceChanged,
                   el.durationInferred
                 );
-                if (el.mediaStart > 0 && (existing.mediaStart <= 0 || Math.abs(existing.mediaStart - el.mediaStart) > BROWSER_MEDIA_EPSILON)) {
-                  existing.mediaStart = el.mediaStart;
-                }
+                adoptRuntimeMediaStart(
+                  composition,
+                  el,
+                  authoredStarts.get(el.id) ?? existing.mediaStart
+                );
                 if (el.hasAudio && !el.muted && !existing.hasAudio) {
                   existing.hasAudio = true;
                 }
@@ -4086,7 +4160,7 @@ async function runProbeStage(input) {
                   existing.loop = true;
                 }
               }
-            } else {
+            } else if (!compiled.droppedMediaIds.has(el.id)) {
               composition.videos.push({
                 id: el.id,
                 src,
@@ -4117,14 +4191,16 @@ async function runProbeStage(input) {
                   sourceChanged,
                   el.durationInferred
                 );
-                if (el.mediaStart > 0 && (existing.mediaStart <= 0 || Math.abs(existing.mediaStart - el.mediaStart) > BROWSER_MEDIA_EPSILON)) {
-                  existing.mediaStart = el.mediaStart;
-                }
+                adoptRuntimeMediaStart(
+                  composition,
+                  el,
+                  authoredStarts.get(el.id) ?? existing.mediaStart
+                );
                 if (el.volume > 0 && Math.abs((existing.volume ?? 1) - el.volume) > BROWSER_MEDIA_EPSILON) {
                   existing.volume = el.volume;
                 }
               }
-            } else {
+            } else if (!compiled.droppedMediaIds.has(el.id)) {
               composition.audios.push({
                 id: el.id,
                 src,
@@ -4152,7 +4228,7 @@ async function runProbeStage(input) {
                   existing.end = projectedEnd;
                 }
               }
-            } else {
+            } else if (!compiled.droppedMediaIds.has(el.id)) {
               composition.images.push({
                 id: el.id,
                 src,
@@ -4771,6 +4847,7 @@ async function runAudioStage(input) {
     ffmpegProcessTimeout,
     audioGain,
     audios,
+    masterFxChain,
     abortSignal,
     assertNotAborted,
     log
@@ -4790,7 +4867,7 @@ async function runAudioStage(input) {
         audioOutputPath,
         duration,
         abortSignal,
-        { ffmpegProcessTimeout, audioGain },
+        { ffmpegProcessTimeout, audioGain, masterFxChain },
         compiledDir
       );
     } catch (err) {
@@ -7449,6 +7526,7 @@ async function buildLocalExecutionPlan(projectDir, config, executionPlanDir, opt
     ffmpegProcessTimeout: cfg.ffmpegProcessTimeout,
     audioGain: cfg.audioGain,
     audios: composition.audios,
+    masterFxChain: composition.masterFxChain,
     abortSignal,
     assertNotAborted
   });

package/dist/hyperframe.manifest.json

@@ -1,7 +1,7 @@
 {
   "version": "0.1.0",
   "buildId": "dev",
-  "sha256": "675e02ee21f31540e3a6abaec061f86cea92a0178ae67a390700acb4f801dbbc",
+  "sha256": "5e5acecab6120687d5061738fa55e78cbfc0fe48f7dcbc81eb494e36ba6bcc50",
   "artifacts": {
     "iife": "hyperframe.runtime.iife.js",
     "esm": "hyperframe.runtime.mjs"