@torrent-tv/proxy 2.95.38 → 2.95.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@torrent-tv/proxy",
-  "version": "2.95.38",
+  "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/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 }
     );
   }
 }