@blockcast/mmt-container 0.3.0 → 0.4.0-main.1cd3cdea89da

package/dist/mmtp-router.js

@@ -1,77 +1,16 @@
-// ../mmt-alta-parse/dist/index.js
+// ../mmt-base/dist/mmtp.js
 var MMTP_HEADER_SIZE = 12;
 var MPU_HEADER_SIZE = 8;
-var MPU_LENGTH_FIELD_SIZE = 2;
-var MPU_HEADER_REMAINDER_SIZE = MPU_HEADER_SIZE - MPU_LENGTH_FIELD_SIZE;
-var TIMED_MFU_DU_HEADER_SIZE = 14;
-var NONTIMED_MFU_DU_HEADER_SIZE = 4;
-var PACKET_TYPE_MPU = 0;
-var MMTP_EXT_TYPE_ALTA_AUTH = 61601;
-var MMTP_EXT_TRAILER_HEADER_SIZE = 4;
-function extractAltaTrailer(mmtpPacket, options) {
-  if (mmtpPacket.length < MMTP_HEADER_SIZE + MPU_HEADER_SIZE)
-    return null;
-  const packetType = mmtpPacket[1] & 63;
-  if (packetType !== PACKET_TYPE_MPU)
-    return null;
-  const fecType = mmtpPacket[0] >> 3 & 3;
-  let headerLength = MMTP_HEADER_SIZE;
-  if (fecType < 2 && (mmtpPacket[0] & 32) !== 0)
-    headerLength += 4;
-  if (fecType < 2 && (mmtpPacket[0] & 2) !== 0) {
-    if (headerLength + 4 > mmtpPacket.length)
-      return null;
-    const extensionLength = new DataView(mmtpPacket.buffer, mmtpPacket.byteOffset + headerLength + 2, 2).getUint16(0, false);
-    headerLength += 4 + extensionLength;
-  }
-  if (headerLength + MPU_HEADER_SIZE > mmtpPacket.length)
-    return null;
-  const payload = mmtpPacket.subarray(headerLength);
-  const payloadLength = payload[0] << 8 | payload[1];
-  const flagsByte = payload[2];
-  const fragmentType = flagsByte >> 4 & 15;
-  const timed = (flagsByte >> 3 & 1) === 1;
-  const fragmentationIndicator = flagsByte >> 1 & 3;
-  if (fragmentType !== 2)
-    return null;
-  const dataUnitHeaderSize = fragmentationIndicator <= 1 ? timed ? TIMED_MFU_DU_HEADER_SIZE : NONTIMED_MFU_DU_HEADER_SIZE : 0;
-  if (payloadLength <= MPU_HEADER_REMAINDER_SIZE + dataUnitHeaderSize)
-    return null;
-  if (fecType > 1)
-    return null;
-  const hasFecId = !options?.skipFecId && fecType === 1;
-  const payloadEnd = hasFecId ? payload.length - 4 : payload.length;
-  const declaredEnd = MPU_LENGTH_FIELD_SIZE + payloadLength;
-  if (declaredEnd > payloadEnd)
-    return null;
-  if (declaredEnd + MMTP_EXT_TRAILER_HEADER_SIZE > payloadEnd)
-    return null;
-  const extType = payload[declaredEnd] << 8 | payload[declaredEnd + 1];
-  if (extType !== MMTP_EXT_TYPE_ALTA_AUTH)
-    return null;
-  const extLen = payload[declaredEnd + 2] << 8 | payload[declaredEnd + 3];
-  const authStart = declaredEnd + MMTP_EXT_TRAILER_HEADER_SIZE;
-  if (authStart + extLen !== payloadEnd)
-    return null;
-  return {
-    auth: payload.subarray(authStart, payloadEnd),
-    signedEnd: headerLength + declaredEnd
-  };
-}
-
-// ../mmt-base/dist/mmtp.js
-var MMTP_HEADER_SIZE2 = 12;
-var MPU_HEADER_SIZE2 = 8;
 var MFU_DU_HEADER_SIZE_TIMED = 14;
 var MFU_DU_HEADER_SIZE_NONTIMED = 4;
-var MPU_LENGTH_FIELD_SIZE2 = 2;
-var MPU_HEADER_REMAINDER_SIZE2 = MPU_HEADER_SIZE2 - MPU_LENGTH_FIELD_SIZE2;
+var MPU_LENGTH_FIELD_SIZE = 2;
+var MPU_HEADER_REMAINDER_SIZE = MPU_HEADER_SIZE - MPU_LENGTH_FIELD_SIZE;
 var SOURCE_FEC_PAYLOAD_ID_SIZE = 4;
-var PACKET_TYPE_MPU2 = 0;
+var PACKET_TYPE_MPU = 0;
 var PACKET_TYPE_REPAIR = 3;
 var MMTP_SIGNALING_PACKET_ID = 0;
 function parseMMTPHeader(buffer) {
-  if (buffer.length < MMTP_HEADER_SIZE2) {
+  if (buffer.length < MMTP_HEADER_SIZE) {
     throw new Error(`MMTP packet too small: ${buffer.length} bytes`);
   }
   const view2 = new DataView(buffer.buffer, buffer.byteOffset, buffer.byteLength);
@@ -127,7 +66,7 @@ function parseMMTPHeader(buffer) {
   };
 }
 function parseMPUHeader(payload) {
-  if (payload.length < MPU_HEADER_SIZE2) {
+  if (payload.length < MPU_HEADER_SIZE) {
     throw new Error(`Payload too small for MPU header: ${payload.length} bytes`);
   }
   const view2 = new DataView(payload.buffer, payload.byteOffset, payload.byteLength);
@@ -160,15 +99,15 @@ function parseTimedMfuDuHeader(payload, offset) {
   };
 }
 function resolveMfuPayloadLayout(mpu, fragmentType, payload) {
-  if (mpu.payloadLength < MPU_HEADER_REMAINDER_SIZE2) {
+  if (mpu.payloadLength < MPU_HEADER_REMAINDER_SIZE) {
     return {
       rejection: {
         gate: "mpu-payload-length-below-header-remainder",
-        detail: `payload_length=${mpu.payloadLength} < ${MPU_HEADER_REMAINDER_SIZE2}`
+        detail: `payload_length=${mpu.payloadLength} < ${MPU_HEADER_REMAINDER_SIZE}`
       }
     };
   }
-  const declaredEnd = MPU_LENGTH_FIELD_SIZE2 + mpu.payloadLength;
+  const declaredEnd = MPU_LENGTH_FIELD_SIZE + mpu.payloadLength;
   if (declaredEnd > payload.length) {
     return {
       rejection: {
@@ -179,7 +118,7 @@ function resolveMfuPayloadLayout(mpu, fragmentType, payload) {
   }
   const hasHeader = fragmentType === 2 && mpu.fragmentationIndicator <= 1;
   const mfuHeaderSize = mpu.timedFlag ? MFU_DU_HEADER_SIZE_TIMED : MFU_DU_HEADER_SIZE_NONTIMED;
-  const mfuOffset = MPU_HEADER_SIZE2 + (hasHeader ? mfuHeaderSize : 0);
+  const mfuOffset = MPU_HEADER_SIZE + (hasHeader ? mfuHeaderSize : 0);
   if (mfuOffset >= declaredEnd) {
     return {
       rejection: {
@@ -196,44 +135,46 @@ function resolveMfuPayloadLayout(mpu, fragmentType, payload) {
     }
   };
 }
-function isEmptyOrExactAltaTrailer(payload, start, end) {
+var LEGACY_TRAILER_EXT_TYPE = 61601;
+var LEGACY_TRAILER_HEADER_SIZE = 4;
+function isEmptyOrExactLegacyTrailer(payload, start, end) {
   if (start === end)
     return true;
-  if (start < 0 || end > payload.length || start + MMTP_EXT_TRAILER_HEADER_SIZE > end) {
+  if (start < 0 || end > payload.length || start + LEGACY_TRAILER_HEADER_SIZE > end) {
     return false;
   }
   const view2 = new DataView(payload.buffer, payload.byteOffset + start, end - start);
-  if (view2.getUint16(0, false) !== MMTP_EXT_TYPE_ALTA_AUTH)
+  if (view2.getUint16(0, false) !== LEGACY_TRAILER_EXT_TYPE)
     return false;
   const authLength = view2.getUint16(2, false);
-  return start + MMTP_EXT_TRAILER_HEADER_SIZE + authLength === end;
+  return start + LEGACY_TRAILER_HEADER_SIZE + authLength === end;
 }
 function resolveDeclaredTrailers(payload, declaredEnd, fecType, options) {
   if (declaredEnd > payload.length)
     return null;
   if (options?.skipFecId) {
-    return isEmptyOrExactAltaTrailer(payload, declaredEnd, payload.length) ? { hasFecId: false } : null;
+    return isEmptyOrExactLegacyTrailer(payload, declaredEnd, payload.length) ? { hasFecId: false } : null;
   }
   if (fecType === 1) {
     const fecStart = payload.length - SOURCE_FEC_PAYLOAD_ID_SIZE;
-    if (fecStart < declaredEnd || !isEmptyOrExactAltaTrailer(payload, declaredEnd, fecStart)) {
+    if (fecStart < declaredEnd || !isEmptyOrExactLegacyTrailer(payload, declaredEnd, fecStart)) {
       return null;
     }
     return { hasFecId: true };
   }
   if (fecType !== 0)
     return null;
-  if (isEmptyOrExactAltaTrailer(payload, declaredEnd, payload.length)) {
+  if (isEmptyOrExactLegacyTrailer(payload, declaredEnd, payload.length)) {
     return { hasFecId: false };
   }
   return null;
 }
 function planMfuExtraction(mmtpPacket, options, parsedHeader) {
-  if (mmtpPacket.length < MMTP_HEADER_SIZE2 + MPU_HEADER_SIZE2) {
+  if (mmtpPacket.length < MMTP_HEADER_SIZE + MPU_HEADER_SIZE) {
     return {
       rejection: {
         gate: "packet-shorter-than-mmtp-plus-mpu-header",
-        detail: `${mmtpPacket.length} bytes < ${MMTP_HEADER_SIZE2 + MPU_HEADER_SIZE2}`
+        detail: `${mmtpPacket.length} bytes < ${MMTP_HEADER_SIZE + MPU_HEADER_SIZE}`
       }
     };
   }
@@ -252,7 +193,7 @@ function planMfuExtraction(mmtpPacket, options, parsedHeader) {
       };
     }
   }
-  if (header.packetType !== PACKET_TYPE_MPU2) {
+  if (header.packetType !== PACKET_TYPE_MPU) {
     return {
       rejection: {
         gate: "not-an-mpu-packet",
@@ -261,11 +202,11 @@ function planMfuExtraction(mmtpPacket, options, parsedHeader) {
     };
   }
   const payload = mmtpPacket.subarray(header.headerLength);
-  if (payload.length < MPU_HEADER_SIZE2) {
+  if (payload.length < MPU_HEADER_SIZE) {
     return {
       rejection: {
         gate: "payload-shorter-than-mpu-header",
-        detail: `${payload.length} bytes < ${MPU_HEADER_SIZE2}`
+        detail: `${payload.length} bytes < ${MPU_HEADER_SIZE}`
       }
     };
   }
@@ -296,7 +237,7 @@ function planMfuExtraction(mmtpPacket, options, parsedHeader) {
     return {
       rejection: {
         gate: "declared-trailers-unresolved",
-        detail: `trailer bytes [${layout.dataEnd}, ${payload.length}) are neither empty nor an exact ALTA trailer (fecType=${header.fecType})`
+        detail: `trailer bytes [${layout.dataEnd}, ${payload.length}) are neither empty nor an exact legacy authenticator trailer (fecType=${header.fecType})`
       }
     };
   }
@@ -312,8 +253,8 @@ function extractPlannedMfu(mmtpPacket, result) {
   const mfuDuHeaderPresent = layout.hasMfuDuHeader;
   const mfuOffset = layout.mfuOffset;
   const dataEnd = layout.dataEnd;
-  const mfuDuHeader = mfuDuHeaderPresent && mpu.timedFlag === 1 ? parseTimedMfuDuHeader(payload, MPU_HEADER_SIZE2) : null;
-  const itemId = mfuDuHeaderPresent && mpu.timedFlag === 0 ? new DataView(payload.buffer, payload.byteOffset + MPU_HEADER_SIZE2, 4).getUint32(0, false) : null;
+  const mfuDuHeader = mfuDuHeaderPresent && mpu.timedFlag === 1 ? parseTimedMfuDuHeader(payload, MPU_HEADER_SIZE) : null;
+  const itemId = mfuDuHeaderPresent && mpu.timedFlag === 0 ? new DataView(payload.buffer, payload.byteOffset + MPU_HEADER_SIZE, 4).getUint32(0, false) : null;
   const data = payload.subarray(mfuOffset, dataEnd);
   const fecPayloadId = trailerLayout.hasFecId ? {
     ssId: new DataView(mmtpPacket.buffer, mmtpPacket.byteOffset + mmtpPacket.length - SOURCE_FEC_PAYLOAD_ID_SIZE, SOURCE_FEC_PAYLOAD_ID_SIZE).getUint32(0, false)
@@ -321,17 +262,17 @@ function extractPlannedMfu(mmtpPacket, result) {
   return { header, mpu, fragmentType, data, mfuDuHeader, itemId, fecPayloadId };
 }
 function sourceFecPayloadIdOf(mmtpPacket, header) {
-  if (mmtpPacket.length < MMTP_HEADER_SIZE2 + MPU_HEADER_SIZE2)
+  if (mmtpPacket.length < MMTP_HEADER_SIZE + MPU_HEADER_SIZE)
     return null;
-  if (header.packetType !== PACKET_TYPE_MPU2)
+  if (header.packetType !== PACKET_TYPE_MPU)
     return null;
   const payload = mmtpPacket.subarray(header.headerLength);
-  if (payload.length < MPU_HEADER_SIZE2)
+  if (payload.length < MPU_HEADER_SIZE)
     return null;
   const payloadLength = payload[0] << 8 | payload[1];
-  if (payloadLength < MPU_HEADER_REMAINDER_SIZE2)
+  if (payloadLength < MPU_HEADER_REMAINDER_SIZE)
     return null;
-  const declaredEnd = MPU_LENGTH_FIELD_SIZE2 + payloadLength;
+  const declaredEnd = MPU_LENGTH_FIELD_SIZE + payloadLength;
   if (!resolveDeclaredTrailers(payload, declaredEnd, header.fecType)?.hasFecId)
     return null;
   const off = mmtpPacket.length - SOURCE_FEC_PAYLOAD_ID_SIZE;
@@ -339,7 +280,6 @@ function sourceFecPayloadIdOf(mmtpPacket, header) {
     ssId: (mmtpPacket[off] << 24 | mmtpPacket[off + 1] << 16 | mmtpPacket[off + 2] << 8 | mmtpPacket[off + 3]) >>> 0
   };
 }
-var extractAltaTrailer2 = extractAltaTrailer;
 var REPAIR_FEC_PID_SIZE = 13;
 function readRepairFecPayloadIdFields(mmtpPacket, parsedHeader) {
   let header;
@@ -419,7 +359,6 @@ function serial32Precedes(a, b) {
 
 // ../mmt-base/dist/fec-block-profile.js
 var FEC_BLOCK_PROFILES = Object.freeze([
-  "k-padded-v1",
   "iso-ssbg1-v1"
 ]);
 
@@ -4526,7 +4465,6 @@ var CmafBlockAssembler = class {
       failedBlocks: 0
     };
     this.#config = {
-      k: config.k,
       timescale: config.timescale ?? 1e6,
       trackId: config.trackId ?? 1,
       trackType: config.trackType,
@@ -6627,6 +6565,42 @@ var FecReleaseSequencer = class {
     for (const stream of this.#streams.values()) total += stream.buf.length;
     return total;
   }
+  #deferDepth = 0;
+  #deferredStreams = /* @__PURE__ */ new Set();
+  /**
+   * Run `work` with the drains its pushes would run deferred to its end. A
+   * recovered FEC block is routed one frame at a time, and its block is
+   * already resolved when the first frame is pushed: draining on that push
+   * would release past the gap before the block's other recovered frames
+   * arrive (deciding a conceal or stall for media that is about to land),
+   * and those frames would then be dropped as stale. Nests.
+   */
+  defer(work) {
+    this.#deferDepth++;
+    let threw = true;
+    try {
+      work();
+      threw = false;
+    } finally {
+      this.#deferDepth--;
+      if (this.#deferDepth === 0 && this.#deferredStreams.size > 0) {
+        const streams = [...this.#deferredStreams];
+        this.#deferredStreams.clear();
+        if (!threw) {
+          for (const stream of streams) this.#drain(stream);
+        } else {
+          try {
+            for (const stream of streams) this.#drain(stream);
+          } catch {
+          }
+        }
+      }
+    }
+  }
+  #drainUnlessDeferred(stream) {
+    if (this.#deferDepth > 0) this.#deferredStreams.add(stream);
+    else this.#drain(stream);
+  }
   push(streamKey, data, meta, seq) {
     const frame = { data, meta: { ...meta }, seq, arrivedAtMs: performance.now() };
     const stream = this.#streamFor(streamKey, meta);
@@ -6648,7 +6622,7 @@ var FecReleaseSequencer = class {
         return;
       }
       this.#release(stream, frame, void 0);
-      this.#drain(stream);
+      this.#drainUnlessDeferred(stream);
       return;
     }
     let lo = 0;
@@ -6659,7 +6633,23 @@ var FecReleaseSequencer = class {
       else hi = mid;
     }
     stream.buf.splice(lo, 0, frame);
-    this.#drain(stream);
+    this.#drainUnlessDeferred(stream);
+  }
+  /**
+   * Arrival time of the earliest frame a stream of `packetId` holds behind a
+   * gap (the gate forces it out `holdLimitMs` after that), or undefined when
+   * none is held. Without `catalogTrackName`, every stream of the packetId.
+   */
+  earliestHeldArrivalMs(packetId, catalogTrackName) {
+    let earliest;
+    for (const stream of this.#streams.values()) {
+      if (stream.packetId !== packetId) continue;
+      if (catalogTrackName !== void 0 && stream.catalogTrackName !== catalogTrackName) continue;
+      for (const frame of stream.buf) {
+        if (earliest === void 0 || frame.arrivedAtMs < earliest) earliest = frame.arrivedAtMs;
+      }
+    }
+    return earliest;
   }
   /** Re-evaluate held gaps after FEC state changed. */
   poke(streamKey) {
@@ -6712,6 +6702,21 @@ var FecReleaseSequencer = class {
       this.#streams.delete(key);
     }
   }
+  /**
+   * The packet's FEC ended, so no block will resolve a held gap: release its
+   * frames in order, each gap stalled as a discontinuity, and forget its
+   * streams, so FEC configured on it again starts from a fresh one.
+   */
+  endPacket(packetId) {
+    for (const [key, stream] of this.#streams) {
+      if (stream.packetId !== packetId) continue;
+      while (stream.buf.length > 0 && stream.last !== null) {
+        stream.discontinuity = true;
+        this.#drain(stream);
+      }
+      this.#streams.delete(key);
+    }
+  }
   discardPacket(packetId) {
     for (const [key, stream] of this.#streams) {
       if (stream.packetId !== packetId) continue;
@@ -7080,6 +7085,22 @@ var MmtpContainerParser = class _MmtpContainerParser {
       }
     ) : null;
   }
+  /**
+   * Run `work` with the FEC release gate's drains deferred to its end, so
+   * every frame it pushes is in place before any held gap is decided (see
+   * FecReleaseSequencer.defer).
+   */
+  deferFecRelease(work) {
+    if (!this.#fecSequencer) {
+      work();
+      return;
+    }
+    this.#fecSequencer.defer(work);
+  }
+  /** See FecReleaseSequencer.earliestHeldArrivalMs. */
+  fecReleaseEarliestHeldAtMs(packetId, catalogTrackName) {
+    return this.#fecSequencer?.earliestHeldArrivalMs(packetId, catalogTrackName);
+  }
   /** Re-evaluate held gaps after FEC block state changed. */
   pokeFecRelease(packetId, catalogTrackName) {
     if (!this.#fecSequencer) return;
@@ -7094,6 +7115,13 @@ var MmtpContainerParser = class _MmtpContainerParser {
   markFecDiscontinuity(packetId, catalogTrackName) {
     this.#fecSequencer?.markDiscontinuity(this.#streamKey(packetId, catalogTrackName));
   }
+  /**
+   * The FEC of a packet ID ended: release the frames the FEC release gate
+   * holds for it in order, each gap stalled, and forget its gated streams.
+   */
+  endFecRelease(packetId) {
+    this.#fecSequencer?.endPacket(packetId);
+  }
   /**
    * MPU and data-unit identity of one MMTP packet, parsed in place (no copy,
    * no reassembly). Null for non-MPU packets and packets that do not parse.
@@ -7274,7 +7302,7 @@ var MmtpContainerParser = class _MmtpContainerParser {
     const parsed = preParsed !== void 0 && preParsed.skipFecPayloadId === (options?.skipFecPayloadId === true) ? preParsed : this.parsePacket(packet, options);
     if (!parsed) return this.#drop("header-parse-failed");
     const info = parsed.info;
-    if (info.packetType !== PACKET_TYPE_MPU2) {
+    if (info.packetType !== PACKET_TYPE_MPU) {
       return {
         kind: info.isRepair ? "repair" : "non-media",
         packet: info,
@@ -7283,10 +7311,8 @@ var MmtpContainerParser = class _MmtpContainerParser {
     }
     if (info.fecPayloadId !== null && this.#sourceSymbolCb) {
       const rawSymbol = packet.subarray(0, packet.length - 4);
-      const altaTrailer = extractAltaTrailer2(packet);
-      const alta = altaTrailer ? { auth: altaTrailer.auth, payloadEnd: altaTrailer.signedEnd } : void 0;
       try {
-        this.#sourceSymbolCb(info.packetId, info.fecPayloadId.ssId, rawSymbol, alta);
+        this.#sourceSymbolCb(info.packetId, info.fecPayloadId.ssId, rawSymbol);
       } catch {
       }
     }
@@ -8474,6 +8500,8 @@ var MmtpRouter = class {
   // ── Keyframe loss detection state ───────────────────────────────
   /** Catalog-derived keyframe loss timeout (ms), or a reader evaluated at each arm. null = not configured (warns on video track registration; Phase-13 keyframe repair stays off). */
   #keyframeLostTimeoutMs;
+  /** packetIds already warned for running without Phase 13 (non-FEC video only). */
+  #warnedNoKeyframeLostTimeout = /* @__PURE__ */ new Set();
   /** Why the last reader evaluation left the timer unarmed; null while arming. Dedups the warning. */
   #keyframeLostUnarmedReason = null;
   /** Active keyframe loss timer handle. Single timer per video track — cleared on each rapFlag and on dispose(). */
@@ -8489,6 +8517,8 @@ var MmtpRouter = class {
    */
   #onPublisherRestart;
   #publisherRestarts = 0;
+  /** Inits delivered with no onTrackInit handler for their packetId (MOQT-01). */
+  #unmappedInitDeliveries = 0;
   // FEC Payload IDs left unread because their (owner) packetId had no
   // configured fec.blockProfile (see #noteUnreadableFecPayloadId).
   #fecPayloadIdsWithoutProfile = 0;
@@ -8685,15 +8715,24 @@ var MmtpRouter = class {
       return NO_FEC_GEOMETRY_HORIZON;
     }
     const blockSpanMs = fec.interleaveDepthMsForPacket(packetId);
+    const blockLifetimeMs = fec.blockLifetimeMsForPacket(packetId);
+    if (blockSpanMs === void 0 || blockLifetimeMs === void 0) return NO_FEC_GEOMETRY_HORIZON;
     if (blockSpanMs === 0) return NO_BLOCK_SPAN_HORIZON;
     return {
       kind: "fec-horizon",
-      retentionMs: duplicateRetentionMs({
-        blockSpanMs,
-        blockLifetimeMs: fec.blockLifetimeMsForPacket(packetId)
-      })
+      retentionMs: duplicateRetentionMs({ blockSpanMs, blockLifetimeMs })
     };
   }
+  /**
+   * Init segments delivered for a packetId with no `onTrackInit` handler
+   * since construction, whether the deprecated aggregate `onInitSegment`
+   * callback then received them or nothing did. A supported deployment reads
+   * 0 here; a non-zero value is the evidence that blocks removing the
+   * aggregate callback (MOQT-01, BLO-21181).
+   */
+  get unmappedInitDeliveryCount() {
+    return this.#unmappedInitDeliveries;
+  }
   /** Publisher restarts detected on the multicast leg since construction. */
   get publisherRestartCount() {
     return this.#publisherRestarts;
@@ -8781,7 +8820,7 @@ var MmtpRouter = class {
   /** Update MFU reassembly timeout. Source and FEC-recovery paths share the
    *  parser's single reassembler (BLO-8151), so one update covers both. */
   setMfuTimeoutMs(ms) {
-    if (ms <= 0) throw new Error("[MmtpRouter] mfuTimeoutMs must be > 0");
+    if (ms !== null && ms <= 0) throw new Error("[MmtpRouter] mfuTimeoutMs must be > 0");
     this.#parser.setMfuTimeoutMs(ms);
   }
   /** Update parser frame reordering for unordered multicast delivery.
@@ -8792,15 +8831,14 @@ var MmtpRouter = class {
   }
   /** Register MMTP packetId → track type mapping.
    *  Call BEFORE packets arrive to ensure correct routing from the first packet.
-   *  If keyframeLostTimeoutMs is not provided, Phase 13 keyframe repair is
-   *  disabled (video still routes/decodes normally). framerate is OPTIONAL per
-   *  draft-ietf-moq-catalogformat-01 §3.2.23, so we can't require the timeout. */
+   *  Without keyframeLostTimeoutMs a track WITHOUT FEC has no Phase 13
+   *  keyframe repair (video still routes/decodes normally); that is warned at
+   *  its first keyframe, once the FEC configuration is known (see
+   *  #noteEmittedKeyframe). Nothing is warned here: an FEC track never uses
+   *  the timer, and at registration the FEC configuration may not be applied
+   *  yet. framerate is OPTIONAL per draft-ietf-moq-catalogformat-01 §3.2.23,
+   *  so we can't require the timeout. */
   setPacketIdType(packetId, trackType) {
-    if (trackType === "video" && this.#keyframeLostTimeoutMs === null) {
-      console.warn(
-        "[MmtpRouter] keyframeLostTimeoutMs not configured \u2014 Phase 13 keyframe repair disabled for this track. Set it via setKeyframeLostTimeoutMs() or provide in constructor config to enable: Math.ceil(groupDurationMs * KEYFRAME_LOST_TIMEOUT_SLACK)."
-      );
-    }
     if (trackType === "video") this.#videoPacketIds.add(packetId);
     else this.#audioPacketIds.add(packetId);
     const codec = this.#trackCodecs.get(packetId) ?? "";
@@ -8851,7 +8889,15 @@ var MmtpRouter = class {
   onTrackPacket(packetId, cb) {
     this.#trackPacketCallbacks.set(packetId, cb);
   }
-  /** Register an init segment callback (ftyp+moov from MMTP MPU metadata). */
+  /**
+   * Register an init segment callback (ftyp+moov from MMTP MPU metadata).
+   * Receives an init only for a packetId with no `onTrackInit` handler.
+   *
+   * @deprecated Use onTrackInit(packetId, cb). Still delivered as a fallback;
+   * removed in the 1.0.0 major, no earlier than one minor release after this
+   * deprecation reaches the `latest` dist-tag (BLO-21181). Count fallback
+   * deliveries with `unmappedInitDeliveryCount`.
+   */
   onInitSegment(cb) {
     this.#onInitSegment = cb;
   }
@@ -8865,17 +8911,16 @@ var MmtpRouter = class {
    *  When active, source frames are buffered per FEC block and emitted as
    *  multi-sample CMAF segments instead of per-frame callbacks. */
   enableMseAssembler(packetId, config, catalogTrackName) {
-    const k = this.#kForPacket(packetId);
     const assemblerKey = this.#mseAssemblerKey(packetId, catalogTrackName);
     const previous = this.#mseAssemblers.get(assemblerKey);
     if (previous) {
       previous.flush();
       previous.dispose();
     }
-    const assembler = new CmafBlockAssembler({ ...config, k });
+    const assembler = new CmafBlockAssembler(config);
     this.#mseAssemblers.set(assemblerKey, assembler);
     console.log(
-      `[MmtpRouter] MSE assembler enabled for packetId=${packetId}${catalogTrackName === void 0 ? "" : ` track=${catalogTrackName}`} (K=${k}, ${config.trackType})`
+      `[MmtpRouter] MSE assembler enabled for packetId=${packetId}${catalogTrackName === void 0 ? "" : ` track=${catalogTrackName}`} (${config.trackType})`
     );
     return assembler;
   }
@@ -8984,6 +9029,21 @@ var MmtpRouter = class {
     }
     this.#fecMappersByPacketId.set(packetId, mapper);
   }
+  /**
+   * Release the router side of a packetId whose FEC is ending: drop its block
+   * mapper and end its FEC release gating. Frames the gate holds are released
+   * in order, each gap stalled (no block will resolve it), not stranded. Call
+   * before FECManager.releasePacket, while the gate can still read its blocks.
+   */
+  releaseFecPacket(packetId) {
+    this.#fecMappersByPacketId.delete(packetId);
+    this.#withDeferredFecPokes(() => {
+      this.#parser.endFecRelease(packetId);
+      for (const [key, poke] of this.#pendingFecPokes) {
+        if (poke.packetId === packetId) this.#pendingFecPokes.delete(key);
+      }
+    });
+  }
   registerManifestTrack(context) {
     if (!this.#manifestVerifier) throw new Error("manifest verifier is not configured");
     this.#manifestVerifier.registerTrack(context);
@@ -9103,87 +9163,21 @@ var MmtpRouter = class {
         this.#noteUnreadableFecPayloadId(ownerPacketId, "repair");
         return;
       }
-      if (this.#isIsoPacket(ownerPacketId)) {
-        this.#handleIsoRepair(ownerPacketId, catalogTrackName, parsed, "moq");
-        return;
-      }
-      const repairSbn = this.#deriveRepairSbn(parsed.ssStart, parsed.ssbLength, ownerPacketId);
-      if (repairSbn === null) return;
-      const repairEsi = this.#kForPacket(ownerPacketId) + parsed.rsId;
-      if (!this.#feedFecTransportSymbol(
-        ownerPacketId,
-        repairSbn,
-        repairEsi,
-        parsed.symbolData,
-        "moq",
-        catalogTrackName
-      )) return;
-      const recovered = catalogTrackName === void 0 ? this.#fecManager.feedRepairSymbol(
-        ownerPacketId,
-        parsed.ssStart,
-        parsed.ssbLength,
-        parsed.rsId,
-        parsed.symbolData
-      ) : this.#fecManager.feedRepairSymbol(
-        ownerPacketId,
-        parsed.ssStart,
-        parsed.ssbLength,
-        parsed.rsId,
-        parsed.symbolData,
-        catalogTrackName
-      );
-      if (recovered) {
-        const alreadyCompleted = catalogTrackName === void 0 ? this.#fecManager.isBlockCompleted(repairSbn, ownerPacketId) : this.#fecManager.isBlockCompleted(repairSbn, ownerPacketId, catalogTrackName);
-        if (catalogTrackName === void 0) {
-          this.#fecManager.cancelBlockTimeout(repairSbn, ownerPacketId);
-        } else {
-          this.#fecManager.cancelBlockTimeout(repairSbn, ownerPacketId, catalogTrackName);
-        }
-        if (!alreadyCompleted) {
-          this.#fecManager.countRecovery(ownerPacketId, repairSbn, catalogTrackName);
-          if (catalogTrackName === void 0) {
-            this.#fecManager.markBlockCompleted(repairSbn, ownerPacketId);
-          } else {
-            this.#fecManager.markBlockCompleted(repairSbn, ownerPacketId, catalogTrackName);
-          }
-          this.#routeRecoveredBlock(
-            repairSbn,
-            recovered,
-            ownerPacketId,
-            catalogTrackName
-          );
-        }
-      }
+      this.#handleIsoRepair(ownerPacketId, catalogTrackName, parsed, "moq");
     }
   }
-  // ── SBN/ESI derivation ──────────────────────────────────────────
-  #kForPacket(packetId) {
-    if (packetId != null)
-      return this.#fecManager?.kForPacket?.(packetId) ?? this.#fecMappersByPacketId.get(packetId)?.k ?? this.#fecManager?.k ?? 4;
-    return this.#defaultFecMapper?.k ?? this.#fecManager?.k ?? 4;
-  }
+  // ── Packet FEC geometry and block profile ───────────────────────
   #symbolSizeForPacket(packetId) {
-    if (packetId != null) return this.#fecManager?.symbolSizeForPacket?.(packetId) ?? this.#fecManager?.symbolSize ?? 0;
+    if (packetId != null) return this.#fecManager?.symbolSizeForPacket?.(packetId) ?? 0;
     return this.#fecManager?.symbolSize ?? 0;
   }
-  /** Derive SBN/ESI from SS_ID using packet-scoped FEC geometry. */
-  #deriveSbnEsi(ssId, packetId) {
-    const mapper = packetId == null ? this.#defaultFecMapper : this.#fecMappersByPacketId.get(packetId) ?? null;
-    if (mapper) return mapper.fromSsId(ssId);
-    const k = this.#kForPacket(packetId);
-    return { sbn: Math.floor(ssId / k), esi: ssId % k };
-  }
-  #deriveRepairSbn(ssStart, ssbLength, packetId) {
-    const k = this.#kForPacket(packetId);
-    if (ssbLength <= 0 || ssbLength > k || ssStart % k !== 0) return null;
-    return Math.floor(ssStart / k);
-  }
   /**
    * The configured block profile of a packetId, or undefined while it is
    * unconfigured. With an FEC manager its per-packet configuration is the
    * only source. A router without one still recovers symbols through its
    * registered mapper, built with the catalog's explicit profile: the
-   * packet's own mapper, else the default one (the #deriveSbnEsi rule).
+   * packet's own mapper, else the default one. A NullBlockMapper (a stream
+   * without an FEC instance) states none.
    */
   #configuredBlockProfile(packetId) {
     if (this.#fecManager) return this.#fecManager.blockProfileForPacket(packetId);
@@ -9191,9 +9185,10 @@ var MmtpRouter = class {
     return mapper?.blockProfile ?? void 0;
   }
   /**
-   * The block profile an FEC coordinate of `packetId` is read under. Throws
-   * while none is configured: the two profiles carry identical wire tuples
-   * with different block math, so there is no default to fall back to.
+   * The block profile an FEC coordinate of `packetId` is read under:
+   * `iso-ssbg1-v1`, the only one (`k-padded-v1` is retired and refused).
+   * Throws while none is configured: such a packet has no FEC geometry, and
+   * nothing is inferred from the wire or defaulted.
    * Packet ingress leaves such a packet's FEC Payload ID unread first
    * (#noteUnreadableFecPayloadId); a throw here is a wiring fault on a path
    * that cannot hold an unconfigured packet.
@@ -9207,8 +9202,16 @@ var MmtpRouter = class {
     }
     return profile;
   }
-  #isIsoPacket(packetId) {
-    return this.#blockProfileFor(packetId) === "iso-ssbg1-v1";
+  /**
+   * The block coordinates (SS_Start, ESI) of an FEC source: range membership
+   * in a block a repair already stated (ISO/IEC 23008-1 C.5.3). Null while no
+   * repair has stated its block, while its packetId has no configured block
+   * profile, and without an FEC manager: SS_ID alone locates no block, so
+   * nothing is derived from it.
+   */
+  #locateFecSource(packetId, catalogTrackName, ssId) {
+    if (this.#configuredBlockProfile(packetId) === void 0) return null;
+    return this.#fecManager?.locateIsoSource?.(packetId, catalogTrackName, ssId) ?? null;
   }
   /**
    * Explicit refusal to read an FEC Payload ID: its (owner) packetId has no
@@ -9227,21 +9230,20 @@ var MmtpRouter = class {
     }
   }
   /**
-   * The release-gate anchor of a recovered symbol: its block (SBN) under
-   * k-padded-v1, its own SS_ID under iso-ssbg1-v1, where a frame is gated by
-   * the SS_IDs between it and the last released frame.
+   * The release-gate anchor of a recovered symbol: its own SS_ID, SS_Start +
+   * ESI modulo 2^32 (C.5.2), where a frame is gated by the SS_IDs between it
+   * and the last released frame.
    */
-  #fecAnchorForRecovered(ownerPacketId, blockId, index) {
-    return ownerPacketId !== void 0 && this.#isIsoPacket(ownerPacketId) ? serial32Add(blockId, index) : blockId;
+  #fecAnchorForRecovered(blockStart, index) {
+    return serial32Add(blockStart, index);
   }
   /**
    * One iso-ssbg1-v1 repair symbol (ISO/IEC 23008-1 C.5.3). It states the
    * block `[SS_Start, SS_Start + SSB_length)`; repair ESI = SSB_length +
    * RS_ID (K' = SSB_length). The held sources it placed (and those of a
    * repair-less span in front of it) are fed as first-arrival sources, then
-   * the repair, the order they had on the wire, so a loss-free block is clean
-   * on its repair exactly as under k-padded-v1. A repair contradicting a known
-   * block is dropped.
+   * the repair, the order they had on the wire, so a loss-free block completes
+   * clean on its repair. A repair contradicting a known block is dropped.
    */
   #handleIsoRepair(ownerPacketId, catalogTrackName, repair, source) {
     const fec = this.#fecManager;
@@ -9267,6 +9269,7 @@ var MmtpRouter = class {
       catalogTrackName
     )) return;
     fec.noteBlockActivity?.(blockStart, ownerPacketId, catalogTrackName);
+    fec.noteRepairGroupLength?.(blockStart, ownerPacketId, repair.rsbLength, catalogTrackName);
     const alreadyCompleted = fec.isBlockCompleted(blockStart, ownerPacketId, catalogTrackName);
     const recovered = fec.feedRepairSymbol(
       ownerPacketId,
@@ -9308,7 +9311,7 @@ var MmtpRouter = class {
       }
       if (payload.oversized) continue;
       const alreadyCompleted = fec.isBlockCompleted(blockStart, ownerPacketId, catalogTrackName);
-      const recovered = fec.feedSourceSymbol(ownerPacketId, ssId, payload.symbolData, void 0, catalogTrackName);
+      const recovered = fec.feedSourceSymbol(ownerPacketId, ssId, payload.symbolData, catalogTrackName);
       if (!recovered || alreadyCompleted) continue;
       fec.cancelBlockTimeout(blockStart, ownerPacketId, catalogTrackName);
       fec.countRecovery(ownerPacketId, blockStart, catalogTrackName);
@@ -9333,9 +9336,10 @@ var MmtpRouter = class {
     return null;
   }
   /** Route a recovered FEC block through the parser + dedup pipeline.
-   *  Sync WASM decoders return K fixed-width source symbols concatenated. */
+   *  Sync WASM decoders return the block's K' = SSB_length fixed-width
+   *  ssbg_mode1 source symbols concatenated. */
   routeRecoveredBlock(blockId, data, packetId, catalogTrackName) {
-    this.#routeRecoveredBlock(blockId, data, packetId, catalogTrackName);
+    this.#withDeferredFecPokes(() => this.#routeRecoveredBlock(blockId, data, packetId, catalogTrackName));
   }
   /** Route a single recovered source symbol through the parser + dedup pipeline.
    *  Worker-backed decoders emit one padded source symbol per frame event. */
@@ -9749,8 +9753,16 @@ var MmtpRouter = class {
   #noteEmittedKeyframe(packetId, keyframe) {
     if (!keyframe) return;
     if (!this.#videoPacketIds.has(packetId)) return;
-    if (this.#keyframeLostTimeoutMs === null) return;
     if (this.#isFecTrack(packetId)) return;
+    if (this.#keyframeLostTimeoutMs === null) {
+      if (!this.#warnedNoKeyframeLostTimeout.has(packetId)) {
+        this.#warnedNoKeyframeLostTimeout.add(packetId);
+        console.warn(
+          `[MmtpRouter] keyframeLostTimeoutMs not configured \u2014 Phase 13 keyframe repair disabled for packetId=${packetId}, a video track without FEC. Set it via setKeyframeLostTimeoutMs() or provide in constructor config to enable.`
+        );
+      }
+      return;
+    }
     this.#lastKeyframeGroupId++;
     this.#armKeyframeLostTimer();
   }
@@ -9762,7 +9774,7 @@ var MmtpRouter = class {
   #withDeferredFecPokes(work) {
     this.#fecPokeDepth++;
     try {
-      work();
+      this.#parser.deferFecRelease(work);
     } finally {
       this.#fecPokeDepth--;
       if (this.#fecPokeDepth === 0 && this.#pendingFecPokes.size > 0 && !this.#disposed) {
@@ -9774,6 +9786,13 @@ var MmtpRouter = class {
       }
     }
   }
+  /**
+   * Arrival time of the earliest frame the FEC release gate holds for this
+   * stream (see FecReleaseSequencer.earliestHeldArrivalMs), or undefined.
+   */
+  fecReleaseEarliestHeldAtMs(packetId, catalogTrackName) {
+    return this.#parser.fecReleaseEarliestHeldAtMs(packetId, catalogTrackName);
+  }
   #requestFecPoke(packetId, catalogTrackName) {
     if (this.#disposed) return;
     if (this.#fecPokeDepth > 0) {
@@ -9801,29 +9820,19 @@ var MmtpRouter = class {
       resolvedLoss: (packetId, catalogTrackName, fromSbn, toSbn, releasedSbn) => {
         const fec = this.#fecManager;
         if (!fec?.blockResolution) return [];
-        if (this.#isIsoPacket(packetId)) {
-          const head = fromSbn === releasedSbn ? toSbn : fromSbn;
-          return fec.isoSpanResolution?.(packetId, catalogTrackName, releasedSbn, head) ?? null;
-        }
-        const highest = fec.highestSbn?.(packetId, catalogTrackName);
-        const lost = [];
-        for (let sbn = fromSbn; sbn <= toSbn; sbn++) {
-          const resolution = fec.blockResolution(sbn, packetId, catalogTrackName);
-          if (resolution === "pending") return null;
-          if (resolution === "failed") {
-            lost.push(sbn);
-          } else if (resolution === "untracked") {
-            if (sbn === releasedSbn) continue;
-            if (highest === void 0 || sbn > highest) return null;
-            lost.push(sbn);
-          }
-        }
-        return lost;
+        const head = fromSbn === releasedSbn ? toSbn : fromSbn;
+        return fec.isoSpanResolution?.(packetId, catalogTrackName, releasedSbn, head) ?? null;
       },
       // The retention window itself: a frame is never still held when a block
       // it waits on retires. Only consulted while resolvedLoss holds a gap,
       // which needs blockResolution, so the check above guarantees the method.
-      holdLimitMs: (packetId) => this.#fecManager?.terminalRetentionMsForPacket?.(packetId) ?? Infinity,
+      // A packetId the manager no longer has configured (released) has no
+      // block left to wait on: release its frames now (BLO-45953).
+      holdLimitMs: (packetId) => {
+        const fec = this.#fecManager;
+        if (!fec?.terminalRetentionMsForPacket) return Infinity;
+        return fec.terminalRetentionMsForPacket(packetId) ?? 0;
+      },
       decide: (before, after, lostBlocks, discontinuity) => {
         const decision = this.#decideGap(before, after, lostBlocks, discontinuity);
         this.#onFrameGap?.(decision);
@@ -9885,9 +9894,10 @@ var MmtpRouter = class {
   }
   /**
    * The most media units a gap between two released frames can hold: the
-   * FEC blocks from `before`'s SBN to `after`'s, times D, the media units one
-   * block touches (ceil(interleaveDepthMs / unit duration), §5.1). Null when
-   * either SBN, the unit duration or the catalog interleave is unknown.
+   * FEC blocks between `before`'s anchor and `after`'s, times D, the media
+   * units one block touches (ceil(interleaveDepthMs / unit duration), §5.1).
+   * Null when either anchor, the unit duration or the catalog interleave is
+   * unknown.
    */
   #maxMissingUnits(before, after) {
     const from = before.fecSbn;
@@ -9900,7 +9910,7 @@ var MmtpRouter = class {
     const denominator = BigInt(timing.durationTicks) * 1000n;
     const unitsPerBlock = (numerator + denominator - 1n) / denominator;
     const blocks = BigInt(
-      (this.#isIsoPacket(after.packetId) ? serial32Precedes(from, to) ? serial32Distance(from, to) : serial32Distance(to, from) : Math.abs(to - from)) + 1
+      (serial32Precedes(from, to) ? serial32Distance(from, to) : serial32Distance(to, from)) + 1
     );
     const bound = unitsPerBlock * blocks;
     return bound > BigInt(Number.MAX_SAFE_INTEGER) ? null : Number(bound);
@@ -9950,8 +9960,9 @@ var MmtpRouter = class {
     const cb = this.#trackInitCallbacks.get(packetId);
     if (cb) {
       cb(data);
-    } else if (this.#onInitSegment) {
-      this.#onInitSegment(data);
+    } else {
+      this.#unmappedInitDeliveries++;
+      this.#onInitSegment?.(data);
     }
     console.log(
       `[MmtpRouter] Init delivered for packetId=${packetId}${catalogTrackName === void 0 ? "" : ` track=${catalogTrackName}`} (${data.byteLength}B)`
@@ -9993,9 +10004,9 @@ var MmtpRouter = class {
     if (!info.isRepair && this.#manifestVerifier && !manifestAdmitted) {
       let identity = manifestIdentity;
       if (!identity && info.fecPayloadId && !fecUnreadable && (this.#resolveManifestIdentityForRoute || this.#resolveManifestIdentity)) {
-        const coordinates = this.#deriveSbnEsi(info.fecPayloadId.ssId, info.packetId);
         const catalogTrackName = catalogTrackNameForPacket(ingress, info.packetId);
-        identity = (this.#resolveManifestIdentityForRoute ? this.#resolveManifestIdentityForRoute({
+        const coordinates = this.#locateFecSource(info.packetId, catalogTrackName, info.fecPayloadId.ssId);
+        identity = coordinates === null ? void 0 : (this.#resolveManifestIdentityForRoute ? this.#resolveManifestIdentityForRoute({
           packetId: info.packetId,
           sbn: coordinates.sbn,
           esi: coordinates.esi,
@@ -10047,79 +10058,7 @@ var MmtpRouter = class {
           this.#noteUnreadableFecPayloadId(ownerPacketId, "repair");
           return;
         }
-        if (this.#isIsoPacket(ownerPacketId)) {
-          this.#handleIsoRepair(ownerPacketId, catalogTrackNameForPacket(ingress, ownerPacketId), repair, source);
-          return;
-        }
-        const repairSbn = this.#deriveRepairSbn(repair.ssStart, repair.ssbLength, ownerPacketId);
-        if (repairSbn === null) return;
-        const repairEsi = this.#kForPacket(ownerPacketId) + repair.rsId;
-        if (!this.#feedFecTransportSymbol(
-          ownerPacketId,
-          repairSbn,
-          repairEsi,
-          repair.symbolData,
-          source,
-          catalogTrackNameForPacket(ingress, ownerPacketId)
-        )) return;
-        const repairCatalogTrackName = catalogTrackNameForPacket(ingress, ownerPacketId);
-        if (repairCatalogTrackName === void 0) {
-          this.#fecManager.noteBlockActivity?.(repairSbn, ownerPacketId);
-        } else {
-          this.#fecManager.noteBlockActivity?.(
-            repairSbn,
-            ownerPacketId,
-            repairCatalogTrackName
-          );
-        }
-        const recovered = repairCatalogTrackName === void 0 ? this.#fecManager.feedRepairSymbol(
-          ownerPacketId,
-          repair.ssStart,
-          repair.ssbLength,
-          repair.rsId,
-          repair.symbolData
-        ) : this.#fecManager.feedRepairSymbol(
-          ownerPacketId,
-          repair.ssStart,
-          repair.ssbLength,
-          repair.rsId,
-          repair.symbolData,
-          repairCatalogTrackName
-        );
-        if (recovered) {
-          const alreadyCompleted = repairCatalogTrackName === void 0 ? this.#fecManager.isBlockCompleted(repairSbn, ownerPacketId) : this.#fecManager.isBlockCompleted(
-            repairSbn,
-            ownerPacketId,
-            repairCatalogTrackName
-          );
-          if (repairCatalogTrackName === void 0) {
-            this.#fecManager.cancelBlockTimeout(repairSbn, ownerPacketId);
-          } else {
-            this.#fecManager.cancelBlockTimeout(
-              repairSbn,
-              ownerPacketId,
-              repairCatalogTrackName
-            );
-          }
-          if (!alreadyCompleted) {
-            this.#fecManager.countRecovery(ownerPacketId, repairSbn, repairCatalogTrackName);
-            if (repairCatalogTrackName === void 0) {
-              this.#fecManager.markBlockCompleted(repairSbn, ownerPacketId);
-            } else {
-              this.#fecManager.markBlockCompleted(
-                repairSbn,
-                ownerPacketId,
-                repairCatalogTrackName
-              );
-            }
-            this.#routeRecoveredBlock(
-              repairSbn,
-              recovered,
-              ownerPacketId,
-              catalogTrackNameForPacket(ingress, ownerPacketId)
-            );
-          }
-        }
+        this.#handleIsoRepair(ownerPacketId, catalogTrackNameForPacket(ingress, ownerPacketId), repair, source);
       }
     } else {
       if (this.#classifyPacketId(info.packetId) === null) return;
@@ -10143,8 +10082,8 @@ var MmtpRouter = class {
       }
       const duplicates = this.#stream(info.packetId, catalogTrackName).duplicates;
       const fecPayloadId = fecUnreadable ? null : info.fecPayloadId;
-      const isoSource = this.#fecManager !== null && fecPayloadId != null && this.#isIsoPacket(info.packetId);
-      const coords = this.#fecManager && fecPayloadId ? isoSource ? this.#fecManager.locateIsoSource?.(info.packetId, catalogTrackName, fecPayloadId.ssId) ?? void 0 : this.#deriveSbnEsi(fecPayloadId.ssId, info.packetId) : void 0;
+      const fecSource = this.#fecManager !== null && fecPayloadId != null;
+      const coords = fecSource && fecPayloadId ? this.#locateFecSource(info.packetId, catalogTrackName, fecPayloadId.ssId) ?? void 0 : void 0;
       duplicates.advance(coords?.sbn);
       if (source === "multicast" && !overlapCopy && !releasedFromQuarantine && catalogTrackName !== void 0 && duplicates.predatesHorizon(info.sequenceNumber, fecPayloadId?.ssId)) {
         this.#publisherRestarts++;
@@ -10159,9 +10098,8 @@ var MmtpRouter = class {
       }
       if (this.#fecManager && fecPayloadId && coords) {
         const fecId = fecPayloadId;
-        const symbolSize = this.#symbolSizeForPacket(info.packetId);
         const rawSymbol = packet.subarray(0, packet.length - 4);
-        const oversized = isoSource ? !(this.#fecManager.isoSourceFits?.(info.packetId, rawSymbol.length) ?? false) : symbolSize > 0 && rawSymbol.length > symbolSize;
+        const oversized = !(this.#fecManager.isoSourceFits?.(info.packetId, rawSymbol.length) ?? false);
         let overlapBlockCompleted = false;
         if (overlapCopy) {
           overlapBlockCompleted = catalogTrackName === void 0 ? this.#fecManager.isBlockCompleted(coords.sbn, info.packetId) : this.#fecManager.isBlockCompleted(
@@ -10196,7 +10134,7 @@ var MmtpRouter = class {
         }
         parseSourceSymbol = (overlapCopy ? !overlapBlockCompleted : sourceSymbolAccepted) && !duplicates.parsedSymbols.has(fecId.ssId);
         fecInfo = { sbn: coords.sbn, esi: coords.esi, oversized };
-      } else if (isoSource && this.#fecManager && fecPayloadId) {
+      } else if (fecSource && this.#fecManager && fecPayloadId) {
         const ssId = fecPayloadId.ssId;
         if (overlapCopy) {
           parseSourceSymbol = !duplicates.parsedSymbols.has(ssId);
@@ -10230,12 +10168,13 @@ var MmtpRouter = class {
         this.#feedViaParser(packet, info, fecInfo, {
           source,
           catalogTrackName,
-          ...isoSource && info.fecPayloadId ? { fecSbn: info.fecPayloadId.ssId } : fecInfo === void 0 ? {} : { fecSbn: fecInfo.sbn }
+          // An FEC source frame is anchored by its own SS_ID (C.5.2).
+          ...fecSource && fecPayloadId ? { fecSbn: fecPayloadId.ssId } : {}
         }, parsed);
       }
       if (this.#classifyPacketId(info.packetId) === null) return;
-      if (this.#fecManager && fecPayloadId && sourceSymbolAccepted && sourceSymbolTrackable) {
-        const { sbn, esi } = isoSource && coords ? coords : this.#deriveSbnEsi(fecPayloadId.ssId, info.packetId);
+      if (this.#fecManager && fecPayloadId && coords && sourceSymbolAccepted && sourceSymbolTrackable) {
+        const { sbn, esi } = coords;
         if (this.#classifyPacketId(info.packetId) !== null && this.#fecManager.isTrackConfigured?.(info.packetId) !== false) {
           this.#fecManager.trackBlock(
             sbn,
@@ -10256,13 +10195,11 @@ var MmtpRouter = class {
         const recovered = catalogTrackName === void 0 ? this.#fecManager.feedSourceSymbol(
           info.packetId,
           sourceFec.ssId,
-          sourceFec.symbolData,
-          void 0
+          sourceFec.symbolData
         ) : this.#fecManager.feedSourceSymbol(
           info.packetId,
           sourceFec.ssId,
           sourceFec.symbolData,
-          void 0,
           catalogTrackName
         );
         if (recovered) {
@@ -10669,7 +10606,6 @@ var MmtpRouter = class {
   // ── Private: FEC recovery routing ───────────────────────────────
   /** Route WASM-recovered block through appropriate path based on container kind. */
   #routeRecoveredBlock(blockId, recovered, ownerPacketId, catalogTrackName) {
-    const k = this.#kForPacket(ownerPacketId);
     const packetSymbolSize = this.#symbolSizeForPacket(ownerPacketId);
     if (ownerPacketId === void 0) {
       throw new Error("[MmtpRouter] a recovered FEC block needs its owner packetId to read its fec.blockProfile");
@@ -10682,7 +10618,6 @@ var MmtpRouter = class {
     }
     const symbolSize = packetSymbolSize;
     const result = processFecBlock(recovered, {
-      ...blockProfile === "k-padded-v1" ? { k } : {},
       symbolSize,
       ownerPacketId,
       blockProfile
@@ -10762,8 +10697,7 @@ var MmtpRouter = class {
       const admission = verifier.admitObject(
         {
           ...identity,
-          packetId: ownerPacketId,
-          ...ownerPacketId !== void 0 && this.#isIsoPacket(ownerPacketId) ? {} : { ssId: blockId * this.#kForPacket(ownerPacketId) + symbol.index }
+          packetId: ownerPacketId
         },
         symbol.rawSymbol,
         () => {
@@ -10866,7 +10800,7 @@ var MmtpRouter = class {
               rapFlag: sym.fragment.rapFlag,
               recovered: true,
               deliveryProvenance,
-              fecSbn: this.#fecAnchorForRecovered(ownerPacketId, blockId, sym.index),
+              fecSbn: this.#fecAnchorForRecovered(blockId, sym.index),
               ...catalogTrackName === void 0 ? {} : { catalogTrackName }
             });
             continue;
@@ -10978,7 +10912,7 @@ var MmtpRouter = class {
                 rapFlag: assembled.rapFlag,
                 recovered: true,
                 ...assembled.deliveryProvenance === void 0 ? {} : { deliveryProvenance: assembled.deliveryProvenance },
-                fecSbn: this.#fecAnchorForRecovered(ownerPacketId, blockId, sym.index),
+                fecSbn: this.#fecAnchorForRecovered(blockId, sym.index),
                 ...recoveredCatalogTrackName === void 0 ? {} : { catalogTrackName: recoveredCatalogTrackName }
               });
               continue;
@@ -11115,7 +11049,7 @@ var MmtpRouter = class {
             rapFlag: sym.fragment.rapFlag,
             recovered: true,
             deliveryProvenance,
-            fecSbn: this.#fecAnchorForRecovered(ownerPacketId, blockId, sym.index),
+            fecSbn: this.#fecAnchorForRecovered(blockId, sym.index),
             ...catalogTrackName === void 0 ? {} : { catalogTrackName }
           });
         } else {
@@ -11194,7 +11128,7 @@ var MmtpRouter = class {
               rapFlag: assembled.rapFlag,
               recovered: true,
               deliveryProvenance,
-              fecSbn: this.#fecAnchorForRecovered(ownerPacketId, blockId, sym.index),
+              fecSbn: this.#fecAnchorForRecovered(blockId, sym.index),
               ...assembled.catalogTrackName === void 0 ? {} : { catalogTrackName: assembled.catalogTrackName }
             });
           }
@@ -11229,7 +11163,7 @@ var MmtpRouter = class {
             ...sym.fragment.sampleNumber === void 0 ? {} : { sampleNumber: sym.fragment.sampleNumber },
             recovered: true,
             deliveryProvenance,
-            fecSbn: this.#fecAnchorForRecovered(ownerPacketId, blockId, sym.index),
+            fecSbn: this.#fecAnchorForRecovered(blockId, sym.index),
             ...catalogTrackName === void 0 ? {} : { catalogTrackName }
           });
           continue;