@torrent-tv/proxy 2.101.16 → 2.101.18

package/package.json

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

package/services/encode/EncodeRuns.js

@@ -409,7 +409,8 @@ export class EncodeRuns {
    * @param {string | null} [following] - The working name of the file the muxer closed after it.
    * @returns {object | null | false}
    */
-  #wholeClosedPiece(session, name, index, admitted = false, bytes = null, run = null, timing = null, following = null, { tentative = false } = {}) {
+  #wholeClosedPiece(session, name, index, admitted = false, bytes = null, run = null, timing = null, following = null,
+    { tentative = false, audioOnPublishedGrid = false } = {}) {
 
     const format = session.segmentFormat;
     if (!format?.readMediaRanges || !Number.isInteger(index) || index < 0) {
@@ -422,6 +423,9 @@ export class EncodeRuns {
       const cut = cutOf(session.timeline, index);
       const grid = session.timeline.published ?? session.timeline.boundaries;
       const interval = admitted ? { from: grid?.[index], to: grid?.[index + 1],
+        // Copied sound is cut on the published grid, so the run's raw muxer
+        // clock shift must not be applied to its AAC interval.
+        ...(audioOnPublishedGrid ? { shiftByKind: { soun: 0 } } : {}),
         ...(index === session.timeline.segmentCount - 1 ? { endsWithSource: true, sourceEnds: Object.fromEntries(
           (admitted.tracks ?? []).filter(input => Number.isFinite(input.sourceEndSeconds))
             .map(input => [input.track.type === "video" ? "vide" : "soun", input.sourceEndSeconds])) } : {}),
@@ -1163,12 +1167,15 @@ export class EncodeRuns {
         const address = session.outputKey ?? "";
         // Read before anything rewrites it: when the encoder finished it.
         const writtenAt = this.#host.segmentFiles.writtenAtOf?.(address, name) ?? null;
-        const fmp4 = admittedInput && session.segmentFormat.id === "fmp4" && session.spec.carries !== "audio-only";
+        const fmp4 = admittedInput && session.segmentFormat.id === "fmp4";
+        const pictureFmp4 = fmp4 && session.spec.carries !== "audio-only";
         // The first piece of a run that read the picture from its keyframe:
         // its leading pictures are the ones the run before made, or none.
-        const firstOfRun = fmp4 && this.#copiesOriginalPicture(session, admittedInput) &&
+        const firstOfRun = pictureFmp4 && this.#copiesOriginalPicture(session, admittedInput) &&
           index === run.from && index > 0 && !fromKeyframeBefore;
-        const soundInPiece = fmp4 && session.spec.audio && !this.#host.servesAudioSeparately(session);
+        const soundInPiece = pictureFmp4 && session.spec.audio && !this.#host.servesAudioSeparately(session);
+        const audioOnPublishedGrid = fmp4 && session.spec.audio && !session.spec.transcodesAudio &&
+          (session.spec.carries === "audio-only" || !this.#host.servesAudioSeparately(session));
         if (firstOfRun || soundInPiece) {
           try {
             const grid = session.timeline.published ?? session.timeline.boundaries;
@@ -1181,7 +1188,8 @@ export class EncodeRuns {
             throw error;
           }
         }
-        const mediaRanges = this.#wholeClosedPiece(session, name, index, admittedInput, bytes, run, timing, following, { tentative });
+        const mediaRanges = this.#wholeClosedPiece(session, name, index, admittedInput, bytes, run, timing, following,
+          { tentative, audioOnPublishedGrid });
         // Tried on its own line and not proved whole: it waits for the next file.
         if (mediaRanges === false && tentative) return null;
         if (mediaRanges === false) throw Object.assign(new Error(`Closed piece #${index} has incomplete media.`),

package/services/encode/piece-completeness.js

@@ -192,15 +192,16 @@ export function judgeNeighbors(left, right) {
  * soundtrack's at 1419.904 s against a final cut of 1419.993 s, and both last
  * pieces were refused, so no viewer could reach the end of the episode.
  */
-function intervalFailure(coverage, { from, to, requiredKinds, sourceEnds = {}, shift = 0, endsWithSource = false, nextLeadingSeconds = 0 }) {
+function intervalFailure(coverage, { from, to, requiredKinds, sourceEnds = {}, shift = 0, shiftByKind = {}, endsWithSource = false, nextLeadingSeconds = 0 }) {
   if (!Number.isFinite(from) || !Number.isFinite(to) || !(to > from) || !requiredKinds?.length) return "segment-interval-is-not-declared";
   for (const kind of requiredKinds) {
     const track = coverage?.tracks?.find(track => track.kind === kind);
     if (!track?.ranges?.length || !(track.timescale > 0n)) return `segment-missing-${kind}`;
-    const start = BigInt(Math.round((from + shift) * Number(track.timescale)));
-    const cutAt = to + shift - (kind === "vide" && !endsWithSource ? nextLeadingSeconds : 0);
+    const trackShift = Number.isFinite(shiftByKind[kind]) ? shiftByKind[kind] : shift;
+    const start = BigInt(Math.round((from + trackShift) * Number(track.timescale)));
+    const cutAt = to + trackShift - (kind === "vide" && !endsWithSource ? nextLeadingSeconds : 0);
     const through = Number.isFinite(sourceEnds[kind]) ? Math.min(cutAt, sourceEnds[kind]) : cutAt;
-    if (!(through > from + shift)) return `segment-interval-is-empty-${kind}`;
+    if (!(through > from + trackShift)) return `segment-interval-is-empty-${kind}`;
     const end = BigInt(Math.round(through * Number(track.timescale)));
     const first = track.ranges[0];
     const frame = track.productionFrame ?? first.frame;