@poe-platform/safe-bash 0.1.835 → 0.1.837

package/dist/safe-bash/command-chunks/{chunk-THJIIMGT.js → chunk-RSFKQE2U.js}

@@ -12,7 +12,7 @@ import {
   probeOggStreamMetadata,
   scanMp4Frames,
   scanMp4Packets
-} from "./chunk-GQQUZGIZ.js";
+} from "./chunk-FH5VMAPS.js";
 
 // packages/safe-bash-command-ffprobe/src/probe-text.ts
 import { yieldTurn } from "../../safe-bash-contracts/yield.js";

package/dist/safe-bash-command-ffmpeg/index.js

@@ -20,7 +20,7 @@ import {
   sliceMp4,
   srtAst,
   webvttAst
-} from "../safe-bash/command-chunks/chunk-GQQUZGIZ.js";
+} from "../safe-bash/command-chunks/chunk-FH5VMAPS.js";
 import "../safe-bash/command-chunks/chunk-65DS4IOB.js";
 
 // packages/safe-bash-command-ffmpeg/src/index.ts
@@ -278,19 +278,22 @@ function* lavfiSteps(spec, budget, durationOverride) {
     )
   };
 }
-async function ensureDecodedFrames(track, budget, signal) {
-  if (track.decodedVideoFrames && track.decodedVideoFrames.length > 0) {
-    return [...track.decodedVideoFrames];
-  }
+async function ensureDecodedFrames(track, movieTimescale, budget, signal, maxFrames) {
   const width = track.width ?? track.codecDescriptions[0]?.width ?? 64;
   const height = track.height ?? track.codecDescriptions[0]?.height ?? 64;
   const ts = track.timescale || 9e4;
   const frames = [];
-  for (const frame of decodeH264Samples(track.samples, track.codecDescriptions, width, height, ts)) {
+  const decoded = track.decodedVideoFrames ?? decodeH264Samples(track.samples, track.codecDescriptions, width, height, ts);
+  for (const frame of decoded) {
     await yieldTurn(signal);
     signal?.throwIfAborted();
-    budget.recordFrame(frame.width, frame.height);
+    if (!track.decodedVideoFrames) budget.recordFrame(frame.width, frame.height);
+    const pts = Math.round(frame.ptsSeconds * ts);
+    if (track.editList?.length && !track.editList.some(
+      (edit) => edit.mediaTime >= 0 && pts >= edit.mediaTime && pts < edit.mediaTime + edit.segmentDuration * ts / movieTimescale
+    )) continue;
     frames.push(frame);
+    if (maxFrames !== void 0 && frames.length >= maxFrames) break;
   }
   return frames;
 }
@@ -942,6 +945,8 @@ function evalSyncFfmpeg(inBytesOrArgs, maybeArgs, readFileSync, writeFileSync) {
         const plugin = registry.detect(rawBytes, inp.path, inp.format);
         if (!plugin || !plugin.canDemux) return void 0;
         doc = plugin.parse(rawBytes, { filename: inp.path, budget });
+        const imageOutput = (outputFormat ? registry.findByFormatName(outputFormat) : registry.findByFilename(outputTarget))?.id === "image2";
+        if ((imageOutput || maxVideoFrames !== void 0) && doc.tracks.some((track) => track.type === "video" && !track.decodedVideoFrames)) return void 0;
       }
       if (inp.startSeconds !== void 0 || inp.endSeconds !== void 0 || inp.durationSeconds !== void 0) {
         doc = sliceMp4(doc, { startSeconds: inp.startSeconds, endSeconds: inp.endSeconds, durationSeconds: inp.durationSeconds });
@@ -1449,11 +1454,13 @@ function createFfmpegCommand(options = {}) {
           } else if (filterComplex.includes("xfade") && loadedDocs.length >= 2) {
             const f0 = await ensureDecodedFrames(
               loadedDocs[0].tracks.find((t) => t.type === "video"),
+              loadedDocs[0].timescale,
               budget,
               context.signal
             );
             const f1 = await ensureDecodedFrames(
               loadedDocs[1].tracks.find((t) => t.type === "video"),
+              loadedDocs[1].timescale,
               budget,
               context.signal
             );
@@ -1507,11 +1514,13 @@ function createFfmpegCommand(options = {}) {
           } else if (filterComplex.includes("vstack") && loadedDocs.length >= 2) {
             const f0 = await ensureDecodedFrames(
               loadedDocs[0].tracks.find((t) => t.type === "video"),
+              loadedDocs[0].timescale,
               budget,
               context.signal
             );
             const f1 = await ensureDecodedFrames(
               loadedDocs[1].tracks.find((t) => t.type === "video"),
+              loadedDocs[1].timescale,
               budget,
               context.signal
             );
@@ -1553,11 +1562,13 @@ function createFfmpegCommand(options = {}) {
           } else if (filterComplex.includes("hstack") && loadedDocs.length >= 2) {
             const f0 = await ensureDecodedFrames(
               loadedDocs[0].tracks.find((t) => t.type === "video"),
+              loadedDocs[0].timescale,
               budget,
               context.signal
             );
             const f1 = await ensureDecodedFrames(
               loadedDocs[1].tracks.find((t) => t.type === "video"),
+              loadedDocs[1].timescale,
               budget,
               context.signal
             );
@@ -1599,11 +1610,13 @@ function createFfmpegCommand(options = {}) {
           } else if (filterComplex.includes("overlay") && loadedDocs.length >= 2) {
             const f0 = await ensureDecodedFrames(
               loadedDocs[0].tracks.find((t) => t.type === "video"),
+              loadedDocs[0].timescale,
               budget,
               context.signal
             );
             const f1 = await ensureDecodedFrames(
               loadedDocs[1].tracks.find((t) => t.type === "video"),
+              loadedDocs[1].timescale,
               budget,
               context.signal
             );
@@ -1689,20 +1702,16 @@ function createFfmpegCommand(options = {}) {
         if (outputFps && videoCodec !== "copy") {
           vfFilters.push(`fps=${outputFps}`);
         }
-        if (maxVideoFrames !== void 0 && !vfFilters.some((f) => /\b(fps|select|reverse|trim|tile|setpts)\b/i.test(f))) {
+        const imageOutput = (outputFormat ? registry.findByFormatName(outputFormat) : registry.findByFilename(outputTarget))?.id === "image2";
+        if (imageOutput || maxVideoFrames !== void 0 && videoCodec !== "copy") {
           workingDoc = {
             ...workingDoc,
-            tracks: workingDoc.tracks.map((t) => {
-              if (t.type !== "video") return t;
-              if (t.decodedVideoFrames && t.decodedVideoFrames.length > maxVideoFrames) {
-                return { ...t, samples: [], decodedVideoFrames: t.decodedVideoFrames.slice(0, maxVideoFrames) };
-              }
-              if (t.samples.length > maxVideoFrames) {
-                const slicedSamples = t.samples.slice(0, maxVideoFrames);
-                return { ...t, duration: slicedSamples.reduce((acc, s) => acc + s.duration, 0), samples: slicedSamples };
-              }
-              return t;
-            })
+            tracks: await mapWork(workingDoc.tracks, async (track) => {
+              if (track.type !== "video") return track;
+              const limit = vfFilters.length === 0 ? maxVideoFrames : void 0;
+              const frames = await ensureDecodedFrames(track, workingDoc.timescale, budget, context.signal, limit);
+              return { ...track, samples: [], decodedVideoFrames: frames };
+            }, context.signal)
           };
         }
         if (vfFilters.length > 0) {
@@ -1740,7 +1749,7 @@ function createFfmpegCommand(options = {}) {
                 }
               }
               const offsetTicks = Math.round(presentationOffset * t.timescale);
-              const decoded = await ensureDecodedFrames(t, budget, context.signal);
+              const decoded = await ensureDecodedFrames(t, workingDoc.timescale, budget, context.signal);
               const displayed = decoded.map((frame) => ({ ...frame, ptsSeconds: (Math.round(frame.ptsSeconds * t.timescale) - offsetTicks) / t.timescale }));
               const filtered = await applyVideoFilterChain(displayed, combinedChain, budget, loadedSubtitleCues, context.signal);
               const first = filtered[0];
@@ -1954,6 +1963,9 @@ function createFfmpegCommand(options = {}) {
           options.onMetrics?.(budget.getStats());
           return { exitCode: 0 };
         }
+        if (imageOutput && !workingDoc.tracks.some((track) => track.type === "video" && track.decodedVideoFrames?.length)) {
+          throw new Error("No video frame in the requested presentation interval");
+        }
         if (/%0?\d*d/.test(outputTarget)) {
           const outExt2 = outputTarget.split(".").pop()?.toLowerCase() ?? "png";
           const imgPlugin = registry.findByFilename(`x.${outExt2}`);
@@ -1961,7 +1973,7 @@ function createFfmpegCommand(options = {}) {
             throw new Error(`Unsupported output format for '${outputTarget}' (AST not registered)`);
           }
           const vTrack = workingDoc.tracks.find((t) => t.type === "video");
-          const frames = vTrack ? await ensureDecodedFrames(vTrack, budget, context.signal) : [];
+          const frames = vTrack ? await ensureDecodedFrames(vTrack, workingDoc.timescale, budget, context.signal) : [];
           const limit = maxVideoFrames ? Math.min(frames.length, maxVideoFrames) : frames.length;
           const imgFmt = outExt2 === "jpg" || outExt2 === "jpeg" ? "jpeg" : outExt2 === "webp" ? "webp" : outExt2 === "gif" ? "gif" : outExt2 === "bmp" ? "bmp" : outExt2 === "ppm" ? "ppm" : "png";
           for (let idx = 0; idx < limit; idx++) {

package/dist/safe-bash-command-ffprobe/index.js

@@ -1,8 +1,8 @@
 import {
   createFfprobeCommand
-} from "../safe-bash/command-chunks/chunk-THJIIMGT.js";
+} from "../safe-bash/command-chunks/chunk-RSFKQE2U.js";
 import "../safe-bash/command-chunks/chunk-MGBHGZEX.js";
-import "../safe-bash/command-chunks/chunk-GQQUZGIZ.js";
+import "../safe-bash/command-chunks/chunk-FH5VMAPS.js";
 import "../safe-bash/command-chunks/chunk-65DS4IOB.js";
 
 // packages/safe-bash-command-ffprobe/src/index.ts

package/dist/safe-bash-command-ffprobe/media.js

@@ -11,9 +11,9 @@ import {
   loadManifestResources,
   resolvePath,
   rethrowRuntimeError
-} from "../safe-bash/command-chunks/chunk-THJIIMGT.js";
+} from "../safe-bash/command-chunks/chunk-RSFKQE2U.js";
 import "../safe-bash/command-chunks/chunk-MGBHGZEX.js";
-import "../safe-bash/command-chunks/chunk-GQQUZGIZ.js";
+import "../safe-bash/command-chunks/chunk-FH5VMAPS.js";
 import "../safe-bash/command-chunks/chunk-65DS4IOB.js";
 export {
   createFfprobeCommand,