@blockcast/mmt-container 1.0.0-main.ac0d9896a088 → 1.0.0

package/README.md

@@ -177,20 +177,26 @@ if (!validateCatalog(catalog)) {
 Implements `draft-law-ramadan-moq-carp-reliability` §3 (FEC), §4 (multicast endpoints), and `draft-ramadan-moq-mmt-01` §4.4.2 (track timing). Plain TypeScript interfaces with type guards — no Zod, no runtime schema dependency. Upstream Zod schemas should derive from these via `z.infer<>`.
 
 ```ts
-type FecAlgorithm = "none" | "raptorq" | "reed-solomon"
-
-interface FecCatalogConfig {
-  algorithm: FecAlgorithm        // §3.1
-  blockProfile?: "iso-ssbg1-v1"  // REQUIRED unless algorithm is "none"; never defaulted (BLO-35597)
-  sourceSymbols: number          // K (REQUIRED): K_max, the largest SSB_length of any block
-  repairSymbols: number          // P (REQUIRED)
-  symbolSize: number             // T, 8-byte aligned (REQUIRED)
-  interleaveDepthMs?: number     // FEC block span in MILLISECONDS, default 0 (single-group blocks)
-  repairTrack: string            // §6.1 — required
-  mode?: "interleaved" | "object"  // extension; "object" (per-frame object blocks) is retired: @blockcast/mmt-fec refuses it
-  uep?: { keyRatio: number; deltaRatio: number }   // Unequal Error Protection — Blockcast extension, not in draft-ramadan-moq-fec-01
-  deltaFailWindowBlocks?: number                   // D-11, base track only
-  deltaProbeIntervalMs?: number                    // D-13, base track only
+// draft-ramadan-moq-fec-catalog-00 3: a track's `fec` is an array of instance
+// objects; an empty array or no `fec` declares no FEC. Usability is
+// validateFecCatalog's per-instance answer; runtime readers take it from
+// resolveFecBindings (both in @blockcast/mmt-base, re-exported here).
+type FecCatalogConfig = readonly FecInstanceConfig[]
+
+interface FecInstanceConfig {
+  instanceId?: number            // 0..255, default 0, unique per track
+  scheme: string                 // "raptorq" | "reed-solomon" | other token (= no FEC here)
+  blockProfile: string           // REQUIRED, never defaulted; this library implements "iso-ssbg1-v1"
+  sourceSymbols: number          // K
+  repairSymbols: number          // P of layer 0, >= 1
+  symbolSize: number             // T
+  interleaveDepthMs?: number
+  reorderToleranceMs?: number
+  repairTrack: string            // layer 0; other layers/overlay are fec-repair tracks (source + instanceId)
+  symbolTrack?: string
+  label?: string                 // display only
+  deltaFailWindowBlocks?: number // Phase-14 extension key (D-11), ignored by the validator
+  deltaProbeIntervalMs?: number  // Phase-14 extension key (D-13), ignored by the validator
 }
 
 interface MulticastEndpoint {
@@ -214,7 +220,6 @@ interface TrackTimingConfig {
   groupDurationTicks?: number      // override when ms × timescale isn't integer
 }
 
-function isFecCatalogConfig(x: unknown): x is FecCatalogConfig
 function isMulticastCatalogConfig(x: unknown): x is MulticastCatalogConfig
 function resolveGroupDurationTicks(timing: TrackTimingConfig, timescale: number): number
 function validateSwitchingSetTiming(...): { ok: true } | { ok: false; ... }

package/dist/browser-runtime.js

@@ -1022,22 +1022,22 @@ function authIssues(auth) {
   const firstEpochs = /* @__PURE__ */ new Set();
   for (let index = 0; index < keys.length; index++) {
     const key = keys[index];
-    const at = `.keys[${index}]`;
+    const at2 = `.keys[${index}]`;
     if (!isObject(key) || Object.keys(key).some((member) => !KEY_MEMBERS.has(member))) {
-      return issue(at, "a key is exactly {kid, publicKey, firstEpoch}");
+      return issue(at2, "a key is exactly {kid, publicKey, firstEpoch}");
     }
     if (!isIntegerIn(key["kid"], 0, UINT32_MAX))
-      return issue(`${at}.kid`, "kid must be an unsigned 32-bit integer");
+      return issue(`${at2}.kid`, "kid must be an unsigned 32-bit integer");
     if (typeof key["publicKey"] !== "string" || !ED25519_PUBLIC_KEY_BASE64URL.test(key["publicKey"])) {
-      return issue(`${at}.publicKey`, "publicKey must be a 32-octet Ed25519 key in canonical unpadded base64url");
+      return issue(`${at2}.publicKey`, "publicKey must be a 32-octet Ed25519 key in canonical unpadded base64url");
     }
     if (!isIntegerIn(key["firstEpoch"], 0, UINT32_MAX)) {
-      return issue(`${at}.firstEpoch`, "firstEpoch must be an unsigned 32-bit integer");
+      return issue(`${at2}.firstEpoch`, "firstEpoch must be an unsigned 32-bit integer");
     }
     if (kids.has(key["kid"]))
-      return issue(`${at}.kid`, `kid ${key["kid"]} is repeated; the catalog holds no key set`);
+      return issue(`${at2}.kid`, `kid ${key["kid"]} is repeated; the catalog holds no key set`);
     if (firstEpochs.has(key["firstEpoch"])) {
-      return issue(`${at}.firstEpoch`, `firstEpoch ${key["firstEpoch"]} is repeated; the catalog holds no key set`);
+      return issue(`${at2}.firstEpoch`, `firstEpoch ${key["firstEpoch"]} is repeated; the catalog holds no key set`);
     }
     kids.add(key["kid"]);
     firstEpochs.add(key["firstEpoch"]);
@@ -1047,36 +1047,36 @@ function authIssues(auth) {
   }
   return [];
 }
-function endpointAuthIssue(endpoint, mode, at) {
+function endpointAuthIssue(endpoint, mode, at2) {
   const auth = endpoint["auth"];
   if (!isObject(auth))
-    return { path: `${at}.auth`, message: "auth must be an object" };
+    return { path: `${at2}.auth`, message: "auth must be an object" };
   const unknown = Object.keys(auth).filter((key) => !ENDPOINT_AUTH_MEMBERS.has(key));
   if (unknown.length > 0)
-    return { path: `${at}.auth`, message: `auth has unknown member(s) ${unknown.join(", ")}` };
+    return { path: `${at2}.auth`, message: `auth has unknown member(s) ${unknown.join(", ")}` };
   if (!isIntegerIn(auth["manifestPort"], 1, 65535)) {
-    return { path: `${at}.auth.manifestPort`, message: "manifestPort must be an integer from 1 to 65535" };
+    return { path: `${at2}.auth.manifestPort`, message: "manifestPort must be an integer from 1 to 65535" };
   }
   if (!isIntegerIn(auth["streamId"], 0, UINT32_MAX)) {
-    return { path: `${at}.auth.streamId`, message: "streamId must be an unsigned 32-bit integer" };
+    return { path: `${at2}.auth.streamId`, message: "streamId must be an unsigned 32-bit integer" };
   }
   if (mode === "ssm" && auth["senderAddress"] !== void 0) {
-    return { path: `${at}.auth.senderAddress`, message: "senderAddress must not appear on an SSM endpoint; S is sourceAddress" };
+    return { path: `${at2}.auth.senderAddress`, message: "senderAddress must not appear on an SSM endpoint; S is sourceAddress" };
   }
   if (mode === "asm" && !isNonEmptyString(auth["senderAddress"])) {
-    return { path: `${at}.auth.senderAddress`, message: "a protected ASM endpoint requires senderAddress" };
+    return { path: `${at2}.auth.senderAddress`, message: "a protected ASM endpoint requires senderAddress" };
   }
   if (auth["maxAuthDelayMs"] !== void 0 && !isIntegerIn(auth["maxAuthDelayMs"], 50, 1e3)) {
-    return { path: `${at}.auth.maxAuthDelayMs`, message: "maxAuthDelayMs must be an integer from 50 to 1000" };
+    return { path: `${at2}.auth.maxAuthDelayMs`, message: "maxAuthDelayMs must be an integer from 50 to 1000" };
   }
   if (auth["manifestTimerMs"] !== void 0 && !isIntegerIn(auth["manifestTimerMs"], 1, Number.MAX_SAFE_INTEGER)) {
-    return { path: `${at}.auth.manifestTimerMs`, message: "manifestTimerMs must be an integer of at least 1" };
+    return { path: `${at2}.auth.manifestTimerMs`, message: "manifestTimerMs must be an integer of at least 1" };
   }
   if (auth["manifestTrack"] !== void 0 && !isNonEmptyString(auth["manifestTrack"])) {
-    return { path: `${at}.auth.manifestTrack`, message: "manifestTrack must be a non-empty string" };
+    return { path: `${at2}.auth.manifestTrack`, message: "manifestTrack must be a non-empty string" };
   }
   if (!isIntegerIn(endpoint["bandwidth"], 1, Number.MAX_SAFE_INTEGER)) {
-    return { path: `${at}.bandwidth`, message: "a protected endpoint requires bandwidth, which bounds the receiver's hold queues" };
+    return { path: `${at2}.bandwidth`, message: "a protected endpoint requires bandwidth, which bounds the receiver's hold queues" };
   }
   return void 0;
 }
@@ -1112,41 +1112,41 @@ function multicastCatalogIssues(catalog, options = {}) {
   const sources = [];
   for (let index = 0; index < endpoints.length; index++) {
     const endpoint = endpoints[index];
-    const at = `$.multicast.endpoints[${index}]`;
+    const at2 = `$.multicast.endpoints[${index}]`;
     const fail = (code, path, message) => {
       issues.push({ code, path, message, endpointIndex: index });
     };
     sources.push(void 0);
     if (!isObject(endpoint)) {
-      fail("multicast_endpoint", at, "endpoint must be an object");
+      fail("multicast_endpoint", at2, "endpoint must be an object");
       continue;
     }
     const protocol = endpoint["protocol"];
     if (protocol !== void 0 && protocol !== "ssm" && protocol !== "asm") {
-      fail("multicast_endpoint", `${at}.protocol`, `protocol must be "ssm" or "asm"; a bearer such as ${JSON.stringify(protocol)} is a networkSource entry (draft -01 4.2)`);
+      fail("multicast_endpoint", `${at2}.protocol`, `protocol must be "ssm" or "asm"; a bearer such as ${JSON.stringify(protocol)} is a networkSource entry (draft -01 4.2)`);
       continue;
     }
     const hasAuth = endpoint["auth"] !== void 0;
     if (protectedCatalog !== hasAuth) {
-      fail("multicast_endpoint_auth", `${at}.auth`, protectedCatalog ? "every endpoint requires auth when multicast carries auth; a receiver ignores this endpoint" : "auth names no key without multicast.auth; a receiver ignores this endpoint");
+      fail("multicast_endpoint_auth", `${at2}.auth`, protectedCatalog ? "every endpoint requires auth when multicast carries auth; a receiver ignores this endpoint" : "auth names no key without multicast.auth; a receiver ignores this endpoint");
       continue;
     }
     const sourceAddress = endpoint["sourceAddress"];
     if (sourceAddress !== void 0 && !isNonEmptyString(sourceAddress)) {
-      fail("multicast_endpoint", `${at}.sourceAddress`, "sourceAddress must be a non-empty string");
+      fail("multicast_endpoint", `${at2}.sourceAddress`, "sourceAddress must be a non-empty string");
       continue;
     }
     const mode = sourceAddress === void 0 ? "asm" : "ssm";
     if (protocol !== void 0 && protocol !== mode) {
-      fail("multicast_endpoint", `${at}.protocol`, `protocol ${JSON.stringify(protocol)} disagrees with sourceAddress, which selects ${mode}`);
+      fail("multicast_endpoint", `${at2}.protocol`, `protocol ${JSON.stringify(protocol)} disagrees with sourceAddress, which selects ${mode}`);
       continue;
     }
     if (!isIntegerIn(endpoint["port"], 1, 65535)) {
-      fail("multicast_endpoint", `${at}.port`, "port must be an integer from 1 to 65535");
+      fail("multicast_endpoint", `${at2}.port`, "port must be an integer from 1 to 65535");
       continue;
     }
     if (hasAuth) {
-      const authIssue = endpointAuthIssue(endpoint, mode, at);
+      const authIssue = endpointAuthIssue(endpoint, mode, at2);
       if (authIssue) {
         fail("multicast_endpoint_auth", authIssue.path, authIssue.message);
         continue;
@@ -1164,7 +1164,7 @@ function multicastCatalogIssues(catalog, options = {}) {
         continue;
       referenceNamespace ??= namespace;
       if (namespace !== referenceNamespace) {
-        fail("multicast_track", `${at}.tracks[${refIndex}].name`, `track ${JSON.stringify(name)} declares namespace ${JSON.stringify(namespace)}, not the catalog track's ${JSON.stringify(referenceNamespace)}`);
+        fail("multicast_track", `${at2}.tracks[${refIndex}].name`, `track ${JSON.stringify(name)} declares namespace ${JSON.stringify(namespace)}, not the catalog track's ${JSON.stringify(referenceNamespace)}`);
       }
     }
   }
@@ -1181,9 +1181,9 @@ function multicastCatalogIssues(catalog, options = {}) {
     if (!sources[index])
       continue;
     const own = tupleOf(index);
-    const at = `$.multicast.endpoints[${index}]`;
+    const at2 = `$.multicast.endpoints[${index}]`;
     if (own.manifestPort !== void 0 && own.manifestPort === own.port) {
-      issues.push({ code: "multicast_endpoint_auth", path: `${at}.auth.manifestPort`, message: "manifestPort must differ from the endpoint's own port", endpointIndex: index });
+      issues.push({ code: "multicast_endpoint_auth", path: `${at2}.auth.manifestPort`, message: "manifestPort must differ from the endpoint's own port", endpointIndex: index });
       continue;
     }
     for (let other = 0; other < endpoints.length; other++) {
@@ -1193,11 +1193,11 @@ function multicastCatalogIssues(catalog, options = {}) {
       if (peer.sg !== own.sg)
         continue;
       if (peer.port === own.port) {
-        issues.push({ code: "multicast_endpoint", path: `${at}.port`, message: `(S, G, port) is shared with endpoint ${other}; one endpoint object per multicast tuple`, endpointIndex: index });
+        issues.push({ code: "multicast_endpoint", path: `${at2}.port`, message: `(S, G, port) is shared with endpoint ${other}; one endpoint object per multicast tuple`, endpointIndex: index });
         break;
       }
       if (own.manifestPort !== void 0 && (own.manifestPort === peer.port || own.manifestPort === peer.manifestPort)) {
-        issues.push({ code: "multicast_endpoint_auth", path: `${at}.auth.manifestPort`, message: `manifestPort is a port or manifestPort of endpoint ${other} on the same (S, G)`, endpointIndex: index });
+        issues.push({ code: "multicast_endpoint_auth", path: `${at2}.auth.manifestPort`, message: `manifestPort is a port or manifestPort of endpoint ${other} on the same (S, G)`, endpointIndex: index });
         break;
       }
     }
@@ -1593,7 +1593,7 @@ function fecCatalogTracks(catalog) {
         continue;
       hangNames.add(name);
       const kind = recordOf(entry["container"])?.["kind"];
-      const view2 = { name, packaging: kind ?? "mmtp" };
+      const view2 = { name, packaging: kind === void 0 || kind === "mmtp-fec" ? "mmtp" : kind };
       if (entry["fec"] !== void 0)
         view2["fec"] = entry["fec"];
       tracks.push(view2);
@@ -1636,7 +1636,7 @@ function fecCatalogTracks(catalog) {
 function resolveFecBindings(catalog, receiver = RUNTIME_FEC_RECEIVER) {
   const { tracks, pointers } = fecCatalogTracks(catalog);
   const report = validateFecCatalog({ tracks }, receiver);
-  const at = (path) => {
+  const at2 = (path) => {
     const m = /^\/tracks\/(\d+)(.*)$/.exec(path);
     return m ? pointers[Number(m[1])] + m[2] : path;
   };
@@ -1644,7 +1644,7 @@ function resolveFecBindings(catalog, receiver = RUNTIME_FEC_RECEIVER) {
   const nameAt = (i) => i === null ? void 0 : trackAt(i)["name"];
   const why = (i) => Object.freeze({
     code: i.issues[0]?.code ?? "fec_member",
-    path: at(i.issues[0]?.path ?? i.path),
+    path: at2(i.issues[0]?.path ?? i.path),
     outcome: i.outcome === "unavailable" ? "unavailable" : "violation"
   });
   const out = /* @__PURE__ */ new Map();
@@ -1659,7 +1659,7 @@ function resolveFecBindings(catalog, receiver = RUNTIME_FEC_RECEIVER) {
     if (fec === void 0)
       return;
     if (!Array.isArray(fec)) {
-      const reason = { code: "fec_member", path: at(`/tracks/${ti}/fec`), outcome: "violation" };
+      const reason = { code: "fec_member", path: at2(`/tracks/${ti}/fec`), outcome: "violation" };
       out.set(name, Object.freeze({ status: "unavailable", track: name, pointer: pointers[ti], reason: Object.freeze(reason) }));
       return;
     }
@@ -1673,7 +1673,7 @@ function resolveFecBindings(catalog, receiver = RUNTIME_FEC_RECEIVER) {
       const reason = (
         // No base instance at all (overlay-only `fec`) is a count of 0, not
         // the overlay's own issue.
-        okBases.length > 1 || bases.length === 0 ? Object.freeze({ code: "fec_base_instances", path: at(`/tracks/${ti}/fec`), outcome: "violation" }) : why(bases[0] ?? insts[0])
+        okBases.length > 1 || bases.length === 0 ? Object.freeze({ code: "fec_base_instances", path: at2(`/tracks/${ti}/fec`), outcome: "violation" }) : why(bases[0] ?? insts[0])
       );
       out.set(name, Object.freeze({ status: "unavailable", track: name, pointer: pointers[ti], reason }));
       return;
@@ -6777,18 +6777,6 @@ function hasSwitchingSetRole(names) {
     return suffix === "base" || suffix === "delta";
   });
 }
-function isFecCatalogGeometry(obj) {
-  if (typeof obj !== "object" || obj === null) return false;
-  const o = obj;
-  const algorithm = o["algorithm"];
-  const symbolSize = o["symbolSize"];
-  return typeof algorithm === "string" && algorithm.length > 0 && typeof o["sourceSymbols"] === "number" && o["sourceSymbols"] >= 1 && typeof o["repairSymbols"] === "number" && o["repairSymbols"] >= 1 && typeof symbolSize === "number" && symbolSize >= 1 && (algorithm !== "raptorq" || symbolSize % 8 === 0) && typeof o["repairTrack"] === "string" && o["repairTrack"].length > 0;
-}
-function isFecCatalogConfig(obj) {
-  if (!isFecCatalogGeometry(obj)) return false;
-  const o = obj;
-  return isFecBlockProfile(o["blockProfile"]) || o["algorithm"] === "none" && o["blockProfile"] === void 0;
-}
 function isMulticastTrackObject(obj) {
   if (typeof obj !== "object" || obj === null) return false;
   const o = obj;
@@ -9280,6 +9268,7 @@ function getPhase14CatalogOverride() {
 function mergeOverrideIntoHangRenditions(catalog, override) {
   if (!override) return catalog;
   for (const track of override.tracks) {
+    if (track.packaging === "fec-repair") continue;
     const role = track.role === "audio" || track.name.startsWith("audio") ? "audio" : "video";
     const bagKey = role === "audio" ? "audio" : "video";
     const bag = catalog[bagKey] ?? { renditions: {}, priority: 1 };
@@ -9298,8 +9287,24 @@ function mergeOverrideIntoHangRenditions(catalog, override) {
     bag.renditions[track.name] = merged;
     catalog[bagKey] = bag;
   }
+  for (const track of override.tracks) {
+    if (track.packaging !== "fec-repair") continue;
+    const source = catalog["video"]?.renditions?.[track.source] ?? catalog["audio"]?.renditions?.[track.source];
+    if (!namesRepairTrack(source?.fec, track.name, track.instanceId)) continue;
+    const repair = catalog["repair"] ?? {};
+    repair.renditions ??= {};
+    const { name, packaging: _p, mmtpMode: _m, timescale: _t, groupDurationMs: _g, altGroup: _a, ...entry } = track;
+    repair.renditions[name] ??= entry;
+    catalog["repair"] = repair;
+  }
   return catalog;
 }
+function namesRepairTrack(fec, name, instanceId) {
+  const id = instanceId ?? 0;
+  return Array.isArray(fec) && fec.some(
+    (i) => typeof i === "object" && i !== null && (i.instanceId ?? 0) === id && i.repairTrack === name
+  );
+}
 function isPositiveInteger(value) {
   return typeof value === "number" && Number.isInteger(value) && value > 0;
 }
@@ -9316,7 +9321,11 @@ function mergeOverrideIntoCmsfTracks(tracks, override) {
   const existingAudioTrack = tracks.find(
     (t) => t.role === "audio" && typeof t.codec === "string" && t.codec.length > 0
   );
-  for (const ot of override.tracks) {
+  const ordered = [
+    ...override.tracks.filter((t) => t.packaging !== "fec-repair"),
+    ...override.tracks.filter((t) => t.packaging === "fec-repair")
+  ];
+  for (const ot of ordered) {
     const existing = byName.get(ot.name);
     if (existing !== void 0) {
       if (existing.fec === void 0 && ot.fec !== void 0) existing.fec = ot.fec;
@@ -9354,10 +9363,14 @@ function mergeOverrideIntoCmsfTracks(tracks, override) {
           `[phase14-catalog-override] track "${ot.name}" has no packaging \u2014 supply per-track or set top-level streamingFormat`
         );
       }
-      const role = ot.role ?? (ot.name.endsWith("/repair") ? void 0 : "video");
+      const isRepair = packaging === "fec-repair";
+      if (isRepair && !namesRepairTrack(byName.get(ot.source)?.fec, ot.name, ot.instanceId)) {
+        continue;
+      }
+      const role = ot.role ?? (isRepair ? void 0 : "video");
       const inheritedCodec = role === "audio" ? existingAudioTrack?.codec : existingVideoTrack?.codec;
       const codec = ot.codec ?? inheritedCodec;
-      if (packaging !== "timeline" && (typeof codec !== "string" || codec.length === 0)) {
+      if (packaging !== "timeline" && !isRepair && (typeof codec !== "string" || codec.length === 0)) {
         throw new Error(
           `[phase14-catalog-override] track "${ot.name}" has no codec (packaging='${packaging}') \u2014 supply per-track or ensure the publisher catalog has a ${role ?? "video"} track to inherit from`
         );
@@ -9378,14 +9391,13 @@ function mergeOverrideIntoCmsfTracks(tracks, override) {
           `[phase14-catalog-override] track "${ot.name}" has packaging='mmtp' but no valid groupDurationMs`
         );
       }
-      const entry = {
-        name: ot.name,
-        packaging,
-        codec
-      };
-      if (mmtpMode !== void 0) entry.mmtpMode = mmtpMode;
-      if (ot.timescale !== void 0) entry.timescale = ot.timescale;
-      if (ot.groupDurationMs !== void 0) entry.groupDurationMs = ot.groupDurationMs;
+      const entry = { name: ot.name, packaging };
+      if (codec !== void 0 && !isRepair) entry.codec = codec;
+      if (ot.source !== void 0) entry["source"] = ot.source;
+      if (ot.instanceId !== void 0) entry["instanceId"] = ot.instanceId;
+      if (mmtpMode !== void 0 && !isRepair) entry.mmtpMode = mmtpMode;
+      if (ot.timescale !== void 0 && !isRepair) entry.timescale = ot.timescale;
+      if (ot.groupDurationMs !== void 0 && !isRepair) entry.groupDurationMs = ot.groupDurationMs;
       if (role !== void 0) entry.role = role;
       if (ot.framerate !== void 0) entry.framerate = ot.framerate;
       if (ot.fec !== void 0) entry.fec = ot.fec;
@@ -13193,13 +13205,13 @@ var BlockClassifier = class {
           if (compareDataUnitStarts(starts[mid], start) < 0) lo = mid + 1;
           else hi = mid;
         }
-        const at = starts[lo];
-        if (at !== void 0 && compareDataUnitStarts(at, start) === 0) {
-          if (at.sbn !== sbn) return true;
+        const at2 = starts[lo];
+        if (at2 !== void 0 && compareDataUnitStarts(at2, start) === 0) {
+          if (at2.sbn !== sbn) return true;
         } else {
           const before = starts[lo - 1];
           if (before !== void 0 && before.sbn > sbn) return true;
-          if (at !== void 0 && at.sbn < sbn) return true;
+          if (at2 !== void 0 && at2.sbn < sbn) return true;
           insertAt = lo;
         }
       }
@@ -19497,11 +19509,11 @@ function isStream(meta, stream) {
   return meta.packetId === stream.packetId && meta.catalogTrackName === stream.catalogTrackName;
 }
 function comparePresentation(a, b) {
-  const at = a.authoredTiming;
+  const at2 = a.authoredTiming;
   const bt = b.authoredTiming;
-  if (at !== void 0 && bt !== void 0) {
-    const left = at.presentationTime * BigInt(bt.mediaTimescale);
-    const right = bt.presentationTime * BigInt(at.mediaTimescale);
+  if (at2 !== void 0 && bt !== void 0) {
+    const left = at2.presentationTime * BigInt(bt.mediaTimescale);
+    const right = bt.presentationTime * BigInt(at2.mediaTimescale);
     return left < right ? -1 : left > right ? 1 : 0;
   }
   return a.timestamp - b.timestamp;
@@ -29253,33 +29265,44 @@ var MediaRouter = class {
 };
 
 // src/delta-fallback-config.ts
-function resolveDeltaFallback(base, delta) {
-  const repair = base.fec?.repairTrack;
-  if (!repair) throw new Error(`[delta-fallback] base track "${base.name}" missing fec.repairTrack`);
-  const deltaFec = delta.fec;
-  if (!deltaFec?.repairTrack) throw new Error(`[delta-fallback] delta track "${delta.name}" missing fec.repairTrack`);
-  if (deltaFec.repairTrack !== repair)
-    throw new Error(
-      `[delta-fallback] inconsistent repair tracks: ${base.name} references "${repair}" but ${delta.name} references "${deltaFec.repairTrack}"`
-    );
-  if (!(typeof base.framerate === "number" && Number.isFinite(base.framerate) && base.framerate > 0))
-    throw new Error(`[delta-fallback] base track "${base.name}" missing positive framerate`);
-  if (!(isPositive(deltaFec.sourceSymbols) && isPositive(deltaFec.repairSymbols)))
-    throw new Error(`[delta-fallback] delta track "${delta.name}" missing positive fec.sourceSymbols/repairSymbols`);
+var recordOf3 = (v) => typeof v === "object" && v !== null && !Array.isArray(v) ? v : void 0;
+function at(root, pointer) {
+  let cur = root;
+  for (const raw of pointer.split("/").slice(1)) {
+    const key = raw.replace(/~1/g, "/").replace(/~0/g, "~");
+    cur = Array.isArray(cur) ? cur[Number(key)] : recordOf3(cur)?.[key];
+  }
+  return recordOf3(cur);
+}
+function resolveDeltaFallback(catalog, baseName, deltaName) {
+  const bindings = resolveFecBindings(catalog);
+  const bound = (name, role) => {
+    const b = bindings.get(name);
+    if (!b) throw new Error(`[delta-fallback] ${role} track "${name}" declares no fec`);
+    if (b.status !== "ok")
+      throw new Error(`[delta-fallback] ${role} track "${name}" has no FEC: ${b.reason.code} at ${b.reason.path}`);
+    const track = at(catalog, b.pointer) ?? {};
+    const instance = (Array.isArray(track["fec"]) ? track["fec"] : []).map(recordOf3).find((o) => o && (o["instanceId"] ?? 0) === b.base.instanceId) ?? {};
+    return { b, track, instance };
+  };
+  const base = bound(baseName, "base");
+  const delta = bound(deltaName, "delta");
+  const framerate = base.track["framerate"];
+  if (!(typeof framerate === "number" && Number.isFinite(framerate) && framerate > 0))
+    throw new Error(`[delta-fallback] base track "${baseName}" missing positive framerate`);
+  const key = (k) => base.instance[k] ?? delta.instance[k];
   const config = {
-    framerate: base.framerate,
-    sourceSymbols: deltaFec.sourceSymbols,
-    repairSymbols: deltaFec.repairSymbols,
-    deltaFailWindowBlocks: base.fec?.deltaFailWindowBlocks ?? deltaFec.deltaFailWindowBlocks,
-    deltaProbeIntervalMs: base.fec?.deltaProbeIntervalMs ?? deltaFec.deltaProbeIntervalMs,
-    interleaveDepthMs: base.fec?.interleaveDepthMs ?? deltaFec.interleaveDepthMs
+    framerate,
+    sourceSymbols: delta.b.base.sourceSymbols,
+    repairSymbols: delta.b.base.repairSymbols,
+    deltaFailWindowBlocks: key("deltaFailWindowBlocks"),
+    deltaProbeIntervalMs: key("deltaProbeIntervalMs"),
+    interleaveDepthMs: base.b.base.interleaveDepthMs ?? delta.b.base.interleaveDepthMs
   };
-  assertDeltaFallbackConfig(config, `[delta-fallback] group ${base.name}/${delta.name}`);
-  return { repairTrackName: repair, config };
-}
-function isPositive(value) {
-  return typeof value === "number" && Number.isFinite(value) && value > 0;
+  assertDeltaFallbackConfig(config, `[delta-fallback] group ${baseName}/${deltaName}`);
+  return { baseRepairTrackName: repairOf(base.b), deltaRepairTrackName: repairOf(delta.b), config };
 }
+var repairOf = (b) => b.layers[0].repairTrackName;
 
 // src/align.ts
 function secondsFromTicks(ticks, timescale) {
@@ -31252,15 +31275,15 @@ function wireRepairFetch(mc, opts) {
     const retentionMs = mc.fecManager.terminalRetentionMsForPacket(packetId);
     if (retentionMs === void 0) return null;
     const ceilingAt = Math.min(anchor, earliestGatedFrameAt(packetId, catalogTrackName) ?? anchor) + retentionMs;
-    const at = (delay, delayBound) => {
+    const at2 = (delay, delayBound) => {
       const presentAt = Math.min(anchor + delay, ceilingAt);
       if (waitDeadlineAt >= presentAt) return { deadlineAt: waitDeadlineAt, bound: "wait" };
       return { deadlineAt: presentAt, bound: anchor + delay <= ceilingAt ? delayBound : "retention" };
     };
-    const base = at(delayMs, "presentation");
+    const base = at2(delayMs, "presentation");
     const budgetMs = keyframeBudgetEligible(blockClass, classifierMode(packetId, catalogTrackName)) && groupCanComplete(sbn, packetId, catalogTrackName) ? readKeyframeBudget(packetId, catalogTrackName) : null;
     if (budgetMs === null || budgetMs <= delayMs) return { ...base, extensionMs: 0, anchorAt: anchor, delayMs };
-    const extended = at(budgetMs, "keyframe");
+    const extended = at2(budgetMs, "keyframe");
     return {
       ...extended,
       extensionMs: extended.deadlineAt - base.deadlineAt,
@@ -31270,8 +31293,8 @@ function wireRepairFetch(mc, opts) {
   };
   const earliestGatedFrameAt = (packetId, catalogTrackName) => {
     try {
-      const at = mc.earliestGatedFrameAtMs?.(packetId, catalogTrackName);
-      return at !== void 0 && Number.isFinite(at) ? at : void 0;
+      const at2 = mc.earliestGatedFrameAtMs?.(packetId, catalogTrackName);
+      return at2 !== void 0 && Number.isFinite(at2) ? at2 : void 0;
     } catch {
       return void 0;
     }
@@ -31578,8 +31601,6 @@ export {
   isCompleteAvccSample,
   isCompleteFmp4DataUnit,
   isFecBlockProfile,
-  isFecCatalogConfig,
-  isFecCatalogGeometry,
   isFmp4InitSegment,
   isHevcCodec,
   isHevcIrapNalUnitType,