@torrent-tv/proxy 2.95.31 → 2.95.33

package/package.json

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

package/services/encode/source-command.js

@@ -129,6 +129,8 @@ export function buildRunCommand({
     args.push("-i", audioInputUrl);
   };
 
+  // Whether an output `-ss` already cuts at the interval's start.
+  let trimmedAtStart = false;
   if (snappedKeyframe !== null) {
     const residualSeconds = Math.max(0, seekAt - snappedKeyframe);
     if (snappedKeyframe > sourceStartTime) {
@@ -138,6 +140,7 @@ export function buildRunCommand({
     pushAudioInput(snappedKeyframe);
     if (residualSeconds > 0 && !keyframeGrid) {
       args.push("-ss", ffmpegSeconds(residualSeconds));
+      trimmedAtStart = true;
     }
   } else {
     if (seekAt > sourceStartTime) {
@@ -146,6 +149,15 @@ export function buildRunCommand({
     args.push("-i", inputUrl);
     pushAudioInput(seekAt);
   }
+  // An input seek lands on the picture's keyframe at or before the time asked
+  // for, in every stream (AVI `avi_read_seek`, Matroska Cues). `-accurate_seek`
+  // trims only what is decoded, so a copied soundtrack began at that keyframe
+  // and `-t` counted its length from there: a piece of a LostFilm AVI with a
+  // keyframe every 11 s carried the film's first four seconds (torrent-tv/meta#159).
+  // Without `-copyts` the time asked for is zero on the output's input clock.
+  if (!keyframeGrid && !servesAudioSeparately && !transcodeAudio && !trimmedAtStart) {
+    args.push("-ss", "0");
+  }
   if (!keyframeGrid) {
     if (startSeconds > 0) {
       args.push("-output_ts_offset", ffmpegSeconds(startSeconds));

package/services/media/container/AviContainer.js

@@ -232,8 +232,13 @@ export class AviContainer extends Container {
       } else if (type === "audio") {
         if (strf.length < 16) throw new Error("AVI wave format is truncated.");
         const tag = strf.readUInt16LE(0);
+        // WAVEFORMATEX states the average bytes per second the stream carries
+        // (`nAvgBytesPerSec`); zero states nothing. Without it a soundtrack the
+        // browser plays is re-encoded only because its copy has no figure to
+        // ask the link about (torrent-tv/meta#159).
         track = new AudioTrack({ ...params, codecId: waveCodec(tag),
           channels: strf.readUInt16LE(2), samplingFrequency: strf.readUInt32LE(4),
+          bitrateKbps: strf.readUInt32LE(8) * 8 / 1000,
           codecPrivateB64: strf.subarray(18).toString("base64") });
         track.blockAlign = strf.readUInt16LE(12);
         track.matroskaCodecId = "A_MS/ACM";

package/services/media/tracks/AudioTrack.js

@@ -78,6 +78,8 @@ export class AudioTrack extends ContainerTrack {
    * @param {boolean} params.isVisualImpaired - FlagVisualImpaired / descriptive audio
    * @param {number | null} params.channels
    * @param {number | null} params.samplingFrequency
+   * @param {number | null} [params.bitrateKbps] - The rate the file states for
+   *   this track, in kbit/s: an average, not a bound.
    */
   constructor(params) {
     super({ ...params, type: "audio" });
@@ -86,6 +88,7 @@ export class AudioTrack extends ContainerTrack {
     this.isVisualImpaired = params.isVisualImpaired === true;
     this.channels = Number.isFinite(params.channels) ? params.channels : null;
     this.samplingFrequency = Number.isFinite(params.samplingFrequency) ? params.samplingFrequency : null;
+    this.bitrateKbps = Number.isFinite(params.bitrateKbps) && params.bitrateKbps > 0 ? params.bitrateKbps : null;
     this.bitDepth = Number.isSafeInteger(params.bitDepth) && params.bitDepth > 0 ? params.bitDepth : null;
     this.codecDelaySeconds = Number.isFinite(params.codecDelaySeconds) && params.codecDelaySeconds >= 0 ? params.codecDelaySeconds : 0;
     // What the codec is configured as, and the most that configuration allows

package/services/server/ViewerRequests.js

@@ -612,12 +612,13 @@ export class ViewerRequests {
           })).filter(range => range.end > range.start) } : sharedForecast;
         sourceMeasurements.set(sourceId, {
           id: sourceId,
+          serviceKey: output.file.sourceKey,
           complete: stats?.fileAvailable === true,
           residence: stats?.residence,
           fileOffset: stats?.fileOffset,
           fileLength: stats?.fileLength,
           pieceLength: stats?.pieceLength,
-          downloadRateReadings: this.#sourceRateReadings(measurement, sourceId, stats, now),
+          downloadRateReadings: this.#sourceRateReadings(measurement, output.file.sourceKey, stats, now),
           downloadForecast,
         });
       }

package/services/viewer/playback-readiness.js

@@ -99,7 +99,8 @@ export class RateTrend {
  * @param {number} input.lookaheadSeconds
  * @param {number} input.now
  * @param {boolean} [input.requiredAudio]
- * @param {Array<{ id: string, complete: boolean,
+ * @param {Array<{ id: string, serviceKey?: string, complete: boolean, fileOffset?: number,
+ *   fileLength?: number, pieceLength?: number, downloadRateReadings?: object,
  *   downloadForecast?: { ranges: Array<{ start: number, end: number, availableAt: number | null }> } }>} input.sources
  * @param {Array<{ id: string, sourceIds: string[], processedSeconds: number,
  *   bitsPerMediaSecond: number, readings: Array<{ at: number, value: number }>,
@@ -192,8 +193,16 @@ export function predictPlaybackReadiness(input = {}) {
     return result(false, null, buffered, reserve, null, "timeline-unavailable", 0);
   }
   const sourceState = new Map();
+  // A torrent has one download service, even when required media lives in separate files.
+  const sourceServices = new Map();
   for (const [id, source] of sources) {
-    sourceState.set(id, { source, rate: rateCurve(source.downloadRateReadings, now), serviceFinish: 0 });
+    const serviceKey = typeof source.serviceKey === "string" ? source.serviceKey : id;
+    let service = sourceServices.get(serviceKey);
+    if (!service) {
+      service = { rate: rateCurve(source.downloadRateReadings, now), finish: 0 };
+      sourceServices.set(serviceKey, service);
+    }
+    sourceState.set(id, { source, service });
   }
   const link = rateCurve(input.linkReadings, now);
   let unknownReason = null;
@@ -333,7 +342,8 @@ export function predictPlaybackReadiness(input = {}) {
         // pieces, project only the media-order demand from the torrent's latest
         // measured download service; no supplier or positive rate means no
         // estimated arrival.
-        const { source: facts, rate } = source;
+        const { source: facts, service: sourceService } = source;
+        const { rate } = sourceService;
         if (!rate || !(rate.rateAt(0) > 0) || !Number.isSafeInteger(facts.pieceLength) ||
             facts.pieceLength <= 0 || !Number.isSafeInteger(facts.fileOffset) ||
             !Number.isSafeInteger(facts.fileLength) || facts.fileLength <= 0) {
@@ -342,7 +352,7 @@ export function predictPlaybackReadiness(input = {}) {
           unavailableSource: { sourceId, segmentIndex: segment.index, range: interval, missing } };
         }
         const estimatedPieces = sourcePiecesFor(missing, facts);
-        let finish = Math.max(source.serviceFinish, sourceArrivalAt);
+        let finish = Math.max(sourceService.finish, sourceArrivalAt);
         const service = sourceByteService.get(sourceId) ?? [];
         for (const pieceRange of estimatedPieces) {
           const stillMissing = uncoveredIntervals(pieceRange, sourceByteCoverage.get(sourceId) ?? []);
@@ -354,7 +364,7 @@ export function predictPlaybackReadiness(input = {}) {
           sourceByteCoverage.set(sourceId, numericCoverage(service));
           sourceArrivals.set(sourceId, indexedArrivals(service));
         }
-        source.serviceFinish = finish;
+        sourceService.finish = finish;
       }
     }
     // Production accepts a complete held segment input. It cannot overlap its