@torrent-tv/proxy 2.95.31 → 2.95.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@torrent-tv/proxy",
-  "version": "2.95.31",
+  "version": "2.95.32",
   "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