@torrent-tv/proxy 2.95.37 → 2.95.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@torrent-tv/proxy",
-  "version": "2.95.37",
+  "version": "2.95.39",
   "description": "Torrent proxy client that exposes webseed-like HTTP stream endpoint.",
   "license": "GPL-3.0-or-later",
   "repository": {

package/services/encode/AdmittedInput.js

@@ -2,6 +2,8 @@ import { createHash } from "node:crypto";
 import { matroskaInput, matroskaTrackIdentity } from "./MatroskaInput.js";
 import { pcmNormalization, normalizePcmSlices } from "./pcm-normalization.js";
 
+const INPUT_WRITE_BATCH_BYTES = 64 * 1024;
+
 /** Acquire complete source ranges before any process can consume the input. */
 export async function admitInput({ sources, reserve, readRanges }) {
   if (!Array.isArray(sources) || sources.length === 0 || typeof reserve !== "function" || typeof readRanges !== "function") {
@@ -106,27 +108,37 @@ export async function writeAdmittedInput(input, stdin, { next = null } = {}) {
   let current = input, includeHeader = true;
   try {
     while (current) {
-    if (JSON.stringify(current.tracks.map(input => matroskaTrackIdentity(input.track))) !== declarations) {
-      throw new Error("Consecutive encoder input changed its declared tracks.");
-    }
-    for (let index = 0; index < current.tracks.length; index++) {
-      const end = current.tracks[index].sourceEndSeconds;
-      if (Number.isFinite(end)) input.tracks[index].sourceEndSeconds = end;
-    }
-    for await (const chunk of current.stream({ originSeconds, includeHeader, seen })) {
-      await new Promise((resolve, reject) => {
-        const failed = error => { stdin.off("error", failed); reject(error); };
-        stdin.once("error", failed);
-        stdin.write(chunk, error => {
-          stdin.off("error", failed);
-          if (error) reject(error);
-          else resolve();
-        });
-      });
-    }
-    current.release();
-    current = next ? await next() : null;
-    includeHeader = false;
+      if (JSON.stringify(current.tracks.map(input => matroskaTrackIdentity(input.track))) !== declarations) {
+        throw new Error("Consecutive encoder input changed its declared tracks.");
+      }
+      for (let index = 0; index < current.tracks.length; index++) {
+        const end = current.tracks[index].sourceEndSeconds;
+        if (Number.isFinite(end)) input.tracks[index].sourceEndSeconds = end;
+      }
+      let batch = Buffer.allocUnsafe(INPUT_WRITE_BATCH_BYTES);
+      let used = 0;
+      const flush = async () => {
+        if (used === 0) return;
+        const chunk = batch.subarray(0, used);
+        batch = Buffer.allocUnsafe(INPUT_WRITE_BATCH_BYTES);
+        used = 0;
+        await writeChunk(stdin, chunk);
+      };
+      for await (const chunk of current.stream({ originSeconds, includeHeader, seen })) {
+        if (!Buffer.isBuffer(chunk)) throw new TypeError("Admitted input stream yielded a non-buffer chunk.");
+        let offset = 0;
+        while (offset < chunk.length) {
+          const copied = Math.min(INPUT_WRITE_BATCH_BYTES - used, chunk.length - offset);
+          chunk.copy(batch, used, offset, offset + copied);
+          used += copied;
+          offset += copied;
+          if (used === INPUT_WRITE_BATCH_BYTES) await flush();
+        }
+      }
+      await flush();
+      current.release();
+      current = next ? await next() : null;
+      includeHeader = false;
     }
     stdin.end();
   } finally {
@@ -134,3 +146,15 @@ export async function writeAdmittedInput(input, stdin, { next = null } = {}) {
     input.release();
   }
 }
+
+function writeChunk(stdin, chunk) {
+  return new Promise((resolve, reject) => {
+    const failed = error => { stdin.off("error", failed); reject(error); };
+    stdin.once("error", failed);
+    stdin.write(chunk, error => {
+      stdin.off("error", failed);
+      if (error) reject(error);
+      else resolve();
+    });
+  });
+}

package/services/encode/hwaccel.js

@@ -1682,13 +1682,15 @@ export function pickSoftwarePreset(benchmark, pixelsPerSecNeeded, cost = {}, fra
     if (encodePixelsPerSec === null) {
       continue;
     }
-    const speed = predictedRealtimeSpeed({
-      decodeModel: cost.decodeModel ?? null,
-      encodePixelsPerSec,
-      outputPixelsPerSec: pixelsPerSecNeeded,
-      source: cost.source ?? null,
-      observedDecodeCostSec: observed
-    });
+    const speed = typeof cost.speedForPreset === "function"
+      ? cost.speedForPreset([entry], frame, pixelsPerSecNeeded)
+      : predictedRealtimeSpeed({
+        decodeModel: cost.decodeModel ?? null,
+        encodePixelsPerSec,
+        outputPixelsPerSec: pixelsPerSecNeeded,
+        source: cost.source ?? null,
+        observedDecodeCostSec: observed
+      });
     if (speed !== null && speed >= bar) {
       return entry.preset;
     }
@@ -1786,12 +1788,15 @@ export function chooseSoftwareEncodeSettings(benchmark, ceiling, outputFps, cost
     if (fastest === null) {
       continue;
     }
-    const speed = predictedRealtimeSpeed({
-      decodeModel: cost.decodeModel ?? null,
-      encodePixelsPerSec: fastest,
-      outputPixelsPerSec: ladder[i].width * ladder[i].height * fps,
-      source: cost.source ?? null
-    });
+    const outputPixelsPerSec = ladder[i].width * ladder[i].height * fps;
+    const speed = typeof cost.speedForPreset === "function"
+      ? cost.speedForPreset([benchmark.at(-1)], ladder[i], outputPixelsPerSec)
+      : predictedRealtimeSpeed({
+        decodeModel: cost.decodeModel ?? null,
+        encodePixelsPerSec: fastest,
+        outputPixelsPerSec,
+        source: cost.source ?? null
+      });
     if (speed !== null && speed >= bar) {
       chosenIndex = i;
       break;

package/services/encode/quality/EncodeCost.js

@@ -172,6 +172,21 @@ export class EncodeCost {
     );
   }
 
+  #committedMachineCostSec() {
+    let cost = 0;
+    for (const session of this.#outputs.values()) {
+      if (!processCanBeSignalled(this.#stateFor(session))) {
+        continue;
+      }
+      const measured = this.#loadOfSession(session)?.costSec;
+      if (!Number.isFinite(measured) || measured <= 0) {
+        return null;
+      }
+      cost += measured;
+    }
+    return cost;
+  }
+
   // The last refusal printed. The offer is recomputed on the path that serves
   // every playlist, init and segment, and the figures behind it move every few
   // seconds — so the line is written when the ANSWER changes, not when it is
@@ -1085,11 +1100,26 @@ export class EncodeCost {
     if (!ceiling) {
       return null;
     }
+    const concurrentCostSec = this.#committedMachineCostSec();
+    const speedForPreset = (benchmark, frame, outputPixelsPerSec) => {
+      if (concurrentCostSec === null) {
+        return null;
+      }
+      return this.#speedOnThisMachine({
+        benchmark,
+        source,
+        width: frame.width,
+        height: frame.height,
+        fps: outputPixelsPerSec / (frame.width * frame.height),
+        observedDecodeCostSec: null,
+        concurrentCostSec
+      });
+    };
     return chooseSoftwareEncodeSettings(
       this.#host().benchmark,
       { width: ceiling.w, height: ceiling.h },
       outputFps,
-      { decodeModel: this.#host().decodeModel, source, requiredSpeed }
+      { decodeModel: this.#host().decodeModel, source, requiredSpeed, speedForPreset }
     );
   }
 }