@blockcast/mmt-container 1.0.0 → 1.0.1-main.a3b5ae176fff

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blockcast/mmt-container",
-  "version": "1.0.0",
+  "version": "1.0.1-main.a3b5ae176fff",
   "description": "MMTP/LOC container parsing for MMT over MoQ and SSM",
   "type": "module",
   "main": "dist/index.js",
@@ -169,10 +169,10 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@blockcast/fec-worker": "^1.0.0",
-    "@blockcast/mmt-base": "^1.0.0",
-    "@blockcast/mmt-fec": "^1.0.0",
-    "@blockcast/mmt-manifest-verify": "^1.0.0",
+    "@blockcast/fec-worker": "1.0.1-main.a3b5ae176fff",
+    "@blockcast/mmt-base": "1.0.1-main.a3b5ae176fff",
+    "@blockcast/mmt-fec": "1.0.1-main.a3b5ae176fff",
+    "@blockcast/mmt-manifest-verify": "1.0.1-main.a3b5ae176fff",
     "@noble/curves": "^1.9.7",
     "@noble/hashes": "^1.8.0",
     "ajv": "^8.17.1",

package/src/repair-fetch.ts

@@ -29,7 +29,9 @@
  *     below a RAP the receiver already holds complete is not requested at
  *     all (`moot-rap`), and a P0 FETCH still running when such a RAP
  *     arrives is cancelled (`repair-stopped`, `moot`): the receiver resumes
- *     from that RAP (draft-ramadan-moq-fec §11.4.2).
+ *     from that RAP (draft-ramadan-moq-fec §11.4.2). Only a repair that
+ *     could not land by the block's playout deadline (it relies on the
+ *     keyframe budget's extension) is moot: one that can stalls nothing.
  *   - P1 (audio) dispatches, uncapped, while no P0 is queued or in flight;
  *     P2 (delta) only while no P0/P1 is, earliest absolute fail deadline
  *     first (§11.4.5 item 3).
@@ -575,6 +577,8 @@ type StopReason = RepairStopReason
 
 interface FetchRun {
   readonly controller: AbortController
+  /** When this FETCH went out: it lands around `sentAt + rtt`. */
+  readonly sentAt: number
   stopped: StopReason | null
 }
 
@@ -596,6 +600,11 @@ interface RepairEntry {
    * later: a block reclassified from delta can gain the keyframe budget.
    */
   deadlineAt: number
+  /**
+   * `deadlineAt` without the keyframe budget's extension: the block's playout
+   * deadline. A FETCH landing by it costs no stall, so it is never moot.
+   */
+  playoutDeadlineAt: number
   /** Inputs `deadlineAt` was computed from; they move with it. */
   anchorAt: number | null
   delayMs: number | null
@@ -697,9 +706,18 @@ export function wireRepairFetch(mc: RepairFetchHost, opts: WireRepairFetchOption
     return length === undefined ? undefined : entry.sbn + length - 1
   }
 
-  /** A keyframe request whose whole block lies below a RAP already held complete. */
+  /**
+   * A keyframe request whose whole block lies below a RAP already held
+   * complete, and whose repair can only land on the keyframe budget's
+   * extension. One that lands by the playout deadline stalls nothing, and
+   * skipping it only throws away the block's frames (BLO-51635).
+   */
   const moot = (entry: RepairEntry): boolean => {
     if (entry.priority !== 0) return false
+    const rttMs = readRtt()
+    // A running FETCH lands relative to when it was sent, not to now.
+    const sentAt = entry.running?.sentAt ?? performance.now()
+    if (rttMs !== null && sentAt + rttMs < entry.playoutDeadlineAt) return false
     const last = lastSsId(entry)
     if (last === undefined) return false
     try {
@@ -832,7 +850,7 @@ export function wireRepairFetch(mc: RepairFetchHost, opts: WireRepairFetchOption
       bound: entry.bound,
       ...(entry.range ? { range: true as const } : {}),
     })
-    const run: FetchRun = { controller: new AbortController(), stopped: null }
+    const run: FetchRun = { controller: new AbortController(), sentAt: now, stopped: null }
     entry.running = run
     // Hold the block open to the presentation deadline while this FETCH can
     // still land: the multicast span elapsing must not abort it.
@@ -1053,6 +1071,10 @@ export function wireRepairFetch(mc: RepairFetchHost, opts: WireRepairFetchOption
       )
       if (promotedDeadline !== null && promotedDeadline.deadlineAt > entry.deadlineAt) {
         entry.deadlineAt = promotedDeadline.deadlineAt
+        entry.playoutDeadlineAt = Math.max(
+          entry.playoutDeadlineAt,
+          promotedDeadline.deadlineAt - promotedDeadline.extensionMs,
+        )
         entry.anchorAt = promotedDeadline.anchorAt
         entry.delayMs = promotedDeadline.delayMs
         entry.bound = promotedDeadline.bound
@@ -1231,6 +1253,7 @@ export function wireRepairFetch(mc: RepairFetchHost, opts: WireRepairFetchOption
       priority,
       subscriberPriority: wire.subscriberPriority,
       deadlineAt: deadline.deadlineAt,
+      playoutDeadlineAt: deadline.deadlineAt - deadline.extensionMs,
       anchorAt: deadline.anchorAt,
       delayMs: deadline.delayMs,
       bound: deadline.bound,
@@ -1313,6 +1336,7 @@ export function wireRepairFetch(mc: RepairFetchHost, opts: WireRepairFetchOption
         priority,
         subscriberPriority: wire.subscriberPriority,
         deadlineAt: deadline.deadlineAt,
+        playoutDeadlineAt: deadline.deadlineAt - deadline.extensionMs,
         anchorAt: deadline.anchorAt,
         delayMs: deadline.delayMs,
         bound: deadline.bound,