@editframe/assets 0.7.0-beta.1 → 0.7.0-beta.5

package/dist/lib/av/MP4File.cjs

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const MP4Box = require("mp4box");
+const debug = require("debug");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
   if (e) {
@@ -18,6 +19,7 @@ function _interopNamespaceDefault(e) {
   return Object.freeze(n);
 }
 const MP4Box__namespace = /* @__PURE__ */ _interopNamespaceDefault(MP4Box);
+const log = debug("ef:av:mp4file");
 class MP4File extends MP4Box__namespace.ISOFile {
   constructor() {
     super(...arguments);
@@ -114,7 +116,7 @@ class MP4File extends MP4Box__namespace.ISOFile {
               fragTrak.segmentStream
             );
           } catch (error) {
-            console.log("Failed to createFragment", error);
+            console.error("Failed to createFragment", error);
           }
           if (result) {
             fragTrak.segmentStream = result;
@@ -140,6 +142,9 @@ class MP4File extends MP4Box__namespace.ISOFile {
             if (trak.nextSample >= trak.samples.length) {
               trackInfoForFrag.complete = true;
             }
+            log(
+              `Yielding fragment #${trackInfoForFrag.index} for track=${fragTrak.id}`
+            );
             const startSample = fragmentStartSamples[fragTrak.id];
             const endSample = trak.samples[trak.nextSample - 1];
             if (!startSample || !endSample) {

package/dist/lib/av/MP4File.js

@@ -1,4 +1,6 @@
 import * as MP4Box from "mp4box";
+import debug from "debug";
+const log = debug("ef:av:mp4file");
 class MP4File extends MP4Box.ISOFile {
   constructor() {
     super(...arguments);
@@ -95,7 +97,7 @@ class MP4File extends MP4Box.ISOFile {
               fragTrak.segmentStream
             );
           } catch (error) {
-            console.log("Failed to createFragment", error);
+            console.error("Failed to createFragment", error);
           }
           if (result) {
             fragTrak.segmentStream = result;
@@ -121,6 +123,9 @@ class MP4File extends MP4Box.ISOFile {
             if (trak.nextSample >= trak.samples.length) {
               trackInfoForFrag.complete = true;
             }
+            log(
+              `Yielding fragment #${trackInfoForFrag.index} for track=${fragTrak.id}`
+            );
             const startSample = fragmentStartSamples[fragTrak.id];
             const endSample = trak.samples[trak.nextSample - 1];
             if (!startSample || !endSample) {

package/dist/packages/assets/src/Probe.cjs

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const node_child_process = require("node:child_process");
-const execPromise = require("../../../lib/util/execPromise.cjs");
-const z = require("zod");
 const node_fs = require("node:fs");
+const z = require("zod");
+const debug = require("debug");
+const execPromise = require("../../../lib/util/execPromise.cjs");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
   if (e) {
@@ -21,6 +22,7 @@ function _interopNamespaceDefault(e) {
   return Object.freeze(n);
 }
 const z__namespace = /* @__PURE__ */ _interopNamespaceDefault(z);
+const log = debug("ef:assets:probe");
 const AudioStreamSchema = z__namespace.object({
   index: z__namespace.number(),
   codec_name: z__namespace.string(),
@@ -91,9 +93,11 @@ class Probe {
     this.data = ProbeSchema.parse(rawData);
   }
   static async probePath(absolutePath) {
-    const probeResult = await execPromise.execPromise(
-      `ffprobe -v error -show_format -show_streams -of json ${absolutePath}`
-    );
+    const probeCommand = `ffprobe -v error -show_format -show_streams -of json ${absolutePath}`;
+    log("Probing", probeCommand);
+    const probeResult = await execPromise.execPromise(probeCommand);
+    log("Probe result", probeResult.stdout);
+    log("Probe stderr", probeResult.stderr);
     const json = JSON.parse(probeResult.stdout);
     return new Probe(absolutePath, json);
   }
@@ -114,9 +118,7 @@ class Probe {
     return this.data.format;
   }
   get mustReencodeAudio() {
-    return this.audioStreams.some(
-      (stream) => stream.codec_name !== "aac" || stream.sample_rate !== "48000"
-    );
+    return this.audioStreams.some((stream) => stream.codec_name !== "aac");
   }
   get mustReencodeVideo() {
     return false;
@@ -148,9 +150,7 @@ class Probe {
         "-c:a",
         "aac",
         "-b:a",
-        "192k",
-        "-ar",
-        "48000"
+        "192k"
       ];
     }
     return ["-c:a", "copy"];
@@ -163,31 +163,60 @@ class Probe {
       return [
         "-c:v",
         "h264",
+        // Filter out SEI NAL units that aren't supported by the webcodecs decoder
+        "-bsf:v",
+        "filter_units=remove_types=6",
         "-pix_fmt",
         "yuv420p"
       ];
     }
-    return ["-c:v", "copy"];
+    return [
+      "-c:v",
+      "copy",
+      // Filter out SEI NAL units that aren't supported by the webcodecs decoder
+      "-bsf:v",
+      "filter_units=remove_types=6"
+    ];
   }
   createConformingReadstream() {
     if (!this.mustProcess) {
       return node_fs.createReadStream(this.absolutePath);
     }
-    return node_child_process.spawn("ffmpeg", [
+    const ffmpegConformanceArgs = [
       "-i",
       this.absolutePath,
       ...this.ffmpegAudioOptions,
       ...this.ffmpegVideoOptions,
       "-f",
       "mp4",
-      "-frag_duration",
-      "8000000",
+      "-movflags",
+      "cmaf+frag_keyframe+empty_moov",
+      "pipe:1"
+    ];
+    log("Running ffmpeg", ffmpegConformanceArgs);
+    const ffmpegConformer = node_child_process.spawn("ffmpeg", ffmpegConformanceArgs, {
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    ffmpegConformer.stderr.on("data", (data) => {
+      log(data.toString());
+    });
+    const ffmpegFragmentArgs = [
+      "-i",
+      "-",
+      "-c",
+      "copy",
+      "-f",
+      "mp4",
       "-movflags",
       "frag_keyframe+empty_moov",
       "pipe:1"
-    ], {
-      stdio: ["ignore", "pipe", "inherit"]
-    }).stdout;
+    ];
+    log("Running ffmpeg", ffmpegFragmentArgs);
+    const ffmpegFragmenter = node_child_process.spawn("ffmpeg", ffmpegFragmentArgs, {
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    ffmpegConformer.stdout.pipe(ffmpegFragmenter.stdin);
+    return ffmpegFragmenter.stdout;
   }
 }
 exports.AudioStreamSchema = AudioStreamSchema;

package/dist/packages/assets/src/Probe.js

@@ -1,7 +1,9 @@
 import { spawn } from "node:child_process";
-import { execPromise } from "../../../lib/util/execPromise.js";
-import * as z from "zod";
 import { createReadStream } from "node:fs";
+import * as z from "zod";
+import debug from "debug";
+import { execPromise } from "../../../lib/util/execPromise.js";
+const log = debug("ef:assets:probe");
 const AudioStreamSchema = z.object({
   index: z.number(),
   codec_name: z.string(),
@@ -72,9 +74,11 @@ class Probe {
     this.data = ProbeSchema.parse(rawData);
   }
   static async probePath(absolutePath) {
-    const probeResult = await execPromise(
-      `ffprobe -v error -show_format -show_streams -of json ${absolutePath}`
-    );
+    const probeCommand = `ffprobe -v error -show_format -show_streams -of json ${absolutePath}`;
+    log("Probing", probeCommand);
+    const probeResult = await execPromise(probeCommand);
+    log("Probe result", probeResult.stdout);
+    log("Probe stderr", probeResult.stderr);
     const json = JSON.parse(probeResult.stdout);
     return new Probe(absolutePath, json);
   }
@@ -95,9 +99,7 @@ class Probe {
     return this.data.format;
   }
   get mustReencodeAudio() {
-    return this.audioStreams.some(
-      (stream) => stream.codec_name !== "aac" || stream.sample_rate !== "48000"
-    );
+    return this.audioStreams.some((stream) => stream.codec_name !== "aac");
   }
   get mustReencodeVideo() {
     return false;
@@ -129,9 +131,7 @@ class Probe {
         "-c:a",
         "aac",
         "-b:a",
-        "192k",
-        "-ar",
-        "48000"
+        "192k"
       ];
     }
     return ["-c:a", "copy"];
@@ -144,31 +144,60 @@ class Probe {
       return [
         "-c:v",
         "h264",
+        // Filter out SEI NAL units that aren't supported by the webcodecs decoder
+        "-bsf:v",
+        "filter_units=remove_types=6",
         "-pix_fmt",
         "yuv420p"
       ];
     }
-    return ["-c:v", "copy"];
+    return [
+      "-c:v",
+      "copy",
+      // Filter out SEI NAL units that aren't supported by the webcodecs decoder
+      "-bsf:v",
+      "filter_units=remove_types=6"
+    ];
   }
   createConformingReadstream() {
     if (!this.mustProcess) {
       return createReadStream(this.absolutePath);
     }
-    return spawn("ffmpeg", [
+    const ffmpegConformanceArgs = [
       "-i",
       this.absolutePath,
       ...this.ffmpegAudioOptions,
       ...this.ffmpegVideoOptions,
       "-f",
       "mp4",
-      "-frag_duration",
-      "8000000",
+      "-movflags",
+      "cmaf+frag_keyframe+empty_moov",
+      "pipe:1"
+    ];
+    log("Running ffmpeg", ffmpegConformanceArgs);
+    const ffmpegConformer = spawn("ffmpeg", ffmpegConformanceArgs, {
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    ffmpegConformer.stderr.on("data", (data) => {
+      log(data.toString());
+    });
+    const ffmpegFragmentArgs = [
+      "-i",
+      "-",
+      "-c",
+      "copy",
+      "-f",
+      "mp4",
       "-movflags",
       "frag_keyframe+empty_moov",
       "pipe:1"
-    ], {
-      stdio: ["ignore", "pipe", "inherit"]
-    }).stdout;
+    ];
+    log("Running ffmpeg", ffmpegFragmentArgs);
+    const ffmpegFragmenter = spawn("ffmpeg", ffmpegFragmentArgs, {
+      stdio: ["pipe", "pipe", "pipe"]
+    });
+    ffmpegConformer.stdout.pipe(ffmpegFragmenter.stdin);
+    return ffmpegFragmenter.stdout;
   }
 }
 export {

package/dist/packages/assets/src/idempotentTask.cjs

@@ -13,7 +13,7 @@ const idempotentTask = ({
 }) => {
   const tasks = {};
   return async (rootDir, absolutePath, ...args) => {
-    const log = debug(`@ef:${label}`);
+    const log = debug(`ef:${label}`);
     const md5$1 = await md5.md5FilePath(absolutePath);
     const cacheDir = path.join(rootDir, ".cache", md5$1);
     log(`Cache dir: ${cacheDir}`);
@@ -21,16 +21,16 @@ const idempotentTask = ({
     const cachePath = path.join(cacheDir, filename(absolutePath, ...args));
     const key = cachePath;
     if (node_fs.existsSync(cachePath)) {
-      log(`Returning cached @ef:${label} task for ${key}`);
+      log(`Returning cached ef:${label} task for ${key}`);
       return { cachePath, md5Sum: md5$1 };
     }
     const maybeTask = tasks[key];
     if (maybeTask) {
-      log(`Returning existing @ef:${label} task for ${key}`);
+      log(`Returning existing ef:${label} task for ${key}`);
       await maybeTask;
       return { cachePath, md5Sum: md5$1 };
     }
-    log(`Creating new @ef:${label} task for ${key}`);
+    log(`Creating new ef:${label} task for ${key}`);
     const task = runner(absolutePath, ...args);
     tasks[key] = task;
     log(`Awaiting task for ${key}`);

package/dist/packages/assets/src/idempotentTask.js

@@ -11,7 +11,7 @@ const idempotentTask = ({
 }) => {
   const tasks = {};
   return async (rootDir, absolutePath, ...args) => {
-    const log = debug(`@ef:${label}`);
+    const log = debug(`ef:${label}`);
     const md5 = await md5FilePath(absolutePath);
     const cacheDir = path.join(rootDir, ".cache", md5);
     log(`Cache dir: ${cacheDir}`);
@@ -19,16 +19,16 @@ const idempotentTask = ({
     const cachePath = path.join(cacheDir, filename(absolutePath, ...args));
     const key = cachePath;
     if (existsSync(cachePath)) {
-      log(`Returning cached @ef:${label} task for ${key}`);
+      log(`Returning cached ef:${label} task for ${key}`);
       return { cachePath, md5Sum: md5 };
     }
     const maybeTask = tasks[key];
     if (maybeTask) {
-      log(`Returning existing @ef:${label} task for ${key}`);
+      log(`Returning existing ef:${label} task for ${key}`);
       await maybeTask;
       return { cachePath, md5Sum: md5 };
     }
-    log(`Creating new @ef:${label} task for ${key}`);
+    log(`Creating new ef:${label} task for ${key}`);
     const task = runner(absolutePath, ...args);
     tasks[key] = task;
     log(`Awaiting task for ${key}`);

package/dist/packages/assets/src/tasks/findOrCreateCaptions.cjs

@@ -4,7 +4,7 @@ const execPromise = require("../../../../lib/util/execPromise.cjs");
 const idempotentTask = require("../idempotentTask.cjs");
 const debug = require("debug");
 const path = require("node:path");
-const log = debug("@ef:generateCaptions");
+const log = debug("ef:generateCaptions");
 const generateCaptionData = idempotentTask.idempotentTask({
   label: "captions",
   filename: (absolutePath) => `${path.basename(absolutePath)}.captions.json`,

package/dist/packages/assets/src/tasks/findOrCreateCaptions.js

@@ -2,7 +2,7 @@ import { execPromise } from "../../../../lib/util/execPromise.js";
 import { idempotentTask } from "../idempotentTask.js";
 import debug from "debug";
 import { basename } from "node:path";
-const log = debug("@ef:generateCaptions");
+const log = debug("ef:generateCaptions");
 const generateCaptionData = idempotentTask({
   label: "captions",
   filename: (absolutePath) => `${basename(absolutePath)}.captions.json`,

package/dist/packages/assets/src/tasks/generateTrack.cjs

@@ -11,7 +11,7 @@ const generateTrackTask = idempotentTask.idempotentTask({
   label: "track",
   filename: (absolutePath, trackId) => `${path.basename(absolutePath)}.track-${trackId}.mp4`,
   runner: async (absolutePath, trackId) => {
-    const log = debug("@ef:generateTrackFragment");
+    const log = debug("ef:generateTrackFragment");
     const probe = await Probe.Probe.probePath(absolutePath);
     const readStream = probe.createConformingReadstream();
     const mp4File = new MP4File.MP4File();

package/dist/packages/assets/src/tasks/generateTrack.js

@@ -9,7 +9,7 @@ const generateTrackTask = idempotentTask({
   label: "track",
   filename: (absolutePath, trackId) => `${basename(absolutePath)}.track-${trackId}.mp4`,
   runner: async (absolutePath, trackId) => {
-    const log = debug("@ef:generateTrackFragment");
+    const log = debug("ef:generateTrackFragment");
     const probe = await Probe.probePath(absolutePath);
     const readStream = probe.createConformingReadstream();
     const mp4File = new MP4File();

package/dist/packages/assets/src/tasks/generateTrackFragmentIndex.cjs

@@ -7,7 +7,7 @@ const mp4FileWritable = require("../mp4FileWritable.cjs");
 const path = require("node:path");
 const Probe = require("../Probe.cjs");
 const generateTrackFragmentIndexFromPath = async (absolutePath) => {
-  const log = debug("@ef:generateTrackFragment");
+  const log = debug("ef:generateTrackFragment");
   const probe = await Probe.Probe.probePath(absolutePath);
   const readStream = probe.createConformingReadstream();
   const mp4File = new MP4File.MP4File();

package/dist/packages/assets/src/tasks/generateTrackFragmentIndex.js

@@ -5,7 +5,7 @@ import { mp4FileWritable } from "../mp4FileWritable.js";
 import { basename } from "node:path";
 import { Probe } from "../Probe.js";
 const generateTrackFragmentIndexFromPath = async (absolutePath) => {
-  const log = debug("@ef:generateTrackFragment");
+  const log = debug("ef:generateTrackFragment");
   const probe = await Probe.probePath(absolutePath);
   const readStream = probe.createConformingReadstream();
   const mp4File = new MP4File();

package/package.json

@@ -1,15 +1,20 @@
 {
   "name": "@editframe/assets",
-  "version": "0.7.0-beta.1",
+  "version": "0.7.0-beta.5",
   "description": "",
   "exports": {
     ".": {
-      "import": "./dist/packages/assets/src/index.js",
-      "require": "./dist/packages/assets/src/index.cjs"
+      "import": {
+        "default": "./dist/packages/assets/src/index.js",
+        "types": "./dist/packages/assets/src/index.d.ts"
+      },
+      "require": {
+        "default": "./dist/packages/assets/src/index.cjs",
+        "types": "./dist/packages/assets/src/index.d.ts"
+      }
     }
   },
   "type": "module",
-  "types": "./dist/packages/assets/src/index.d.ts",
   "scripts": {
     "typecheck": "tsc --noEmit --emitDeclarationOnly false",
     "build": "vite build",
@@ -18,6 +23,7 @@
   "author": "",
   "license": "UNLICENSED",
   "dependencies": {
+    "debug": "^4.3.5",
     "mp4box": "^0.5.2",
     "zod": "^3.23.8"
   },

package/src/tasks/findOrCreateCaptions.ts

@@ -3,7 +3,7 @@ import { idempotentTask } from "../idempotentTask";
 import debug from "debug";
 import { basename } from "node:path";
 
-const log = debug("@ef:generateCaptions");
+const log = debug("ef:generateCaptions");
 
 const generateCaptionData = idempotentTask({
   label: "captions",

package/src/tasks/generateTrack.ts

@@ -11,7 +11,7 @@ const generateTrackTask = idempotentTask({
   filename: (absolutePath: string, trackId: number) =>
     `${basename(absolutePath)}.track-${trackId}.mp4`,
   runner: async (absolutePath, trackId: number) => {
-    const log = debug("@ef:generateTrackFragment");
+    const log = debug("ef:generateTrackFragment");
     const probe = await Probe.probePath(absolutePath);
     const readStream = probe.createConformingReadstream();
     const mp4File = new MP4File();

package/src/tasks/generateTrackFragmentIndex.ts

@@ -6,7 +6,7 @@ import { basename } from "node:path";
 import { Probe, type TrackFragmentIndex } from "../Probe";
 
 const generateTrackFragmentIndexFromPath = async (absolutePath: string) => {
-  const log = debug("@ef:generateTrackFragment");
+  const log = debug("ef:generateTrackFragment");
   const probe = await Probe.probePath(absolutePath);
   const readStream = probe.createConformingReadstream();