@torrent-tv/proxy 2.88.3 → 2.88.4

package/services/encode/V4l2m2mEncoder.js

@@ -1,53 +1,53 @@
-/**
- * @file h264_v4l2m2m — the stateful memory-to-memory encoder on an ARM board
- * (Raspberry Pi, HA Yellow).
- */
-
-import { Encoder } from "./Encoder.js";
-import { keyFrameArgs, safeDimensions, TRANSCODE_FPS } from "./args.js";
-
-export class V4l2m2mEncoder extends Encoder {
-  constructor() {
-    // ARM SoC (e.g. Raspberry Pi / HA Yellow) stateful M2M encoder. No GPU
-    // scaler — scale in software, hand YUV420 frames to the hardware encoder.
-    super({ name: "h264_v4l2m2m", kind: "v4l2m2m", device: null, inputArgs: [] });
-  }
-
-  /** @returns {import("./Encoder.js").SpeedLadder} */
-  get speedLadder() {
-    return {
-      flag: "",
-      values: [],
-      measured: false,
-      note:
-        "This kind has no speed setting at all — its levers are the bitrate " +
-        "and the number of capture buffers, which are not a trade of picture " +
-        "against speed. So there is nowhere to step, and a host that cannot " +
-        "keep up on it has to change something else."
-    };
-  }
-
-  // `-g` aligns the GOP to the segment length so an IDR lands on every segment
-  // boundary; this is verified by the keyframe-alignment test before use,
-  // because v4l2m2m does not always honour these hints.
-  buildVideoArgs({ targetWidth, targetHeight, segmentDurationSec, fps, forcedKeyframeTimes }) {
-    const { w, h } = safeDimensions(targetWidth, targetHeight);
-    const outFps = Number.isInteger(fps) && fps > 0 ? fps : TRANSCODE_FPS;
-    return [
-      "-vf",
-      `scale=${w}:${h}:force_original_aspect_ratio=decrease:force_divisible_by=2,fps=${outFps},format=yuv420p`,
-      "-c:v", "h264_v4l2m2m",
-      // More capture buffers than the default 4 — the default deadlocks /
-      // drops frames on the CM4 encoder ("All capture buffers returned to
-      // userspace").
-      "-num_capture_buffers", "32",
-      "-b:v", "3M",
-      // Kept even with an explicit cut list, as an upper bound on the
-      // interval: this encoder is the one known not always to honour keyframe
-      // hints, and without any bound a list it ignores yields one segment for
-      // the whole file rather than a wrongly-cut one.
-      "-g", String(outFps * segmentDurationSec),
-      ...keyFrameArgs(segmentDurationSec, forcedKeyframeTimes)
-    ];
-  }
-}
+/**
+ * @file h264_v4l2m2m — the stateful memory-to-memory encoder on an ARM board
+ * (Raspberry Pi, HA Yellow).
+ */
+
+import { Encoder } from "./Encoder.js";
+import { keyFrameArgs, safeDimensions, TRANSCODE_FPS } from "./args.js";
+
+export class V4l2m2mEncoder extends Encoder {
+  constructor() {
+    // ARM SoC (e.g. Raspberry Pi / HA Yellow) stateful M2M encoder. No GPU
+    // scaler — scale in software, hand YUV420 frames to the hardware encoder.
+    super({ name: "h264_v4l2m2m", kind: "v4l2m2m", device: null, inputArgs: [] });
+  }
+
+  /** @returns {import("./Encoder.js").SpeedLadder} */
+  get speedLadder() {
+    return {
+      flag: "",
+      values: [],
+      measured: false,
+      note:
+        "This kind has no speed setting at all — its levers are the bitrate " +
+        "and the number of capture buffers, which are not a trade of picture " +
+        "against speed. So there is nowhere to step, and a host that cannot " +
+        "keep up on it has to change something else."
+    };
+  }
+
+  // `-g` aligns the GOP to the segment length so an IDR lands on every segment
+  // boundary; this is verified by the keyframe-alignment test before use,
+  // because v4l2m2m does not always honour these hints.
+  buildVideoArgs({ targetWidth, targetHeight, segmentDurationSec, fps, forcedKeyframeTimes }) {
+    const { w, h } = safeDimensions(targetWidth, targetHeight);
+    const outFps = Number.isInteger(fps) && fps > 0 ? fps : TRANSCODE_FPS;
+    return [
+      "-vf",
+      `scale=${w}:${h}:force_original_aspect_ratio=decrease:force_divisible_by=2,fps=${outFps},format=yuv420p`,
+      "-c:v", "h264_v4l2m2m",
+      // More capture buffers than the default 4 — the default deadlocks /
+      // drops frames on the CM4 encoder ("All capture buffers returned to
+      // userspace").
+      "-num_capture_buffers", "32",
+      "-b:v", "3M",
+      // Kept even with an explicit cut list, as an upper bound on the
+      // interval: this encoder is the one known not always to honour keyframe
+      // hints, and without any bound a list it ignores yields one segment for
+      // the whole file rather than a wrongly-cut one.
+      "-g", String(outFps * segmentDurationSec),
+      ...keyFrameArgs(segmentDurationSec, forcedKeyframeTimes)
+    ];
+  }
+}

package/services/encode/VaapiEncoder.js

@@ -1,66 +1,66 @@
-/**
- * @file h264_vaapi — encode on a VAAPI device, with the scale on the same
- * device so frames never leave it.
- */
-
-import { Encoder } from "./Encoder.js";
-import { keyFrameArgs, safeDimensions } from "./args.js";
-
-export class VaapiEncoder extends Encoder {
-  /**
-   * @param {string} device - Render node, e.g. `/dev/dri/renderD128`.
-   */
-  constructor(device) {
-    super({
-      name: "h264_vaapi",
-      kind: "vaapi",
-      device,
-      // Decode on the GPU into VAAPI surfaces; scale and encode stay on-GPU.
-      inputArgs: ["-hwaccel", "vaapi", "-hwaccel_output_format", "vaapi", "-vaapi_device", device]
-    });
-  }
-
-  /** @returns {import("./Encoder.js").SpeedLadder} */
-  get speedLadder() {
-    return {
-      flag: "-quality",
-      // Read from ffmpeg's own option list on the addon host 2026-09-04:
-      // "Set encode quality (trades off against speed, higher is faster)
-      // (from -1 to INT_MAX) (default -1)". The upper end is the driver's, not
-      // the encoder's, so there is no list to state — only the name of the
-      // setting and the direction.
-      values: [],
-      measured: false,
-      note:
-        "The setting is `-quality`, higher is faster, and its range belongs to " +
-        "the driver rather than to ffmpeg. Nothing here has benchmarked it, " +
-        "and nothing passes it: a VAAPI encode runs at the driver's default."
-    };
-  }
-
-  // No fps filter: VAAPI inherits the source rate and keeps keyframes on the
-  // grid via time-based -force_key_frames, so it already honours source fps.
-  /** @returns {string[]} */
-  benchmarkInputArgs() {
-    return this.device ? ["-vaapi_device", this.device] : [];
-  }
-
-  /** @param {string | null} rung @returns {string[]} */
-  benchmarkArgs(rung = null) {
-    // Raw frames live in this process; VAAPI encodes what is in the device, so
-    // the upload is part of what this kind costs and belongs in the reading.
-    const quality = rung ? ["-quality", rung] : [];
-    return ["-vf", "format=nv12,hwupload", "-c:v", "h264_vaapi", "-qp", "24", ...quality];
-  }
-
-  buildVideoArgs({ targetWidth, targetHeight, segmentDurationSec, forcedKeyframeTimes }) {
-    const { w, h } = safeDimensions(targetWidth, targetHeight);
-    return [
-      "-vf",
-      `scale_vaapi=w=${w}:h=${h}:force_original_aspect_ratio=decrease`,
-      "-c:v", "h264_vaapi",
-      "-qp", "24",
-      ...keyFrameArgs(segmentDurationSec, forcedKeyframeTimes)
-    ];
-  }
-}
+/**
+ * @file h264_vaapi — encode on a VAAPI device, with the scale on the same
+ * device so frames never leave it.
+ */
+
+import { Encoder } from "./Encoder.js";
+import { keyFrameArgs, safeDimensions } from "./args.js";
+
+export class VaapiEncoder extends Encoder {
+  /**
+   * @param {string} device - Render node, e.g. `/dev/dri/renderD128`.
+   */
+  constructor(device) {
+    super({
+      name: "h264_vaapi",
+      kind: "vaapi",
+      device,
+      // Decode on the GPU into VAAPI surfaces; scale and encode stay on-GPU.
+      inputArgs: ["-hwaccel", "vaapi", "-hwaccel_output_format", "vaapi", "-vaapi_device", device]
+    });
+  }
+
+  /** @returns {import("./Encoder.js").SpeedLadder} */
+  get speedLadder() {
+    return {
+      flag: "-quality",
+      // Read from ffmpeg's own option list on the addon host 2026-09-04:
+      // "Set encode quality (trades off against speed, higher is faster)
+      // (from -1 to INT_MAX) (default -1)". The upper end is the driver's, not
+      // the encoder's, so there is no list to state — only the name of the
+      // setting and the direction.
+      values: [],
+      measured: false,
+      note:
+        "The setting is `-quality`, higher is faster, and its range belongs to " +
+        "the driver rather than to ffmpeg. Nothing here has benchmarked it, " +
+        "and nothing passes it: a VAAPI encode runs at the driver's default."
+    };
+  }
+
+  // No fps filter: VAAPI inherits the source rate and keeps keyframes on the
+  // grid via time-based -force_key_frames, so it already honours source fps.
+  /** @returns {string[]} */
+  benchmarkInputArgs() {
+    return this.device ? ["-vaapi_device", this.device] : [];
+  }
+
+  /** @param {string | null} rung @returns {string[]} */
+  benchmarkArgs(rung = null) {
+    // Raw frames live in this process; VAAPI encodes what is in the device, so
+    // the upload is part of what this kind costs and belongs in the reading.
+    const quality = rung ? ["-quality", rung] : [];
+    return ["-vf", "format=nv12,hwupload", "-c:v", "h264_vaapi", "-qp", "24", ...quality];
+  }
+
+  buildVideoArgs({ targetWidth, targetHeight, segmentDurationSec, forcedKeyframeTimes }) {
+    const { w, h } = safeDimensions(targetWidth, targetHeight);
+    return [
+      "-vf",
+      `scale_vaapi=w=${w}:h=${h}:force_original_aspect_ratio=decrease`,
+      "-c:v", "h264_vaapi",
+      "-qp", "24",
+      ...keyFrameArgs(segmentDurationSec, forcedKeyframeTimes)
+    ];
+  }
+}