@torrent-tv/proxy 2.95.10 → 2.95.11

package/package.json

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

package/services/encode/EncodeRuns.js

@@ -986,7 +986,7 @@ export class EncodeRuns {
         if (Number.isInteger(index) && (index < safeIndex || index > run.to)) return null;
         let bytes = null;
         if (admittedInput && session.segmentFormat.id === "fmp4" && session.spec.carries !== "audio-only" &&
-          session.spec.audio && !this.#host.servesAudioSeparately(session)) {
+          (admittedInput.original || session.spec.audio && !this.#host.servesAudioSeparately(session))) {
           try {
             const address = session.outputKey ?? "";
             const grid = session.timeline.published ?? session.timeline.boundaries;

package/services/encode/segment-formats/presentation-segment.js

@@ -9,7 +9,7 @@ export function presentationSegment(current, following, { from, to }) {
     const edit = own.edits.get(id);
     if (!edit) throw new Error("A segment track has no declared clock.");
     const samples = [...track.samples];
-    if (track.kind === "soun" && next?.tracks.has(id)) {
+    if (next?.tracks.has(id)) {
       const nextEdit = next.edits.get(id);
       if (!nextEdit || nextEdit.timescale !== edit.timescale) throw new Error("Adjacent segment clocks differ.");
       for (const sample of next.tracks.get(id).samples) {
@@ -18,18 +18,33 @@ export function presentationSegment(current, following, { from, to }) {
     }
     const start = BigInt(Math.round(from * Number(edit.timescale)));
     const end = BigInt(Math.round(to * Number(edit.timescale)));
-    const selected = samples.filter(sample => {
+    const wanted = samples.filter(sample => {
       const pts = sample.dts + sample.composition + edit.offset;
-      return pts < end && pts + sample.duration > start;
+      return pts < end && (track.kind === "vide" ? pts >= start : pts + sample.duration > start);
     });
+    if (!wanted.length) throw new Error("A presentation segment lacks required media.");
+    // An open-GOP picture before the cut can follow the next CRA in decode
+    // order. Retain the reference pictures through its last required DTS;
+    // dropping the CRA would make the recovered leading pictures undecodable.
+    const lastDecode = wanted.reduce((last, sample) => sample.dts > last ? sample.dts : last, -1n);
+    const firstDecode = wanted.reduce((first, sample) => first === null || sample.dts < first ? sample.dts : first, null);
+    const selected = track.kind === "vide" ? samples.filter(sample =>
+      sample.dts >= firstDecode && sample.dts <= lastDecode && sample.dts + sample.composition + edit.offset >= start) : wanted;
     selected.sort((left, right) => left.dts < right.dts ? -1 : left.dts > right.dts ? 1 : 0);
-    if (!selected.length) throw new Error("A presentation segment lacks required media.");
     tracks.push({ id, samples: selected });
   }
   const makeMoof = offset => box("moof", full("mfhd", 0, 0, u32(1)), ...tracks.map(track => {
-    const entries = track.samples.map(sample => Buffer.concat([
-      u32(Number(sample.duration)), u32(sample.bytes.length), u32(sample.flags), i32(Number(sample.composition))
-    ]));
+    let decodeTime = track.samples[0].dts;
+    const entries = track.samples.map(sample => {
+      // Removing leading pictures can leave a gap in decode timestamps.
+      // trun advances by durations only; retain each original presentation
+      // timestamp relative to the decode clock actually written here.
+      const composition = sample.dts + sample.composition - decodeTime;
+      decodeTime += sample.duration;
+      return Buffer.concat([
+        u32(Number(sample.duration)), u32(sample.bytes.length), u32(sample.flags), i32(Number(composition))
+      ]);
+    });
     const payload = Buffer.concat([u32(track.samples.length), i32(offset), ...entries]);
     offset += track.samples.reduce((bytes, sample) => bytes + sample.bytes.length, 0);
     const clock = Buffer.alloc(8);