@torrent-tv/proxy 2.95.2 → 2.95.3

package/package.json

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

package/server.js

@@ -60,6 +60,7 @@ import { DownloadMaps } from "./services/viewer/DownloadMaps.js";
 import { nativeSourceMap } from "./services/viewer/NativeSourceMap.js";
 import { MediaReadRequests } from "./services/media/MediaReadRequests.js";
 import { SegmentInputs } from "./services/media/SegmentInputs.js";
+import { ContainerTrack } from "./services/media/tracks/ContainerTrack.js";
 import { pauseCoefficient, viewerStartsOn } from "./services/viewer/PriorityMap.js";
 import { coalescing } from "./utils/coalesce.js";
 import {
@@ -581,7 +582,7 @@ export async function startProxyServer({
         const spec = output.spec[type];
         if (!spec) continue;
         const list = selected.get(spec.fileIndex) ?? [];
-        list.push({ type, index: type === "video" ? 0 : spec.trackIndex,
+        list.push({ type, index: type === "video" ? null : spec.trackIndex,
           mode: type === "video" ? spec.encode ? "transcode" : "copy" : spec.transcode ? "transcode" : "copy" });
         selected.set(spec.fileIndex, list);
       }
@@ -595,7 +596,10 @@ export async function startProxyServer({
         if (typeof container?.readPacketIndex !== "function") return { kind: "needs-index", reason: "packet-index-not-yet-available" };
         const modes = new Map(), wanted = [];
         for (const choice of choices) {
-          const track = tracks.value.filter(track => track.type === choice.type)[choice.index];
+          // The picture is the first usable video track (torrent-tv/meta#49);
+          // a soundtrack keeps the number every list of them uses.
+          const track = choice.type === "video" ? ContainerTrack.firstUsable(tracks.value, "video")
+            : tracks.value.filter(track => track.type === choice.type)[choice.index];
           if (!track) return { kind: "terminal", reason: "selected-track-is-absent" };
           wanted.push(track); modes.set(track, choice.mode);
         }

package/services/media/container/MatroskaContainer.js

@@ -604,7 +604,7 @@ export class MatroskaContainer extends Container {
     // picture cues alone cannot prove that an earlier subtitle has ended.
     if (requested.every(track => track.type === "subtitle")) return first;
     const cueTrack = requested.find(track => track.type === "video") ??
-      tracks.find(track => track.type === "video") ?? requested[0];
+      ContainerTrack.firstUsable(tracks, "video") ?? requested[0];
     if (!cueTrack) return first;
     const points = (cues?.points ?? []).flatMap(point => point.positions
       .filter(position => position.track === cueTrack.trackNumber && position.clusterAt >= first && position.clusterAt < layout.segmentEnd)
@@ -823,7 +823,7 @@ export class MatroskaContainer extends Container {
   }
 
   /**
-   * The keyframe times of the first video track, from the one Cues reading.
+   * The keyframe times of the first usable video track, from the one Cues reading.
    *
    * A CuePoint belongs to the track named inside its CueTrackPositions, and a
    * muxer indexes whatever tracks it likes — field files index their subtitle
@@ -845,7 +845,9 @@ export class MatroskaContainer extends Container {
       return null;
     }
     const tracks = await this.readTracks();
-    const video = tracks.find((track) => track.type === "video")?.trackNumber ?? null;
+    // The picture's own entries: a video track the file marks unusable is not
+    // played, so its keyframes are not where the picture can be cut.
+    const video = ContainerTrack.firstUsable(tracks, "video")?.trackNumber ?? null;
     const timesFor = (wanted) =>
       cues.points
         .filter((point) => wanted === null || point.positions.some((position) => position.track === wanted))

package/services/media/container/Mp4Container.js

@@ -21,6 +21,7 @@ import { VideoTrack } from "../tracks/VideoTrack.js";
 import { AudioTrack } from "../tracks/AudioTrack.js";
 import { TextSubtitleTrack, TEXT_FORMATS_MP4 } from "../tracks/TextSubtitleTrack.js";
 import { ImageSubtitleTrack } from "../tracks/ImageSubtitleTrack.js";
+import { ContainerTrack } from "../tracks/ContainerTrack.js";
 import { isUnavailable } from "./unavailable.js";
 import { PacketIndex } from "./PacketIndex.js";
 import { h264Configuration } from "./h264-configuration.js";
@@ -565,7 +566,7 @@ export class Mp4Container extends Container {
       this.fragmentState ??= {};
       index = await readMp4Fragments({ readRange: this.readRange, fileSize: this.fileSize,
         tracks: fragmentTracks(held, tracks), memory: this.packetMemory, state: this.fragmentState });
-      const timeline = tracks.find(track => track.type === "video") ?? tracks.find(track => track.type === "audio");
+      const timeline = ContainerTrack.firstUsable(tracks, "video") ?? ContainerTrack.firstUsable(tracks, "audio");
       const bounds = timeline && index.boundsOf(timeline.trackNumber);
       if (bounds) this.mediaInfo = { ...(await this.readMediaInfo()), startTimeSeconds: bounds.start,
         durationSeconds: bounds.end - bounds.start };
@@ -842,7 +843,7 @@ export class Mp4Container extends Container {
   async parseKeyframeIndex() {
     const held = await this.#moovBuffer();
     if (held && childOf(held.moov, held.header, held.moov.length, "mvex")) {
-      const video = (await this.readTracks()).find(track => track.type === "video");
+      const video = ContainerTrack.firstUsable(await this.readTracks(), "video");
       return video ? { times: (await this.readPacketIndex()).keyframesOf(video.trackNumber), tolerance: 0 } : null;
     }
     const r = held ? keyframeTimesFromMoov(held.moov, held.header) : null;
@@ -1664,6 +1665,13 @@ function keyframeTimesFromMoov(moov, headerBytes) {
     if (!mdia || !isVideoTrack(moov, mdia)) {
       continue;
     }
+    // "A disabled track (the low bit is zero) is treated as if it were not
+    // present" (ISO/IEC 14496-12 §8.3.2), so it is not the picture whose
+    // keyframes decide the cuts (torrent-tv/meta#49).
+    const tkhd = findBox(moov, trak.dataOffset, trak.end, "tkhd");
+    if (tkhd && tkhd.dataOffset + 4 <= tkhd.end && (moov.readUIntBE(tkhd.dataOffset + 1, 3) & 0x000001) === 0) {
+      continue;
+    }
     const mdhd = findBox(moov, mdia.dataOffset, mdia.end, "mdhd");
     if (!mdhd) {
       continue;

package/services/media/playback-declarations.js

@@ -1,5 +1,6 @@
 import { AudioTrack } from "./tracks/AudioTrack.js";
 import { TextSubtitleTrack } from "./tracks/TextSubtitleTrack.js";
+import { ContainerTrack } from "./tracks/ContainerTrack.js";
 
 const VIDEO_CODECS = new Map([
   ["V_MPEG4/ISO/AVC", "h264"], ["avc1", "h264"], ["avc3", "h264"],
@@ -33,7 +34,9 @@ function videoCodecOf(track) {
 export function playbackDeclarations({ tracks, media, fileBytes = null }) {
   const ordered = type => tracks.filter(track => track.type === type)
     .sort((a, b) => a.declaredIndex - b.declaredIndex);
-  const video = ordered("video")[0];
+  // The picture is the first video track the container marks usable; a
+  // disabled one is not played (torrent-tv/meta#49).
+  const video = ContainerTrack.firstUsable(tracks, "video") ?? undefined;
   const inventory = type => ordered(type).map((track, index) => ({
     ...track, index, streamIndex: track.declaredIndex,
     codec: type === "audio" ? AudioTrack.codecNameOf(track)
@@ -46,7 +49,8 @@ export function playbackDeclarations({ tracks, media, fileBytes = null }) {
   }));
   const audioTracks = inventory("audio"), subtitleTracks = inventory("subtitle");
   return { tracks, video, audioTracks, subtitleTracks,
-    audioCodec: audioTracks[0]?.codec ?? "",
+    // The soundtrack a file opens with is its first usable one.
+    audioCodec: ContainerTrack.firstUsable(audioTracks, "audio")?.codec ?? "",
     videoCodec: video ? videoCodecOf(video) : "",
     container: media.format,
     durationSeconds: media.durationSeconds,

package/services/media/tracks/ContainerTrack.js

@@ -72,6 +72,29 @@ export class ContainerTrack {
     this.alternateGroup = Number.isFinite(alternateGroup) ? alternateGroup : 0;
   }
 
+  /**
+   * The first track of `type` the container marks usable, or null.
+   *
+   * Matroska `FlagEnabled`: "Set to 1 if the track is usable" (RFC 9559
+   * §5.1.4.1.3). MP4 `track_enabled`: "A disabled track … is treated as if it
+   * were not present" (ISO/IEC 14496-12 §8.3.2). So the picture a file is
+   * played with, and the soundtrack it opens with when nobody chose one, are the
+   * first USABLE ones — not the first declared. A disabled track keeps its
+   * position in the list, because ffmpeg numbers it either way.
+   *
+   * Takes plain objects as well as tracks: tracks cross the worker boundary as
+   * plain objects.
+   *
+   * @param {Array<{ type: string, isEnabled?: boolean, declaredIndex?: number }>} tracks
+   * @param {"video" | "audio" | "subtitle"} type
+   * @returns {object | null}
+   */
+  static firstUsable(tracks, type) {
+    return (Array.isArray(tracks) ? tracks : [])
+      .filter((track) => track?.type === type && track.isEnabled !== false)
+      .sort((a, b) => (a.declaredIndex ?? 0) - (b.declaredIndex ?? 0))[0] ?? null;
+  }
+
   /** Whether this track should be offered in UI menus. Base rule: disabled tracks hidden but still counted for declaredIndex. */
   isOfferable() {
     return this.isEnabled;