@blockcast/mmt-container 0.1.0-main.cde7600fad6a → 0.1.0-main.ce3c8aeb7f68

package/dist/browser-runtime.js

@@ -63,6 +63,11 @@ var init_fec_worker_client = __esm({
       #flushQueued = false;
       // Batching starts only once the Worker announced it accepts feedSymbols.
       #batchSymbols = false;
+      // The Worker posts blockUpdate events only to a client that subscribed,
+      // which this client does once a callback is registered and the Worker
+      // announced the command (BLO-36599).
+      #blockUpdatesAnnounced = false;
+      #blockUpdatesSubscribed = false;
       /**
        * Create a FecWorkerClient.
        * @param workerOrUrl - Either a Worker instance (for testing) or a URL to create one
@@ -225,9 +230,21 @@ var init_fec_worker_client = __esm({
       onSnapshot(cb) {
         this.#onSnapshot = cb;
       }
-      /** Register callback for individual block state changes. */
+      /**
+       * Register callback for individual block state changes. The Worker posts
+       * them only once asked, so registering subscribes (after the Worker
+       * announces `subscribeBlockUpdates`). An older Worker that does not
+       * announce it posts them unasked.
+       */
       onBlockUpdate(cb) {
         this.#onBlockUpdate = cb;
+        this.#subscribeBlockUpdates();
+      }
+      #subscribeBlockUpdates() {
+        if (this.#disposed || this.#blockUpdatesSubscribed || !this.#blockUpdatesAnnounced || !this.#onBlockUpdate)
+          return;
+        this.#blockUpdatesSubscribed = true;
+        this.#worker.postMessage({ type: "subscribeBlockUpdates" });
       }
       /** Register callback for green-fill frames. */
       onGreenFill(cb) {
@@ -270,6 +287,10 @@ var init_fec_worker_client = __esm({
           if (Array.isArray(event.commands) && event.commands.includes("feedSymbols")) {
             this.#batchSymbols = true;
           }
+          if (Array.isArray(event.commands) && event.commands.includes("subscribeBlockUpdates")) {
+            this.#blockUpdatesAnnounced = true;
+            this.#subscribeBlockUpdates();
+          }
           return;
         }
         if (event.type === "resetComplete") {
@@ -616,6 +637,27 @@ function parseMMTPHeader(buffer) {
     rapFlag
   };
 }
+function readMMTPPacketId(buffer) {
+  if (buffer.length < MMTP_HEADER_SIZE2)
+    return null;
+  const flags = buffer[0];
+  if ((flags >> 6 & 3) !== 0)
+    return null;
+  let offset = MMTP_HEADER_SIZE2;
+  if ((flags & 32) !== 0) {
+    if (offset + 4 > buffer.length)
+      return null;
+    offset += 4;
+  }
+  if ((flags & 2) !== 0) {
+    if (offset + 4 > buffer.length)
+      return null;
+    const length = buffer[offset + 2] << 8 | buffer[offset + 3];
+    if (offset + 4 + length > buffer.length)
+      return null;
+  }
+  return buffer[2] << 8 | buffer[3];
+}
 function unwrapMMTP(buffer) {
   const header = parseMMTPHeader(buffer);
   const payload = buffer.subarray(header.headerLength);
@@ -729,7 +771,7 @@ function extractNALUnit(mmtpPacket) {
     throw new Error("Malformed MMTP MPU payload");
   return extraction.data;
 }
-function planMfuExtraction(mmtpPacket, options) {
+function planMfuExtraction(mmtpPacket, options, parsedHeader) {
   if (mmtpPacket.length < MMTP_HEADER_SIZE2 + MPU_HEADER_SIZE2) {
     return {
       rejection: {
@@ -739,15 +781,19 @@ function planMfuExtraction(mmtpPacket, options) {
     };
   }
   let header;
-  try {
-    header = parseMMTPHeader(mmtpPacket);
-  } catch (error) {
-    return {
-      rejection: {
-        gate: "mmtp-header-unparseable",
-        detail: error instanceof Error ? error.message : String(error)
-      }
-    };
+  if (parsedHeader) {
+    header = parsedHeader;
+  } else {
+    try {
+      header = parseMMTPHeader(mmtpPacket);
+    } catch (error) {
+      return {
+        rejection: {
+          gate: "mmtp-header-unparseable",
+          detail: error instanceof Error ? error.message : String(error)
+        }
+      };
+    }
   }
   if (header.packetType !== PACKET_TYPE_MPU2) {
     return {
@@ -800,7 +846,12 @@ function planMfuExtraction(mmtpPacket, options) {
   return { plan: { header, payload, mpu, fragmentType, layout, trailerLayout } };
 }
 function extractMFUPayload(mmtpPacket, options) {
-  const result = planMfuExtraction(mmtpPacket, options);
+  return extractPlannedMfu(mmtpPacket, planMfuExtraction(mmtpPacket, options));
+}
+function extractMFUPayloadWithHeader(mmtpPacket, header, options) {
+  return extractPlannedMfu(mmtpPacket, planMfuExtraction(mmtpPacket, options, header));
+}
+function extractPlannedMfu(mmtpPacket, result) {
   if ("rejection" in result)
     return null;
   const { header, payload, mpu, fragmentType, layout, trailerLayout } = result.plan;
@@ -825,51 +876,59 @@ function isFecRepairPacket(mmtpPacket) {
   const fecType = mmtpPacket[0] >> 3 & 3;
   return fecType >= 2;
 }
-function extractFecPayloadId(mmtpPacket) {
-  if (!hasSourceFecPayloadId(mmtpPacket))
-    return null;
-  const off = mmtpPacket.length - SOURCE_FEC_PAYLOAD_ID_SIZE;
-  const view2 = new DataView(mmtpPacket.buffer, mmtpPacket.byteOffset + off, SOURCE_FEC_PAYLOAD_ID_SIZE);
-  return { ssId: view2.getUint32(0, false) };
-}
 function hasSourceFecPayloadId(mmtpPacket) {
+  const header = parseHeaderForSourceFecId(mmtpPacket);
+  return header !== null && sourceFecPayloadIdOf(mmtpPacket, header) !== null;
+}
+function parseHeaderForSourceFecId(mmtpPacket) {
   if (mmtpPacket.length < MMTP_HEADER_SIZE2 + MPU_HEADER_SIZE2)
-    return false;
-  let header;
+    return null;
   try {
-    header = parseMMTPHeader(mmtpPacket);
+    return parseMMTPHeader(mmtpPacket);
   } catch {
-    return false;
+    return null;
   }
+}
+function sourceFecPayloadIdOf(mmtpPacket, header) {
+  if (mmtpPacket.length < MMTP_HEADER_SIZE2 + MPU_HEADER_SIZE2)
+    return null;
   if (header.packetType !== PACKET_TYPE_MPU2)
-    return false;
+    return null;
   const payload = mmtpPacket.subarray(header.headerLength);
   if (payload.length < MPU_HEADER_SIZE2)
-    return false;
-  const mpu = parseMPUHeader(payload);
-  if (mpu.payloadLength < MPU_HEADER_REMAINDER_SIZE2)
-    return false;
-  const declaredEnd = MPU_LENGTH_FIELD_SIZE2 + mpu.payloadLength;
-  return resolveDeclaredTrailers(payload, declaredEnd, header.fecType)?.hasFecId ?? false;
+    return null;
+  const payloadLength = payload[0] << 8 | payload[1];
+  if (payloadLength < MPU_HEADER_REMAINDER_SIZE2)
+    return null;
+  const declaredEnd = MPU_LENGTH_FIELD_SIZE2 + payloadLength;
+  if (!resolveDeclaredTrailers(payload, declaredEnd, header.fecType)?.hasFecId)
+    return null;
+  const off = mmtpPacket.length - SOURCE_FEC_PAYLOAD_ID_SIZE;
+  return {
+    ssId: (mmtpPacket[off] << 24 | mmtpPacket[off + 1] << 16 | mmtpPacket[off + 2] << 8 | mmtpPacket[off + 3]) >>> 0
+  };
 }
 var MMTP_EXT_TYPE_ALTA_AUTH2 = MMTP_EXT_TYPE_ALTA_AUTH;
 var MMTP_EXT_TRAILER_HEADER_SIZE2 = MMTP_EXT_TRAILER_HEADER_SIZE;
 var extractAltaTrailer2 = extractAltaTrailer;
 var REPAIR_FEC_PID_SIZE = 13;
-function readRepairFecPayloadIdFields(mmtpPacket) {
+function readRepairFecPayloadIdFields(mmtpPacket, parsedHeader) {
   let header;
-  try {
-    header = parseMMTPHeader(mmtpPacket);
-  } catch {
-    return null;
+  if (parsedHeader) {
+    header = parsedHeader;
+  } else {
+    try {
+      header = parseMMTPHeader(mmtpPacket);
+    } catch {
+      return null;
+    }
   }
   if (header.packetType !== PACKET_TYPE_REPAIR || header.fecType !== 2)
     return null;
   const off = header.headerLength;
   if (mmtpPacket.length < off + REPAIR_FEC_PID_SIZE)
     return null;
-  const view2 = new DataView(mmtpPacket.buffer, mmtpPacket.byteOffset + off, REPAIR_FEC_PID_SIZE);
-  const ssStart = view2.getUint32(0, false);
+  const ssStart = (mmtpPacket[off] << 24 | mmtpPacket[off + 1] << 16 | mmtpPacket[off + 2] << 8 | mmtpPacket[off + 3]) >>> 0;
   const rsbLength = mmtpPacket[off + 4] << 16 | mmtpPacket[off + 5] << 8 | mmtpPacket[off + 6];
   const rsId = mmtpPacket[off + 7] << 16 | mmtpPacket[off + 8] << 8 | mmtpPacket[off + 9];
   const ssbLength = mmtpPacket[off + 10] << 16 | mmtpPacket[off + 11] << 8 | mmtpPacket[off + 12];
@@ -883,7 +942,12 @@ function readRepairFecPayloadIdFields(mmtpPacket) {
   };
 }
 function parseMoqRepairFrame(frame) {
-  const repairId = readRepairFecPayloadIdFields(frame);
+  return moqRepairFrameFrom(frame, readRepairFecPayloadIdFields(frame));
+}
+function parseMoqRepairFrameWithHeader(frame, header) {
+  return moqRepairFrameFrom(frame, readRepairFecPayloadIdFields(frame, header));
+}
+function moqRepairFrameFrom(frame, repairId) {
   if (!repairId)
     return null;
   const symbolData = frame.subarray(repairId.dataOffset);
@@ -8980,17 +9044,6 @@ function fecBlockBudgetMs(interleaveDepthMs, reorderToleranceMs) {
   }
   return Math.ceil(interleaveDepthMs + reorderToleranceMs);
 }
-function parseRepairPacket(packet) {
-  const parsed = parseMoqRepairFrame(packet);
-  if (!parsed)
-    return null;
-  return {
-    ssStart: parsed.ssStart,
-    ssbLength: parsed.ssbLength,
-    rsId: parsed.rsId,
-    repairData: parsed.symbolData
-  };
-}
 
 // ../fec/dist/fec-block-mapper.js
 var FecBlockMapper = class {
@@ -9836,6 +9889,17 @@ var FECManager = class {
     // Stable per-name encodings for stream and block keys, bounded by the
     // catalog's track names; #blockKey is built several times per packet.
     this.#encodedTrackNames = /* @__PURE__ */ new Map();
+    // The last block and stream key built. One packet asks for the same block's
+    // key from every FECManager entry point it passes through (~6 per source
+    // symbol), so each key is built once per packet rather than once per call
+    // (BLO-36599). Both keys are pure functions of their arguments.
+    this.#lastBlockKeySbn = -1;
+    this.#lastBlockKeyPacketId = -1;
+    this.#lastBlockKeyTrackName = void 0;
+    this.#lastBlockKey = "";
+    this.#lastStreamKeyPacketId = -1;
+    this.#lastStreamKeyTrackName = void 0;
+    this.#lastStreamKey = "";
     this.#seenSymbols = /* @__PURE__ */ new Set();
     this.#blockPathCounts = /* @__PURE__ */ new Map();
     // Exact catalog identity observed on accepted symbols for each FEC block.
@@ -9961,6 +10025,13 @@ var FECManager = class {
   #terminalQueues;
   #blockKeysBySbn;
   #encodedTrackNames;
+  #lastBlockKeySbn;
+  #lastBlockKeyPacketId;
+  #lastBlockKeyTrackName;
+  #lastBlockKey;
+  #lastStreamKeyPacketId;
+  #lastStreamKeyTrackName;
+  #lastStreamKey;
   #seenSymbols;
   #blockPathCounts;
   #blockCatalogTrackNames;
@@ -9990,7 +10061,14 @@ var FECManager = class {
     return encoded;
   }
   #streamKey(packetId, catalogTrackName) {
-    return catalogTrackName === void 0 ? `${packetId}` : `${packetId}:${this.#encodeTrackName(catalogTrackName)}`;
+    if (packetId === this.#lastStreamKeyPacketId && catalogTrackName === this.#lastStreamKeyTrackName) {
+      return this.#lastStreamKey;
+    }
+    const key = catalogTrackName === void 0 ? `${packetId}` : `${packetId}:${this.#encodeTrackName(catalogTrackName)}`;
+    this.#lastStreamKeyPacketId = packetId;
+    this.#lastStreamKeyTrackName = catalogTrackName;
+    this.#lastStreamKey = key;
+    return key;
   }
   #belongsToPacket(key, packetId) {
     return Number(key.split(":", 1)[0]) === packetId;
@@ -10015,8 +10093,16 @@ var FECManager = class {
     };
   }
   #blockKey(sbn, packetId, catalogTrackName) {
+    if (sbn === this.#lastBlockKeySbn && packetId === this.#lastBlockKeyPacketId && catalogTrackName === this.#lastBlockKeyTrackName) {
+      return this.#lastBlockKey;
+    }
     const base = `${packetId}:${sbn}`;
-    return catalogTrackName === void 0 ? base : `${base}:${this.#encodeTrackName(catalogTrackName)}`;
+    const key = catalogTrackName === void 0 ? base : `${base}:${this.#encodeTrackName(catalogTrackName)}`;
+    this.#lastBlockKeySbn = sbn;
+    this.#lastBlockKeyPacketId = packetId;
+    this.#lastBlockKeyTrackName = catalogTrackName;
+    this.#lastBlockKey = key;
+    return key;
   }
   /** Record that `key` (block `sbn` on `packetId`) is held by a lookup set. */
   #indexBlockKey(key, sbn, packetId) {
@@ -12646,20 +12732,35 @@ var MmtpContainerParser = class _MmtpContainerParser {
    * Returns null for malformed packets.
    */
   parseHeader(packet, options) {
+    return this.parsePacket(packet, options)?.info ?? null;
+  }
+  /**
+   * parseHeader() that also keeps the parsed MMTP header, so a caller that
+   * goes on to feedParsed() the same packet parses its header exactly once.
+   * The MMTP header is parsed once here and the Source FEC Payload ID is read
+   * from it; parseHeader() used to parse the header three times for an FEC
+   * source packet, and feed() repeated all of it (BLO-36599).
+   */
+  parsePacket(packet, options) {
     try {
       const header = parseMMTPHeader(packet);
       const isRepair = header.packetType === PACKET_TYPE_REPAIR;
-      const fecPayloadId = !options?.skipFecPayloadId && !isRepair && hasSourceFecPayloadId(packet) ? extractFecPayloadId(packet) : null;
+      const skipFecPayloadId = options?.skipFecPayloadId === true;
+      const fecPayloadId = !skipFecPayloadId && !isRepair ? sourceFecPayloadIdOf(packet, header) : null;
       return {
-        packetId: header.packetId,
-        packetType: header.packetType,
-        timestamp: header.timestamp,
-        timestampUs: mmtpTimestampToMicros(header.timestamp),
-        sequenceNumber: header.sequenceNumber,
-        rapFlag: header.rapFlag,
-        fecType: header.fecType,
-        fecPayloadId,
-        isRepair
+        info: {
+          packetId: header.packetId,
+          packetType: header.packetType,
+          timestamp: header.timestamp,
+          timestampUs: mmtpTimestampToMicros(header.timestamp),
+          sequenceNumber: header.sequenceNumber,
+          rapFlag: header.rapFlag,
+          fecType: header.fecType,
+          fecPayloadId,
+          isRepair
+        },
+        header,
+        skipFecPayloadId
       };
     } catch {
       return null;
@@ -12667,10 +12768,22 @@ var MmtpContainerParser = class _MmtpContainerParser {
   }
   /** Feed a complete MMTP packet. For two-phase use, call parseHeader() first. */
   feed(packet, options) {
+    return this.#feedCounted(packet, options, void 0);
+  }
+  /**
+   * feed() for a packet this caller already ran through parsePacket(): the
+   * header parse is reused instead of repeated. `parsed` must come from
+   * parsePacket() of this same, unmodified packet. If it was resolved under a
+   * different skipFecPayloadId option, the packet is parsed again.
+   */
+  feedParsed(packet, parsed, options) {
+    return this.#feedCounted(packet, options, parsed);
+  }
+  #feedCounted(packet, options, parsed) {
     this.#fedObjects += 1;
     let record;
     try {
-      record = this.#feed(packet, options);
+      record = this.#feed(packet, options, parsed);
     } catch (error) {
       this.#countOutcome("drop:threw");
       throw error;
@@ -12678,11 +12791,12 @@ var MmtpContainerParser = class _MmtpContainerParser {
     if (record) this.#countOutcome(record.kind);
     return record;
   }
-  #feed(packet, options) {
+  #feed(packet, options, preParsed) {
     if (this.#disposed) return this.#drop("disposed");
     this.cleanupTimeouts();
-    const info = this.parseHeader(packet, options);
-    if (!info) return this.#drop("header-parse-failed");
+    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) {
       return {
         kind: info.isRepair ? "repair" : "non-media",
@@ -12699,7 +12813,7 @@ var MmtpContainerParser = class _MmtpContainerParser {
       } catch {
       }
     }
-    const extraction = extractMFUPayload(packet, {
+    const extraction = extractMFUPayloadWithHeader(packet, parsed.header, {
       skipFecId: options?.skipFecPayloadId
     });
     if (!extraction) return this.#drop("mfu-extract-failed");
@@ -13393,6 +13507,17 @@ function ingressHasPacketId(ingress, packetId) {
   if (packetId === MMTP_SIGNALING_PACKET_ID) return false;
   return ingress === void 0 || ingressEntry(ingress, packetId) !== void 0;
 }
+var PACKET_LEDGER_HIGH_WATER = 4e3;
+var PACKET_LEDGER_RETAINED = 2e3;
+function rememberInLedger(ledger, value) {
+  ledger.add(value);
+  if (ledger.size <= PACKET_LEDGER_HIGH_WATER) return;
+  let excess = ledger.size - PACKET_LEDGER_RETAINED;
+  for (const oldest of ledger) {
+    if (excess-- <= 0) break;
+    ledger.delete(oldest);
+  }
+}
 var DIRECT_RECOVERED_VIDEO_QUEUE_LIMIT = 512;
 var DIRECT_RECOVERED_AUDIO_QUEUE_LIMIT = 512;
 var MmtpRouter = class {
@@ -13430,16 +13555,13 @@ var MmtpRouter = class {
   // identity keeps renditions that reuse a packet ID from opening each other's gate.
   #trackSynced = /* @__PURE__ */ new Set();
   #droppedPreSyncVideo = /* @__PURE__ */ new Set();
-  // Dedup: packetId-scoped packetSequenceNumbers already received via direct source path.
-  // Recovered FEC blocks contain all K source symbols, so skip direct-path
-  // duplicates even when the source frame is still buffered by parser reordering.
-  #mediaStreamKeys = /* @__PURE__ */ new Map();
-  #sourcePktSeqs = /* @__PURE__ */ new Set();
-  #routedPacketSeqs = /* @__PURE__ */ new Set();
-  // FEC source symbols (packetId/track/SBN/ESI) already parsed for playback.
-  // An overlap copy and its multicast twin carry the same symbol, and the copy
-  // never feeds FEC, so FEC's first-arrival check cannot dedup the pair.
-  #parsedSourceSymbols = /* @__PURE__ */ new Set();
+  // One entry per physical stream (packetId, catalog track name): its stable
+  // JSON key and its per-packet duplicate ledgers. The ledgers used to be
+  // three router-wide Sets of "<streamKey>:<coordinates>" strings, so every
+  // packet built and hashed up to three strings, and resetTrack() scanned
+  // every retained key by prefix (BLO-36599). They now hold the wire numbers
+  // themselves, and a reset clears one stream's Sets.
+  #streams = /* @__PURE__ */ new Map();
   // Live WebCodecs callbacks cannot accept late recovered inter-frame video.
   // MSE recovery routes through CmafBlockAssembler and can reorder by block; the
   // direct callback path has to preserve decode order before frames leave libmmt.
@@ -13970,11 +14092,15 @@ var MmtpRouter = class {
    */
   feedRepairPacket(packet, ownerPacketIdHint, catalogTrackName) {
     if (this.#disposed) return;
-    const parsed = parseRepairPacket(packet);
+    let header;
+    try {
+      header = parseMMTPHeader(packet);
+    } catch {
+      return;
+    }
+    const parsed = parseMoqRepairFrameWithHeader(packet, header);
     if (!parsed) return;
-    const header = packet.length >= 4 ? parseMMTPHeader(packet) : null;
-    const repairPacketId = header?.packetId;
-    if (repairPacketId == null) return;
+    const repairPacketId = header.packetId;
     const hintedOwner = ownerPacketIdHint != null && this.#classifyPacketId(ownerPacketIdHint) !== null ? ownerPacketIdHint : null;
     const ownerPacketId = hintedOwner ?? (this.#classifyPacketId(repairPacketId) !== null ? repairPacketId : null);
     if (ownerPacketId === null) {
@@ -13999,7 +14125,7 @@ var MmtpRouter = class {
         ownerPacketId,
         repairSbn,
         repairEsi,
-        parsed.repairData,
+        parsed.symbolData,
         "moq",
         catalogTrackName
       )) return;
@@ -14008,13 +14134,13 @@ var MmtpRouter = class {
         parsed.ssStart,
         parsed.ssbLength,
         parsed.rsId,
-        parsed.repairData
+        parsed.symbolData
       ) : this.#fecManager.feedRepairSymbol(
         ownerPacketId,
         parsed.ssStart,
         parsed.ssbLength,
         parsed.rsId,
-        parsed.repairData,
+        parsed.symbolData,
         catalogTrackName
       );
       if (recovered) {
@@ -14121,16 +14247,10 @@ var MmtpRouter = class {
     this.#lastDirectEmittedAudioCursorByStream.delete(streamKey);
     this.#pendingDirectRecoveredAudioByStream.delete(streamKey);
     this.#manifestRecoveryQueues.delete(streamKey);
-    const streamPrefix = `${streamKey}:`;
-    for (const packetSeqs of [
-      this.#sourcePktSeqs,
-      this.#routedPacketSeqs,
-      this.#parsedSourceSymbols
-    ]) {
-      for (const key of packetSeqs) {
-        if (key.startsWith(streamPrefix)) packetSeqs.delete(key);
-      }
-    }
+    const ledgers = this.#stream(packetId, catalogTrackName);
+    ledgers.sourceSeqs.clear();
+    ledgers.routedSeqs.clear();
+    ledgers.parsedSymbols.clear();
     const assemblersToReset = /* @__PURE__ */ new Set();
     const exactAssembler = this.#mseAssemblers.get(streamKey);
     if (exactAssembler) assemblersToReset.add(exactAssembler);
@@ -14146,9 +14266,7 @@ var MmtpRouter = class {
     this.#disposed = true;
     this.cancelKeyframeLostTimer();
     this.#parser.dispose();
-    this.#sourcePktSeqs.clear();
-    this.#routedPacketSeqs.clear();
-    this.#parsedSourceSymbols.clear();
+    this.#streams.clear();
     this.#trackPacketCallbacks.clear();
     this.#latestVideoSeqByStream.clear();
     this.#lastDirectSourceVideoTsByStream.clear();
@@ -14248,8 +14366,9 @@ var MmtpRouter = class {
    *   2. feed() → MFU extraction, reassembly, keyframe detection, emit via callbacks
    */
   #processMMTP(packet, source, manifestIdentity, manifestAdmitted = false, ingress, overlapCopy = false) {
-    const info = this.#parser.parseHeader(packet);
-    if (!info) return;
+    const parsed = this.#parser.parsePacket(packet);
+    if (!parsed) return;
+    const info = parsed.info;
     if (source === "multicast" && !ingressHasPacketId(ingress, info.packetId)) {
       debugRouter(
         `[MmtpRouter] Dropping multicast packet pid=${info.packetId}: absent from ingress tracks`
@@ -14303,8 +14422,8 @@ var MmtpRouter = class {
       }
     }
     if (info.isRepair) {
-      const parsed = parseRepairPacket(packet);
-      if (!parsed) return;
+      const repair = parseMoqRepairFrameWithHeader(packet, parsed.header);
+      if (!repair) return;
       const ownerPacketId = this.#resolveRepairOwnerPacketId(info.packetId, ingress);
       if (ownerPacketId != null && this.#fecManager) {
         if (hasAmbiguousCatalogTrackName(ingress, ownerPacketId)) return;
@@ -14312,17 +14431,17 @@ var MmtpRouter = class {
         const count = this.#repairPidCounts[info.packetId];
         if (count <= 2 || count % 500 === 0) {
           console.log(
-            `[MC-PKT] pid=${info.packetId} repairOwner=${ownerPacketId} type=${info.packetType} count=${count} ssbLength=${parsed.ssbLength} len=${packet.length}`
+            `[MC-PKT] pid=${info.packetId} repairOwner=${ownerPacketId} type=${info.packetType} count=${count} ssbLength=${repair.ssbLength} len=${packet.length}`
           );
         }
-        const repairSbn = this.#deriveRepairSbn(parsed.ssStart, parsed.ssbLength, ownerPacketId);
+        const repairSbn = this.#deriveRepairSbn(repair.ssStart, repair.ssbLength, ownerPacketId);
         if (repairSbn === null) return;
-        const repairEsi = this.#kForPacket(ownerPacketId) + parsed.rsId;
+        const repairEsi = this.#kForPacket(ownerPacketId) + repair.rsId;
         if (!this.#feedFecTransportSymbol(
           ownerPacketId,
           repairSbn,
           repairEsi,
-          parsed.repairData,
+          repair.symbolData,
           source,
           catalogTrackNameForPacket(ingress, ownerPacketId)
         )) return;
@@ -14338,16 +14457,16 @@ var MmtpRouter = class {
         }
         const recovered = repairCatalogTrackName === void 0 ? this.#fecManager.feedRepairSymbol(
           ownerPacketId,
-          parsed.ssStart,
-          parsed.ssbLength,
-          parsed.rsId,
-          parsed.repairData
+          repair.ssStart,
+          repair.ssbLength,
+          repair.rsId,
+          repair.symbolData
         ) : this.#fecManager.feedRepairSymbol(
           ownerPacketId,
-          parsed.ssStart,
-          parsed.ssbLength,
-          parsed.rsId,
-          parsed.repairData,
+          repair.ssStart,
+          repair.ssbLength,
+          repair.rsId,
+          repair.symbolData,
           repairCatalogTrackName
         );
         if (recovered) {
@@ -14399,7 +14518,6 @@ var MmtpRouter = class {
       let sourceSymbolAccepted = false;
       let sourceSymbolTrackable = false;
       let parseSourceSymbol = false;
-      let symbolKey;
       const catalogTrackName = catalogTrackNameForPacket(ingress, info.packetId);
       if (catalogTrackName !== void 0) {
         const names = this.#catalogTrackNamesByPacketId.get(info.packetId) ?? /* @__PURE__ */ new Set();
@@ -14412,7 +14530,6 @@ var MmtpRouter = class {
         const rawSymbol = packet.subarray(0, packet.length - 4);
         const oversized = symbolSize > 0 && rawSymbol.length > symbolSize;
         const coords = this.#deriveSbnEsi(fecId.ssId, info.packetId);
-        symbolKey = `${this.#mediaStreamKey(info.packetId, catalogTrackName)}:${coords.sbn}:${coords.esi}`;
         let overlapBlockCompleted = false;
         if (overlapCopy) {
           overlapBlockCompleted = catalogTrackName === void 0 ? this.#fecManager.isBlockCompleted(coords.sbn, info.packetId) : this.#fecManager.isBlockCompleted(
@@ -14445,11 +14562,16 @@ var MmtpRouter = class {
             sourceFec = { ssId: fecId.ssId, sbn: coords.sbn, symbolData };
           }
         }
-        parseSourceSymbol = (overlapCopy ? !overlapBlockCompleted : sourceSymbolAccepted) && !this.#parsedSourceSymbols.has(symbolKey);
+        parseSourceSymbol = (overlapCopy ? !overlapBlockCompleted : sourceSymbolAccepted) && !this.#stream(info.packetId, catalogTrackName).parsedSymbols.has(fecId.ssId);
         fecInfo = { sbn: coords.sbn, esi: coords.esi, oversized };
       }
       if (!this.#fecManager || !info.fecPayloadId || parseSourceSymbol) {
-        if (symbolKey !== void 0) this.#noteParsedSourceSymbol(symbolKey);
+        if (this.#fecManager && info.fecPayloadId) {
+          rememberInLedger(
+            this.#stream(info.packetId, catalogTrackName).parsedSymbols,
+            info.fecPayloadId.ssId
+          );
+        }
         this.#noteSourcePacketSeq(
           info.packetId,
           info.sequenceNumber,
@@ -14463,7 +14585,7 @@ var MmtpRouter = class {
         this.#feedViaParser(packet, info, fecInfo, {
           source,
           catalogTrackName
-        });
+        }, parsed);
       }
       if (this.#fecManager && info.fecPayloadId && sourceSymbolAccepted && sourceSymbolTrackable) {
         const { sbn, esi } = this.#deriveSbnEsi(
@@ -14539,7 +14661,7 @@ var MmtpRouter = class {
    * Set temp context and delegate to parser.feed() for MFU extraction,
    * reassembly, keyframe detection, and frame emission via callbacks.
    */
-  #feedViaParser(packet, info, fecInfo, parserOptions) {
+  #feedViaParser(packet, info, fecInfo, parserOptions, parsed) {
     const diag = this.#diagFor(info.packetId, parserOptions?.catalogTrackName);
     const fragmentsBefore = this.#parser.reassemblerFragmentsFed;
     const reassembledBefore = this.#parser.reassemblerDataUnitsReturned;
@@ -14550,13 +14672,15 @@ var MmtpRouter = class {
     this.#currentFecInfo = fecInfo;
     this.#currentSeqNum = info.sequenceNumber;
     try {
-      this.#parser.feed(packet, {
+      const feedOptions = {
         skipFecPayloadId: parserOptions?.skipFecPayloadId,
         recovered: parserOptions?.recovered,
         source: parserOptions?.source,
         deliveryProvenance: parserOptions?.deliveryProvenance,
         catalogTrackName: parserOptions?.catalogTrackName
-      });
+      };
+      if (parsed) this.#parser.feedParsed(packet, parsed, feedOptions);
+      else this.#parser.feed(packet, feedOptions);
     } finally {
       this.#currentFecInfo = void 0;
     }
@@ -14629,41 +14753,21 @@ var MmtpRouter = class {
   }
   #noteSourcePacketSeq(packetId, packetSequenceNumber, catalogTrackName) {
     if (packetSequenceNumber === void 0 || !Number.isFinite(packetSequenceNumber)) return;
-    this.#sourcePktSeqs.add(
-      this.#packetSeqKey(packetId, packetSequenceNumber, catalogTrackName)
+    rememberInLedger(
+      this.#stream(packetId, catalogTrackName).sourceSeqs,
+      packetSequenceNumber
     );
-    if (this.#sourcePktSeqs.size > 4e3) {
-      const iter = this.#sourcePktSeqs.values();
-      for (let i = 0; i < 2e3; i++) iter.next();
-      const keep = /* @__PURE__ */ new Set();
-      for (const v of iter) keep.add(v);
-      this.#sourcePktSeqs = keep;
-    }
   }
-  #noteParsedSourceSymbol(key) {
-    this.#parsedSourceSymbols.add(key);
-    if (this.#parsedSourceSymbols.size > 4e3) {
-      const iter = this.#parsedSourceSymbols.values();
-      for (let i = 0; i < 2e3; i++) iter.next();
-      const keep = /* @__PURE__ */ new Set();
-      for (const v of iter) keep.add(v);
-      this.#parsedSourceSymbols = keep;
-    }
+  #sourceSeqReceived(packetId, packetSequenceNumber, catalogTrackName) {
+    return this.#stream(packetId, catalogTrackName).sourceSeqs.has(packetSequenceNumber);
   }
   #routeTrackPacket(packet, packetId, packetSequenceNumber, meta) {
     if (!Number.isFinite(packetSequenceNumber)) return;
     const callback = this.#trackPacketCallbacks.get(packetId);
     if (!callback) return;
-    const key = this.#packetSeqKey(packetId, packetSequenceNumber, meta.catalogTrackName);
-    if (this.#routedPacketSeqs.has(key)) return;
-    this.#routedPacketSeqs.add(key);
-    if (this.#routedPacketSeqs.size > 4e3) {
-      const iter = this.#routedPacketSeqs.values();
-      for (let i = 0; i < 2e3; i++) iter.next();
-      const keep = /* @__PURE__ */ new Set();
-      for (const value of iter) keep.add(value);
-      this.#routedPacketSeqs = keep;
-    }
+    const routedSeqs = this.#stream(packetId, meta.catalogTrackName).routedSeqs;
+    if (routedSeqs.has(packetSequenceNumber)) return;
+    rememberInLedger(routedSeqs, packetSequenceNumber);
     callback(packet, {
       packetId,
       packetSequenceNumber,
@@ -14685,17 +14789,26 @@ var MmtpRouter = class {
    * of pairs is bounded by the catalog (BLO-36599).
    */
   #mediaStreamKey(packetId, catalogTrackName) {
-    let byName = this.#mediaStreamKeys.get(packetId);
+    return this.#stream(packetId, catalogTrackName).key;
+  }
+  /** The (packetId, catalog name) stream's key and duplicate ledgers. */
+  #stream(packetId, catalogTrackName) {
+    let byName = this.#streams.get(packetId);
     if (!byName) {
       byName = /* @__PURE__ */ new Map();
-      this.#mediaStreamKeys.set(packetId, byName);
-    }
-    let key = byName.get(catalogTrackName);
-    if (key === void 0) {
-      key = JSON.stringify([packetId, catalogTrackName ?? null]);
-      byName.set(catalogTrackName, key);
+      this.#streams.set(packetId, byName);
+    }
+    let stream = byName.get(catalogTrackName);
+    if (stream === void 0) {
+      stream = {
+        key: JSON.stringify([packetId, catalogTrackName ?? null]),
+        sourceSeqs: /* @__PURE__ */ new Set(),
+        routedSeqs: /* @__PURE__ */ new Set(),
+        parsedSymbols: /* @__PURE__ */ new Set()
+      };
+      byName.set(catalogTrackName, stream);
     }
-    return key;
+    return stream;
   }
   #packetIdFromStreamKey(key) {
     try {
@@ -14740,9 +14853,6 @@ var MmtpRouter = class {
     if (scaled === null) return null;
     return { authoredTiming, timestamp: scaled.timestamp, mmtpTimestamp };
   }
-  #packetSeqKey(packetId, packetSequenceNumber, catalogTrackName) {
-    return `${this.#mediaStreamKey(packetId, catalogTrackName)}:${packetSequenceNumber}`;
-  }
   #pendingRecoveredKey(meta) {
     return `${meta.timestamp}:${meta.packetSequenceNumber ?? ""}`;
   }
@@ -15060,9 +15170,7 @@ var MmtpRouter = class {
         if (sym.fragmentType === 0 || sym.fragmentType === 1) continue;
         const fi = sym.fragment.fragmentationIndicator;
         if (fi === 0) {
-          if (this.#sourcePktSeqs.has(
-            this.#packetSeqKey(ownerPacketId, sym.packetSequenceNumber, catalogTrackName)
-          )) {
+          if (this.#sourceSeqReceived(ownerPacketId, sym.packetSequenceNumber, catalogTrackName)) {
             dedupedAgainstSource2++;
             continue;
           }
@@ -15112,9 +15220,7 @@ var MmtpRouter = class {
           });
           this.#noteEmittedKeyframe(ownerPacketId, keyframe);
         } else {
-          if (this.#sourcePktSeqs.has(
-            this.#packetSeqKey(ownerPacketId, sym.packetSequenceNumber, catalogTrackName)
-          )) {
+          if (this.#sourceSeqReceived(ownerPacketId, sym.packetSequenceNumber, catalogTrackName)) {
             dedupedAgainstSource2++;
             continue;
           }
@@ -15242,9 +15348,7 @@ var MmtpRouter = class {
       if (isVideo) {
         const fi = sym.fragment.fragmentationIndicator;
         if (fi === 0) {
-          if (this.#sourcePktSeqs.has(
-            this.#packetSeqKey(ownerPacketId, sym.packetSequenceNumber, catalogTrackName)
-          )) {
+          if (this.#sourceSeqReceived(ownerPacketId, sym.packetSequenceNumber, catalogTrackName)) {
             dedupedAgainstSource++;
             continue;
           }
@@ -15289,9 +15393,7 @@ var MmtpRouter = class {
             ...catalogTrackName === void 0 ? {} : { catalogTrackName }
           });
         } else {
-          if (this.#sourcePktSeqs.has(
-            this.#packetSeqKey(ownerPacketId, sym.packetSequenceNumber, catalogTrackName)
-          )) {
+          if (this.#sourceSeqReceived(ownerPacketId, sym.packetSequenceNumber, catalogTrackName)) {
             dedupedAgainstSource++;
             continue;
           }
@@ -15370,9 +15472,7 @@ var MmtpRouter = class {
           }
         }
       } else {
-        if (this.#sourcePktSeqs.has(
-          this.#packetSeqKey(ownerPacketId, sym.packetSequenceNumber, catalogTrackName)
-        )) {
+        if (this.#sourceSeqReceived(ownerPacketId, sym.packetSequenceNumber, catalogTrackName)) {
           dedupedAgainstSource++;
           continue;
         }
@@ -17234,10 +17334,8 @@ var MulticastTransport = class _MulticastTransport {
     this.#packetIds = null;
   }
   #acceptPacket(packet) {
-    let packetId;
-    try {
-      packetId = parseMMTPHeader(packet).packetId;
-    } catch {
+    const packetId = readMMTPPacketId(packet);
+    if (packetId === null) {
       if (!this.#packetIds) return true;
       this.#stats.packetsDroppedUnparseable++;
       return false;