@torrent-tv/proxy 2.101.15 → 2.101.17

package/package.json

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

package/services/encode/EncodeRuns.js

@@ -409,7 +409,8 @@ export class EncodeRuns {
    * @param {string | null} [following] - The working name of the file the muxer closed after it.
    * @returns {object | null | false}
    */
-  #wholeClosedPiece(session, name, index, admitted = false, bytes = null, run = null, timing = null, following = null, { tentative = false } = {}) {
+  #wholeClosedPiece(session, name, index, admitted = false, bytes = null, run = null, timing = null, following = null,
+    { tentative = false, audioOnPublishedGrid = false } = {}) {
 
     const format = session.segmentFormat;
     if (!format?.readMediaRanges || !Number.isInteger(index) || index < 0) {
@@ -422,6 +423,9 @@ export class EncodeRuns {
       const cut = cutOf(session.timeline, index);
       const grid = session.timeline.published ?? session.timeline.boundaries;
       const interval = admitted ? { from: grid?.[index], to: grid?.[index + 1],
+        // Embedded copied sound was selected by presentationSegment on the
+        // published grid, so its raw muxer cut shift no longer applies.
+        ...(audioOnPublishedGrid ? { shiftByKind: { soun: 0 } } : {}),
         ...(index === session.timeline.segmentCount - 1 ? { endsWithSource: true, sourceEnds: Object.fromEntries(
           (admitted.tracks ?? []).filter(input => Number.isFinite(input.sourceEndSeconds))
             .map(input => [input.track.type === "video" ? "vide" : "soun", input.sourceEndSeconds])) } : {}),
@@ -1181,7 +1185,8 @@ export class EncodeRuns {
             throw error;
           }
         }
-        const mediaRanges = this.#wholeClosedPiece(session, name, index, admittedInput, bytes, run, timing, following, { tentative });
+        const mediaRanges = this.#wholeClosedPiece(session, name, index, admittedInput, bytes, run, timing, following,
+          { tentative, audioOnPublishedGrid: soundInPiece });
         // Tried on its own line and not proved whole: it waits for the next file.
         if (mediaRanges === false && tentative) return null;
         if (mediaRanges === false) throw Object.assign(new Error(`Closed piece #${index} has incomplete media.`),

package/services/encode/Renditions.js

@@ -855,10 +855,18 @@ export class Renditions {
       }
       // A segment closed on the output a viewer is LEAVING may be the one their
       // move waits for (`#givenAndOpenOn`). It is behind the segment the move
-      // begins at by construction, so it is asked about with no index.
+      // begins at by construction, so it is asked about with no index. A move
+      // is about its prepared picture: a separate soundtrack is not an output
+      // the viewer is leaving from for that move.
+      if (output.spec?.carries === "audio-only") {
+        continue;
+      }
       for (const consumerId of this.#host.switchingFrom?.(output) ?? []) {
-        if (this.#host.activeOutputFor({ base, consumerId, outputs: this.#host.outputs }) === output) {
-          this.#reconsiderSameHeightSwitch(base, consumerId, null);
+        const move = this.#host.sameHeightSwitchOf(consumerId);
+        const prepared = move ? this.#host.outputs.get(move.outputId) : null;
+        const moveBase = prepared ? this.#host.outputs.pictureOf(prepared) : base;
+        if (this.#host.activeOutputFor({ base: moveBase, consumerId, outputs: this.#host.outputs }) === output) {
+          this.#reconsiderSameHeightSwitch(moveBase, consumerId, null);
         }
       }
     }

package/services/encode/piece-completeness.js

@@ -192,15 +192,16 @@ export function judgeNeighbors(left, right) {
  * soundtrack's at 1419.904 s against a final cut of 1419.993 s, and both last
  * pieces were refused, so no viewer could reach the end of the episode.
  */
-function intervalFailure(coverage, { from, to, requiredKinds, sourceEnds = {}, shift = 0, endsWithSource = false, nextLeadingSeconds = 0 }) {
+function intervalFailure(coverage, { from, to, requiredKinds, sourceEnds = {}, shift = 0, shiftByKind = {}, endsWithSource = false, nextLeadingSeconds = 0 }) {
   if (!Number.isFinite(from) || !Number.isFinite(to) || !(to > from) || !requiredKinds?.length) return "segment-interval-is-not-declared";
   for (const kind of requiredKinds) {
     const track = coverage?.tracks?.find(track => track.kind === kind);
     if (!track?.ranges?.length || !(track.timescale > 0n)) return `segment-missing-${kind}`;
-    const start = BigInt(Math.round((from + shift) * Number(track.timescale)));
-    const cutAt = to + shift - (kind === "vide" && !endsWithSource ? nextLeadingSeconds : 0);
+    const trackShift = Number.isFinite(shiftByKind[kind]) ? shiftByKind[kind] : shift;
+    const start = BigInt(Math.round((from + trackShift) * Number(track.timescale)));
+    const cutAt = to + trackShift - (kind === "vide" && !endsWithSource ? nextLeadingSeconds : 0);
     const through = Number.isFinite(sourceEnds[kind]) ? Math.min(cutAt, sourceEnds[kind]) : cutAt;
-    if (!(through > from + shift)) return `segment-interval-is-empty-${kind}`;
+    if (!(through > from + trackShift)) return `segment-interval-is-empty-${kind}`;
     const end = BigInt(Math.round(through * Number(track.timescale)));
     const first = track.ranges[0];
     const frame = track.productionFrame ?? first.frame;