@torrent-tv/proxy 2.107.8 → 2.107.10

package/package.json

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

package/services/encode/admitted-command.js

@@ -41,8 +41,11 @@ export function buildAdmittedCommand({ admittedInput, timeline, output, segmentF
     }
     else video.push("-vf", trim);
   }
+  const audioTrack = admittedInput.tracks?.find(input => input.track.type === "audio")?.track;
+  const audioSampleRate = [audioTrack?.samplingFrequency, audioTrack?.codecParameters?.sampleRate]
+    .find(sampleRate => Number.isSafeInteger(sampleRate) && sampleRate > 0) ?? 48000;
   const audio = transcodeAudio ? ["-c:a", "aac", "-ac", "2", "-b:a", `${AUDIO_TRANSCODE_KBPS}k`,
-    "-af", `atrim=start=${ffmpegSeconds(relativeStart)}:end=${ffmpegSeconds(relativeEnd)}`] : ["-c:a", "copy"];
+    "-af", `atrim=start=${ffmpegSeconds(relativeStart)}:end=${ffmpegSeconds(relativeEnd)},aresample=async=1:first_pts=${Math.round(relativeStart * audioSampleRate)}`] : ["-c:a", "copy"];
   if (audioOnly) args.push("-vn", "-map", "0:a:0", ...audio);
   else if (audioSeparate) args.push("-an", "-map", "0:v:0", ...video);
   else args.push("-map", "0:v:0", "-map", "0:a:0?", ...video, ...audio);

package/services/server/ViewerRequests.js

@@ -1280,7 +1280,10 @@ export class ViewerRequests {
     if (output?.spec?.carries === "audio-only") {
       let trend = measurement.trackProgress.get(output);
       if (!trend) {
-        trend = new this.#host.playbackReadiness.ProgressRate(this.#host.lookaheadSeconds);
+        trend = new this.#host.playbackReadiness.ProgressRate(
+          this.#host.lookaheadSeconds,
+          this.#host.segmentDurationSec
+        );
         measurement.trackProgress.set(output, trend);
       }
       return trend.note(now, progress?.processedSeconds, progress?.startPositionSeconds);

package/services/viewer/playback-readiness.js

@@ -116,17 +116,23 @@ export class RateTrend {
 export class ProgressRate {
   #trend;
   #horizonSeconds;
+  #adjacentRunSeconds;
   #previous = null;
 
-  constructor(horizonSeconds) {
+  constructor(horizonSeconds, adjacentRunSeconds = 4) {
     this.#horizonSeconds = horizonSeconds;
+    this.#adjacentRunSeconds = Number.isFinite(adjacentRunSeconds) && adjacentRunSeconds > 0
+      ? adjacentRunSeconds
+      : 4;
     this.#trend = new RateTrend(horizonSeconds);
   }
 
   note(at, processedSeconds, startPositionSeconds) {
     if (!Number.isFinite(at) || !Number.isFinite(processedSeconds)) return this.#trend.snapshot();
     const start = Number.isFinite(startPositionSeconds) ? startPositionSeconds : 0;
-    if (!this.#previous || this.#previous.start !== start || processedSeconds < this.#previous.processedSeconds) {
+    const discontinuousStart = this.#previous && start !== this.#previous.start &&
+      (start < this.#previous.start || start > this.#previous.processedSeconds + this.#adjacentRunSeconds);
+    if (!this.#previous || discontinuousStart || processedSeconds < this.#previous.processedSeconds) {
       this.#previous = { at, processedSeconds, start };
       this.#trend = new RateTrend(this.#horizonSeconds);
       return this.#trend.snapshot();