@apocaliss92/nodelink-js 0.5.2 → 0.6.0

package/dist/index.cjs

@@ -35165,10 +35165,18 @@ var CompositeStream = class extends import_node_events6.EventEmitter {
     }
   }
   async startFfmpegCompositionFromRtspUrls(mainWidth, mainHeight, pipWidth, pipHeight, position, widerRtspUrl, teleRtspUrl, rtspTransport) {
+    const videoEncoder = this.options.videoEncoder ?? "libx264";
+    const isX264 = videoEncoder === "libx264";
+    const encoderPreset = this.options.encoderPreset ?? "ultrafast";
+    const crf = this.options.crf ?? 23;
+    const gopSeconds = this.options.gopSeconds ?? 1;
+    const assumedFps = 30;
+    const gopFrames = Math.max(1, Math.round(gopSeconds * assumedFps));
     const ffmpegArgs = [
       "-hide_banner",
       "-loglevel",
       "error",
+      ...this.options.extraGlobalArgs ?? [],
       "-fflags",
       "+genpts",
       // Input 0: wider
@@ -35189,27 +35197,33 @@ var CompositeStream = class extends import_node_events6.EventEmitter {
       // Output: always H.264 Annex-B
       "-an",
       "-c:v",
-      "libx264",
+      videoEncoder,
       "-g",
-      "30",
+      String(gopFrames),
       "-keyint_min",
-      "30",
+      String(gopFrames),
       "-sc_threshold",
       "0",
-      "-x264-params",
-      "aud=1:repeat-headers=1:keyint=30:min-keyint=30:scenecut=0",
-      "-preset",
-      "ultrafast",
-      "-tune",
-      "zerolatency",
-      "-crf",
-      "23",
+      ...isX264 ? [
+        "-x264-params",
+        `aud=1:repeat-headers=1:keyint=${gopFrames}:min-keyint=${gopFrames}:scenecut=0`,
+        "-preset",
+        encoderPreset,
+        "-tune",
+        "zerolatency",
+        "-crf",
+        String(crf)
+      ] : [],
+      ...this.options.extraOutputArgs ?? [],
       "-f",
       "h264",
       "pipe:1"
     ];
-    this.logger.log?.(`[CompositeStream] Starting ffmpeg (rtsp inputs): ${ffmpegArgs.join(" ")}`);
-    this.ffmpegProcess = (0, import_node_child_process7.spawn)("ffmpeg", ffmpegArgs, {
+    const ffmpegBin = this.options.ffmpegPath ?? "ffmpeg";
+    this.logger.log?.(
+      `[CompositeStream] Starting ffmpeg (rtsp inputs): bin=${ffmpegBin} args=${ffmpegArgs.join(" ")}`
+    );
+    this.ffmpegProcess = (0, import_node_child_process7.spawn)(ffmpegBin, ffmpegArgs, {
       stdio: ["ignore", "pipe", "pipe"]
     });
     this.ffmpegProcess.on("error", (error) => {
@@ -35276,10 +35290,18 @@ var CompositeStream = class extends import_node_events6.EventEmitter {
       "-i",
       "pipe:3"
     ];
+    const videoEncoder = this.options.videoEncoder ?? "libx264";
+    const isX264 = videoEncoder === "libx264";
+    const encoderPreset = this.options.encoderPreset ?? "ultrafast";
+    const crf = this.options.crf ?? 23;
+    const gopSeconds = this.options.gopSeconds ?? 1;
+    const assumedFps = 30;
+    const gopFrames = Math.max(1, Math.round(gopSeconds * assumedFps));
     const ffmpegArgs = [
       "-hide_banner",
       "-loglevel",
       "error",
+      ...this.options.extraGlobalArgs ?? [],
       "-fflags",
       "+genpts",
       "-probesize",
@@ -35298,33 +35320,40 @@ var CompositeStream = class extends import_node_events6.EventEmitter {
       "-map",
       "[out]",
       "-c:v",
-      "libx264",
-      // Re-encode for compatibility
-      // Make the stream easy to join mid-flight: frequent IDRs + in-band headers + AUD.
-      // Without this, a new client may wait many seconds for the next keyframe.
+      videoEncoder,
+      // Make the stream easy to join mid-flight: frequent IDRs + in-band
+      // headers + AUD. Without this, a new client may wait many seconds
+      // for the next keyframe.
       "-g",
-      "30",
+      String(gopFrames),
       "-keyint_min",
-      "30",
+      String(gopFrames),
       "-sc_threshold",
       "0",
-      "-x264-params",
-      "aud=1:repeat-headers=1:keyint=30:min-keyint=30:scenecut=0",
-      "-preset",
-      "ultrafast",
-      "-tune",
-      "zerolatency",
-      "-crf",
-      "23",
+      // libx264-specific knobs. We deliberately skip these for HW encoders
+      // — each one has its own option vocabulary (`-q:v`, `-rc`, etc.)
+      // and the user is expected to express them via extraOutputArgs.
+      ...isX264 ? [
+        "-x264-params",
+        `aud=1:repeat-headers=1:keyint=${gopFrames}:min-keyint=${gopFrames}:scenecut=0`,
+        "-preset",
+        encoderPreset,
+        "-tune",
+        "zerolatency",
+        "-crf",
+        String(crf)
+      ] : [],
+      ...this.options.extraOutputArgs ?? [],
       "-f",
       "h264",
       "pipe:1"
       // Output (stdout)
     ];
+    const ffmpegBin = this.options.ffmpegPath ?? "ffmpeg";
     this.logger.log?.(
-      `[CompositeStream] Starting ffmpeg: ${ffmpegArgs.join(" ")}`
+      `[CompositeStream] Starting ffmpeg: bin=${ffmpegBin} args=${ffmpegArgs.join(" ")}`
     );
-    this.ffmpegProcess = (0, import_node_child_process7.spawn)("ffmpeg", ffmpegArgs, {
+    this.ffmpegProcess = (0, import_node_child_process7.spawn)(ffmpegBin, ffmpegArgs, {
       stdio: ["pipe", "pipe", "pipe", "pipe"]
     });
     this.ffmpegProcess.on("error", (error) => {
@@ -36032,6 +36061,20 @@ async function createRfc4571TcpServerInternal(options) {
       ...forceH264 !== void 0 ? { forceH264 } : defaultForceH264 ? { forceH264: true } : {},
       ...compositeOptions?.assumeH264Inputs !== void 0 ? { assumeH264Inputs: compositeOptions.assumeH264Inputs } : {},
       ...compositeOptions?.disableTranscode !== void 0 ? { disableTranscode: compositeOptions.disableTranscode } : {},
+      // Propagate ffmpeg binary path — required when the embedder strips
+      // PATH (Scrypted on Windows, Electron sandboxes, distroless Docker)
+      // and the bundled ffmpeg is at a fixed absolute path only the
+      // embedder knows.
+      ...compositeOptions?.ffmpegPath ? { ffmpegPath: compositeOptions.ffmpegPath } : {},
+      // Encoder tuning knobs — see CompositeStreamPipOptions for the
+      // semantic contract on each one. Plumbed verbatim so the
+      // CompositeStream layer can apply defaults.
+      ...compositeOptions?.videoEncoder ? { videoEncoder: compositeOptions.videoEncoder } : {},
+      ...compositeOptions?.encoderPreset ? { encoderPreset: compositeOptions.encoderPreset } : {},
+      ...typeof compositeOptions?.crf === "number" ? { crf: compositeOptions.crf } : {},
+      ...typeof compositeOptions?.gopSeconds === "number" ? { gopSeconds: compositeOptions.gopSeconds } : {},
+      ...compositeOptions?.extraGlobalArgs ? { extraGlobalArgs: compositeOptions.extraGlobalArgs } : {},
+      ...compositeOptions?.extraOutputArgs ? { extraOutputArgs: compositeOptions.extraOutputArgs } : {},
       logger
     });
     isCompositeStream = true;