@blockcast/mmt-container 0.3.0 → 0.4.0-main.71d61b2a53f2

package/src/repair-fetch.ts

@@ -1,14 +1,19 @@
 /**
  * D-28 shared repair-fetch scheduler.
  *
- * Player-agnostic orchestration for per-SBN on-demand MoQ FEC repair
+ * Player-agnostic orchestration for per-block on-demand MoQ FEC repair
  * backfill. Each player (moqtail client, hang watch, Shaka MSF bridge)
- * supplies only its protocol verb via {@link RepairFetchTransport}:
+ * supplies only its protocol verb via {@link RepairFetchTransport}, fetching
+ * one block's repair group. Blocks are `iso-ssbg1-v1` (ISO/IEC 23008-1
+ * ssbg_mode1, the only FEC block profile), so that group's MoQ id is the
+ * 62-bit wrap-epoch-extended SS_Start, `extSsStart(wrapEpoch, ssStart)` from
+ * `@blockcast/mmt-fec` -- never the 32-bit block key itself (see
+ * `RepairFetchRequest.sbn`):
  *
- *   - moqtail: standalone FETCH (FetchType.Standalone) for group [sbn, sbn+1)
- *   - moq-lite/hang: Subscribe with startGroup=sbn, endGroup=sbn (the relay
- *     propagates startGroup upstream to pull the past group from the origin's
- *     producer cache)
+ *   - moqtail: standalone FETCH (FetchType.Standalone) of that one group
+ *   - moq-lite/hang: Subscribe with startGroup = endGroup = that group (the
+ *     relay propagates startGroup upstream to pull the past group from the
+ *     origin's producer cache)
  *
  * Everything else — registration, fire-time repair-track resolution,
  * keyframe-first admission, preemption, feeding symbols, and in-flight slot
@@ -58,7 +63,7 @@
  * that deadline), on track reset, or on dispose.
  */
 
-import type { FecBlockProfile } from '@blockcast/mmt-base'
+import { parseFecBlockProfile, type FecBlockProfile } from '@blockcast/mmt-base'
 import { repairPriorityForClass, type BlockClass, type RepairPriority } from './block-policy.js'
 import type { RepairLifecycleObserver } from './multicast-manager.js'
 import { REPAIR_PRIORITY_MIN } from './repair-layers.js'
@@ -112,18 +117,24 @@ export interface RepairFetchRequest {
   /** Repair track whose block `sbn` is fetched. */
   readonly repairTrack: string
   /**
-   * The block's key, by `blockProfile` (BLO-35597 D2a):
-   * - `k-padded-v1`: the source block number, which IS the repair-track MoQ
-   *   group id (fetch `[sbn, sbn]`).
-   * - `iso-ssbg1-v1`: the block's 32-bit SS_Start. The MoQ group id is the
-   *   62-bit `extSsStart(wrapEpoch, sbn)`; a receiver that knows only a lost
-   *   SS_ID fetches `repairFetchRange(lostSsId, kMax, anchor)`, where `anchor`
-   *   is `{ previousBlockStart }` (the extended start of the last block
-   *   delimited before it) or `{ reference }` (an epoch reference). Never use
-   *   it as a group id directly.
+   * The block's key: its 32-bit SS_Start (ISO/IEC 23008-1 C.5.3). The field
+   * keeps its historical name, but ssbg_mode1 blocks have no source block
+   * number (BLO-35597 D2a). The repair group's MoQ id is the 62-bit
+   * `extSsStart(wrapEpoch, sbn)`; a receiver that knows only a lost SS_ID
+   * fetches `repairFetchRange(lostSsId, kMax, anchor)`, where `anchor` is
+   * `{ previousBlockStart }` (the extended start of the last block delimited
+   * before it) or `{ reference }` (an epoch reference). Never use it as a
+   * group id directly: SS_Start wraps at 2^32, a MoQ group id never goes
+   * backwards.
    */
   readonly sbn: number
-  /** The block profile `sbn` is keyed by (the catalog `fec.blockProfile`). */
+  /**
+   * The block profile `sbn` is keyed by: the catalog `fec.blockProfile`,
+   * which is always `iso-ssbg1-v1`. Required, and validated with
+   * `parseFecBlockProfile` when the request is queued, so a stream configured
+   * with any other token (the retired `k-padded-v1` included) never reaches
+   * the transport.
+   */
   readonly blockProfile: FecBlockProfile
   /** The source packetId the block belongs to. */
   readonly packetId: number
@@ -273,11 +284,11 @@ export type RepairSkipReason =
 export interface RepairFetchHost {
   readonly fecManager: {
     blockProfileForPacket(packetId: number): FecBlockProfile | undefined
-    repairFetchTimeoutMsForBlock(sbn: number, packetId: number, catalogTrackName?: string): number
+    repairFetchTimeoutMsForBlock(sbn: number, packetId: number, catalogTrackName?: string): number | undefined
     /** Receiver-local time of the block's first accepted symbol, if any. */
     blockAnchorAtMs(sbn: number, packetId: number, catalogTrackName?: string): number | undefined
     /** How long a terminal block stays authoritative: the release-gate hold ceiling. */
-    terminalRetentionMsForPacket(packetId: number): number
+    terminalRetentionMsForPacket(packetId: number): number | undefined
     /** Keep the block open to `untilAtMs` for an admitted FETCH. */
     holdBlockForRepair(
       sbn: number,
@@ -568,15 +579,18 @@ export function wireRepairFetch(mc: RepairFetchHost, opts: WireRepairFetchOption
 
   // The profile the block key is in; a stream reaching repair was configured
   // from its catalog, so an absent profile is a wiring fault, not a default.
-  // Resolved when the request arrives (onRepairSubscribe below), never inside
-  // execute: there its throw would read as an ordinary fetch failure, warned
-  // once per block while the stream silently lost unicast repair.
+  // Any token other than `iso-ssbg1-v1` (the retired `k-padded-v1` included)
+  // is one too: `parseFecBlockProfile` refuses it, whatever an untyped host
+  // returns. Resolved when the request arrives (onRepairSubscribe below),
+  // never inside execute: there its throw would read as an ordinary fetch
+  // failure, warned once per block while the stream silently lost unicast
+  // repair.
   const blockProfileOf = (packetId: number): FecBlockProfile => {
-    const profile = mc.fecManager.blockProfileForPacket(packetId)
+    const profile: unknown = mc.fecManager.blockProfileForPacket(packetId)
     if (profile === undefined) {
       throw new Error(`[RepairFetch] packetId=${packetId} has no configured fec.blockProfile`)
     }
-    return profile
+    return parseFecBlockProfile(profile, `[RepairFetch] packetId=${packetId} fec.blockProfile`)
   }
 
   const execute = async (entry: RepairEntry, run: FetchRun): Promise<void> => {
@@ -667,8 +681,11 @@ export function wireRepairFetch(mc: RepairFetchHost, opts: WireRepairFetchOption
     catalogTrackName: string | undefined,
     now: number,
   ): number | null => {
-    const waitDeadlineAt =
-      now + mc.fecManager.repairFetchTimeoutMsForBlock(sbn, packetId, catalogTrackName)
+    // Undefined: the packetId is no longer configured (released), so it has
+    // no repair budget.
+    const waitMs = mc.fecManager.repairFetchTimeoutMsForBlock(sbn, packetId, catalogTrackName)
+    if (waitMs === undefined) return null
+    const waitDeadlineAt = now + waitMs
     const anchor = mc.fecManager.blockAnchorAtMs(sbn, packetId, catalogTrackName)
     if (anchor === undefined) return waitDeadlineAt
     let delayMs: number
@@ -678,7 +695,9 @@ export function wireRepairFetch(mc: RepairFetchHost, opts: WireRepairFetchOption
       return null
     }
     if (!(Number.isFinite(delayMs) && delayMs > 0)) return null
-    const ceilingAt = anchor + mc.fecManager.terminalRetentionMsForPacket(packetId)
+    const retentionMs = mc.fecManager.terminalRetentionMsForPacket(packetId)
+    if (retentionMs === undefined) return null
+    const ceilingAt = anchor + retentionMs
     return Math.max(waitDeadlineAt, Math.min(anchor + delayMs, ceilingAt))
   }
 

package/src/repair-layers.ts

@@ -20,7 +20,7 @@
 // rendition's `fec.repairTrack` and needs no `repair.renditions` entry; an
 // entry there is optional and, when present, must agree with the source.
 
-import { parseFecBlockProfile, type FecBlockProfile } from "@blockcast/mmt-base";
+import { isFecBlockProfile, parseFecBlockProfile, type FecBlockProfile } from "@blockcast/mmt-base";
 
 /** Lowest MoQT-scale priority a repair track may declare. */
 export const REPAIR_PRIORITY_MIN = 192;
@@ -44,7 +44,8 @@ export type RepairContractCode =
 	| "track_repair_overlay"
 	| "track_repair_geometry"
 	| "track_fec_bounds"
-	| "track_fec_block_profile";
+	| "track_fec_block_profile"
+	| "track_fec_block_profile_unimplemented";
 
 /** Reports one contract violation and never returns. */
 export type RepairContractFail = (code: RepairContractCode, path: string, message: string) => never;
@@ -69,12 +70,23 @@ export const throwRepairContractError: RepairContractFail = (code, path, message
  * the one rule both catalog dialects, the CMSF validator and the per-track
  * resolver apply.
  *
- * A `fec` block that declares an FEC instance (any `algorithm` other than
- * `"none"`) MUST name its block profile, so an absent or unknown token fails
- * with `track_fec_block_profile` at `path`. A block declaring no FEC instance
- * may omit it (returns undefined), but a token it does carry must be known.
- * The token is never defaulted and never inferred: `k-padded-v1` and
- * `iso-ssbg1-v1` carry identical wire tuples whose repair math differs.
+ * draft-ramadan-moq-fec §5.1 defines exactly one profile, `iso-ssbg1-v1`, and
+ * it is the only one this library implements. A `fec` block that declares an
+ * FEC instance (any `algorithm` other than `"none"`) MUST name it; a block
+ * declaring no FEC instance may omit the token (returns undefined), but a token
+ * it does carry must be implemented. Failures are reported at `path`:
+ *
+ * - `track_fec_block_profile_unimplemented`: a non-empty string that names no
+ *   implemented profile. The retired Blockcast-private `k-padded-v1` is one
+ *   such token; a near-miss such as `"iso-ssbg1"` is another, never
+ *   normalized.
+ * - `track_fec_block_profile`: no token on a declared FEC instance, or a value
+ *   that is not a non-empty string.
+ *
+ * The token is never defaulted and never inferred from the wire. A receiver
+ * treats either failure as "FEC unavailable" for that track alone (it consumes
+ * the source without FEC and joins none of its repair tracks); a conformance
+ * validator rejects the catalog.
  *
  * @param path JSON path of the `blockProfile` field, for the error.
  */
@@ -97,6 +109,14 @@ export function readFecBlockProfile(
 	fail: RepairContractFail,
 ): FecBlockProfile | undefined {
 	if (value === undefined && !declaresFecInstance) return undefined;
+	if (isFecBlockProfile(value)) return value;
+	if (typeof value === "string" && value.length > 0) {
+		return fail(
+			"track_fec_block_profile_unimplemented",
+			path,
+			`${JSON.stringify(value)} is not an implemented FEC block profile; only "iso-ssbg1-v1" is implemented`,
+		);
+	}
 	try {
 		return parseFecBlockProfile(value, "blockProfile");
 	} catch (error) {

package/src/track-session.ts

@@ -172,24 +172,32 @@ export interface FecDeliveryWindowConfig {
 export function computeFecDeliveryWindowMs(
   config: FecDeliveryWindowConfig,
 ): number {
-  const fecInterleaveMs = config.interleaveDepthMs
   const fecK = config.sourceSymbols
-  if (!Number.isFinite(fecInterleaveMs) || fecInterleaveMs <= 0) {
-    throw new Error(
-      `[TrackSession] fecInterleaveMs=${fecInterleaveMs}. ` +
-      `Derive a positive FEC interleave window from the stream catalog.`
-    )
-  }
   if (!Number.isFinite(fecK) || fecK <= 0) {
     throw new Error(
       `[TrackSession] fecK=${fecK}. ` +
       `Derive a positive FEC source-symbol count from the stream catalog.`
     )
   }
+  return fecSpanDeliveryWindowMs(config.interleaveDepthMs, config.jitterBufferMs)
+}
 
+/**
+ * The delivery window of a §5.1 span alone. Every window is this; K only
+ * validates a track's geometry in computeFecDeliveryWindowMs, so a caller
+ * with a span and no K (FECManager's stream-global envelope) uses this
+ * rather than invent one.
+ */
+export function fecSpanDeliveryWindowMs(interleaveDepthMs: number, jitterBufferMs?: number): number {
+  if (!Number.isFinite(interleaveDepthMs) || interleaveDepthMs <= 0) {
+    throw new Error(
+      `[TrackSession] fecInterleaveMs=${interleaveDepthMs}. ` +
+      `Derive a positive FEC interleave window from the stream catalog.`
+    )
+  }
   // Absence stays absent; it does not authorize a synthesized reorder budget.
-  if (config.jitterBufferMs === undefined) return Math.ceil(fecInterleaveMs)
-  return fecBlockBudgetMs(fecInterleaveMs, config.jitterBufferMs)
+  if (jitterBufferMs === undefined) return Math.ceil(interleaveDepthMs)
+  return fecBlockBudgetMs(interleaveDepthMs, jitterBufferMs)
 }
 
 /** Convert the shared FEC delivery deadline into an integer media timescale. */
@@ -377,6 +385,17 @@ export class TrackSession {
   /** multicast/amt → failing: loss detected, start hysteresis timer (Claim 9f). */
   lossDetected(): void {
     if (this.#state !== 'multicast' && this.#state !== 'amt') return
+
+    // A zero/absent catalog span carries no elapsed FEC deadline. The stall
+    // detector that calls this method already supplied the generic loss
+    // evidence, so there is no FEC hysteresis window to derive here. Follow
+    // the existing transport-failure edge immediately instead of inventing a
+    // local timeout for a catalog value that explicitly supplied none.
+    if (this.config.fecInterleaveMs === 0 || this.config.fecInterleaveMs === undefined) {
+      this.transportFailed()
+      return
+    }
+
     this.#previousPrimary = this.#state as SubscriptionMode
     this.#transition('failing')
 

package/test-vectors/catalog/README.md

@@ -15,6 +15,9 @@ Negative fixtures are the migration worklist and MUST fail:
 - `multicast-packet-id-signaling.json`: an endpoint track's `packetId` is
   1..65535; `packetId` 0 is the MMTP signaling flow and is never a track's.
 - `network-source-object.json`: `networkSource` is always an array.
+- `multicast-endpoint-relay-address.json`: the AMT relay is catalog-level
+  `networkSource[{type:"amt",relay}]`; an endpoint `relayAddress` is retired
+  and rejected (`multicast_relay_address`), not ignored.
 - `multicast-network-source-empty.json`: `networkSource` is optional, but an
   empty array is not a way to say "absent" — omit the key instead.
 - `repair-track-legacy-shape.json`: repair tracks use `packaging: "fec-repair"`.
@@ -28,9 +31,13 @@ Negative fixtures are the migration worklist and MUST fail:
   and `scope` are `fec-repair` track fields only.
 - `raptorq-source-symbols-over-max.json`: RaptorQ K is at most 56403 (RFC 6330).
 - `fec-block-profile-missing.json`: an FEC instance must name its block
-  profile; there is no default.
-- `fec-block-profile-unknown.json`: `fec.blockProfile` is one of the two known
-  tokens; a near-miss such as `"iso-ssbg1"` is rejected, not normalized.
+  profile; there is no default (`track_fec_block_profile`).
+- `fec-block-profile-unknown.json`: `fec.blockProfile` is `"iso-ssbg1-v1"`; a
+  near-miss such as `"iso-ssbg1"` is rejected, not normalized
+  (`track_fec_block_profile_unimplemented`).
+- `fec-block-profile-retired.json`: the retired Blockcast-private
+  `"k-padded-v1"` is not a block profile
+  (`track_fec_block_profile_unimplemented`).
 - `archive-origin-with-path.json`: `archive.origin` is scheme and authority
   only. A path would make the derived object URL ambiguous above a codec that
   refuses percent-encoding precisely so each identity has one URL path.
@@ -49,21 +56,33 @@ exercised: `{ns}` is the track's own `namespace`, or the MoQ subscription's
 Track Namespace tuple when the track declares none.
 
 Every `fec` object that declares an FEC instance (any `algorithm` other than
-`"none"`) carries `fec.blockProfile` (BLO-35597, ISO/IEC 23008-1 Annex C), the
-one per-stream discriminator between the two block profiles. It is never
-defaulted and never inferred from the wire, because both profiles carry
-identical wire tuples whose repair math differs:
+`"none"`) carries `fec.blockProfile` (BLO-35597, ISO/IEC 23008-1 Annex C).
+draft-ramadan-moq-fec §5.1 defines exactly one value, `"iso-ssbg1-v1"`
+(ssbg_mode1, `K' = SSB_length`, consecutive SS_IDs), and it is never defaulted
+and never inferred from the wire. Any other token, the retired
+Blockcast-private `"k-padded-v1"` included, fails validation with
+`track_fec_block_profile_unimplemented`; an absent token on an FEC instance
+fails with `track_fec_block_profile`. A receiver consumes such a track without
+FEC and joins none of its repair tracks, without failing the session or any
+other track's FEC.
 
-- `"k-padded-v1"` (legacy): zero-padded K-symbol blocks, `SS_Start = SBN*K`.
-  Every fixture that predates the token carries this value, which is the wire
-  it always described.
-- `"iso-ssbg1-v1"`: ssbg_mode1, `K' = SSB_length`, consecutive SS_IDs.
-  `fec-iso-ssbg1.json` is `fec-multicast.json` under this profile.
+`"iso-ssbg1-v1"` bounds a block's location by its span, so a receiver applies
+FEC only when `fec.interleaveDepthMs` is at least 33 ms; without it the track
+resolves to no FEC (`track_fec_block_span` on `interleaveDepthMs`; a declared
+span below the floor is `track_fec`). The schema and the
+CMSF validator do not require the field. Every fixture that carried
+`"k-padded-v1"` now names `"iso-ssbg1-v1"`. The FEC-carrying positives that
+omitted the span (`fec-multicast.json`,
+`multicast-native-ssm-no-network-source.json`) now declare the one-group span
+their omitted field used to mean (`interleaveDepthMs` equal to
+`groupDurationMs`, 1000). `fec-iso-ssbg1.json` is `fec-multicast.json` without
+that span: a valid catalog whose FEC a receiver cannot apply.
 
 On `algorithm: "none"` the field is optional, but a present token must still be
-known. Repair tracks carry no `fec`, so they carry no profile; a repair layer or
-overlay inherits its source's. Every negative fixture with an FEC source names
-`"k-padded-v1"`, so each still fails for exactly the reason listed above.
+implemented. Repair tracks carry no `fec`, so they carry no profile; a repair
+layer or overlay inherits its source's. Every negative fixture with an FEC
+source names `"iso-ssbg1-v1"` unless the profile is what it tests, so each still
+fails for exactly the reason listed above.
 
 `fec-layered-repair.json` carries base layers 0..2 and a keyframe overlay for one
 source (draft-ramadan-moq-fec 6.3): layer 0 is `fec.repairTrack`, every further
@@ -71,8 +90,9 @@ repair track names its source in `depends`, and the second endpoint carries only
 repair tracks. Priority is on the MoQT scale (lower first); `audio-repair`
 declares none and so is layer 0 at the default 240.
 
-An omitted `fec.interleaveDepthMs` means one group (`D=1`); it does not disable
-FEC. When present, `groupDurationTicks` overrides the integer millisecond field.
+An omitted `fec.interleaveDepthMs` is valid catalog shape, but under
+`"iso-ssbg1-v1"` it leaves the track without FEC at a receiver (see above).
+When present, `groupDurationTicks` overrides the integer millisecond field.
 Switching sets compare `ticks / timescale`, so equal wall-clock durations at
 different timescales are valid.
 

package/test-vectors/catalog/negative/fec-block-profile-retired.json

@@ -0,0 +1,52 @@
+{
+  "version": 1,
+  "streamingFormat": "mmtp",
+  "streamingFormatVersion": "draft-ramadan-moq-mmt-00",
+  "tracks": [
+    {
+      "name": "video",
+      "packaging": "mmtp",
+      "codec": "avc1.640028",
+      "mmtpMode": "mfu",
+      "timescale": 90000,
+      "groupDurationMs": 1000,
+      "fec": {
+        "algorithm": "raptorq",
+        "blockProfile": "k-padded-v1",
+        "sourceSymbols": 768,
+        "repairSymbols": 384,
+        "symbolSize": 1312,
+        "repairTrack": "video-repair",
+        "mode": "interleaved"
+      }
+    },
+    {
+      "name": "video-repair",
+      "packaging": "fec-repair",
+      "priority": 240
+    }
+  ],
+  "multicast": {
+    "endpoints": [
+      {
+        "sourceAddress": "192.0.2.10",
+        "groupAddress": "232.1.1.1",
+        "port": 5000,
+        "tracks": [
+          { "name": "video", "packetId": 1 },
+          { "name": "video-repair", "packetId": 2 }
+        ]
+      }
+    ],
+    "networkSource": [
+      { "type": "amt", "discovery": "driad" },
+      {
+        "type": "atsc3",
+        "frequency": 587000000,
+        "plpId": 0,
+        "serviceId": 101,
+        "slsUri": "https://example.test/atsc3/service/101/sls.xml"
+      }
+    ]
+  }
+}

package/test-vectors/catalog/negative/fec-enhancement-repair-removed.json

@@ -12,7 +12,7 @@
       "groupDurationMs": 1000,
       "fec": {
         "algorithm": "raptorq",
-        "blockProfile": "k-padded-v1",
+        "blockProfile": "iso-ssbg1-v1",
         "sourceSymbols": 64,
         "repairSymbols": 8,
         "symbolSize": 1312,

package/test-vectors/catalog/negative/fec-repair-layer-geometry.json

@@ -12,7 +12,7 @@
       "groupDurationMs": 1000,
       "fec": {
         "algorithm": "raptorq",
-        "blockProfile": "k-padded-v1",
+        "blockProfile": "iso-ssbg1-v1",
         "sourceSymbols": 64,
         "repairSymbols": 8,
         "symbolSize": 1312,

package/test-vectors/catalog/negative/fec-repair-layer-missing-symbols.json

@@ -12,7 +12,7 @@
       "groupDurationMs": 1000,
       "fec": {
         "algorithm": "raptorq",
-        "blockProfile": "k-padded-v1",
+        "blockProfile": "iso-ssbg1-v1",
         "sourceSymbols": 64,
         "repairSymbols": 8,
         "symbolSize": 1312,

package/test-vectors/catalog/negative/fec-repair-multiple-depends.json

@@ -12,7 +12,7 @@
       "groupDurationMs": 1000,
       "fec": {
         "algorithm": "raptorq",
-        "blockProfile": "k-padded-v1",
+        "blockProfile": "iso-ssbg1-v1",
         "sourceSymbols": 64,
         "repairSymbols": 8,
         "symbolSize": 1312,

package/test-vectors/catalog/negative/fec-repair-overlay-with-layer.json

@@ -12,7 +12,7 @@
       "groupDurationMs": 1000,
       "fec": {
         "algorithm": "raptorq",
-        "blockProfile": "k-padded-v1",
+        "blockProfile": "iso-ssbg1-v1",
         "sourceSymbols": 64,
         "repairSymbols": 8,
         "symbolSize": 1312,

package/test-vectors/catalog/negative/fec-repair-priority-out-of-band.json

@@ -12,7 +12,7 @@
       "groupDurationMs": 1000,
       "fec": {
         "algorithm": "raptorq",
-        "blockProfile": "k-padded-v1",
+        "blockProfile": "iso-ssbg1-v1",
         "sourceSymbols": 64,
         "repairSymbols": 8,
         "symbolSize": 1312,

package/test-vectors/catalog/negative/fec-repair-source-symbols-without-scope.json

@@ -12,7 +12,7 @@
       "groupDurationMs": 1000,
       "fec": {
         "algorithm": "raptorq",
-        "blockProfile": "k-padded-v1",
+        "blockProfile": "iso-ssbg1-v1",
         "sourceSymbols": 64,
         "repairSymbols": 8,
         "symbolSize": 1312,

package/test-vectors/catalog/negative/multicast-endpoint-relay-address.json

@@ -0,0 +1,39 @@
+{
+  "version": 1,
+  "streamingFormat": "mmtp",
+  "streamingFormatVersion": "draft-ramadan-moq-mmt-00",
+  "tracks": [
+    {
+      "name": "video",
+      "packaging": "mmtp",
+      "codec": "avc1.640028",
+      "mmtpMode": "mfu",
+      "timescale": 90000,
+      "groupDurationMs": 1000
+    }
+  ],
+  "multicast": {
+    "endpoints": [
+      {
+        "protocol": "amt",
+        "sourceAddress": "192.0.2.10",
+        "groupAddress": "232.1.1.1",
+        "port": 5000,
+        "relayAddress": "amt-relay.example.test",
+        "tracks": [
+          {
+            "name": "video",
+            "packetId": 1
+          }
+        ]
+      }
+    ],
+    "networkSource": [
+      {
+        "type": "amt",
+        "discovery": "manual",
+        "relay": "amt-relay.example.test"
+      }
+    ]
+  }
+}

package/test-vectors/catalog/negative/multicast-network-source-empty.json

@@ -12,7 +12,7 @@
       "groupDurationMs": 1000,
       "fec": {
         "algorithm": "raptorq",
-        "blockProfile": "k-padded-v1",
+        "blockProfile": "iso-ssbg1-v1",
         "sourceSymbols": 768,
         "repairSymbols": 384,
         "symbolSize": 1312,

package/test-vectors/catalog/negative/raptorq-source-symbols-over-max.json

@@ -12,7 +12,7 @@
       "groupDurationMs": 1000,
       "fec": {
         "algorithm": "raptorq",
-        "blockProfile": "k-padded-v1",
+        "blockProfile": "iso-ssbg1-v1",
         "sourceSymbols": 56404,
         "repairSymbols": 8,
         "symbolSize": 1312,

package/test-vectors/catalog/negative/raptorq-unaligned-symbol.json

@@ -11,7 +11,7 @@
       "groupDurationMs": 1000,
       "fec": {
         "algorithm": "raptorq",
-        "blockProfile": "k-padded-v1",
+        "blockProfile": "iso-ssbg1-v1",
         "sourceSymbols": 32,
         "repairSymbols": 8,
         "symbolSize": 1310,

package/test-vectors/catalog/positive/fec-layered-repair.json

@@ -12,7 +12,7 @@
       "groupDurationMs": 1000,
       "fec": {
         "algorithm": "raptorq",
-        "blockProfile": "k-padded-v1",
+        "blockProfile": "iso-ssbg1-v1",
         "sourceSymbols": 64,
         "repairSymbols": 8,
         "symbolSize": 1312,
@@ -62,7 +62,7 @@
       "groupDurationMs": 1000,
       "fec": {
         "algorithm": "raptorq",
-        "blockProfile": "k-padded-v1",
+        "blockProfile": "iso-ssbg1-v1",
         "sourceSymbols": 47,
         "repairSymbols": 4,
         "symbolSize": 1312,

package/test-vectors/catalog/positive/fec-multicast.json

@@ -12,10 +12,11 @@
       "groupDurationMs": 1000,
       "fec": {
         "algorithm": "raptorq",
-        "blockProfile": "k-padded-v1",
+        "blockProfile": "iso-ssbg1-v1",
         "sourceSymbols": 768,
         "repairSymbols": 384,
         "symbolSize": 1312,
+        "interleaveDepthMs": 1000,
         "repairTrack": "video-repair",
         "mode": "interleaved"
       }

package/test-vectors/catalog/positive/multicast-amt-manual-relay.json

@@ -0,0 +1,38 @@
+{
+  "version": 1,
+  "streamingFormat": "mmtp",
+  "streamingFormatVersion": "draft-ramadan-moq-mmt-00",
+  "tracks": [
+    {
+      "name": "video",
+      "packaging": "mmtp",
+      "codec": "avc1.640028",
+      "mmtpMode": "mfu",
+      "timescale": 90000,
+      "groupDurationMs": 1000
+    }
+  ],
+  "multicast": {
+    "endpoints": [
+      {
+        "protocol": "amt",
+        "sourceAddress": "192.0.2.10",
+        "groupAddress": "232.1.1.1",
+        "port": 5000,
+        "tracks": [
+          {
+            "name": "video",
+            "packetId": 1
+          }
+        ]
+      }
+    ],
+    "networkSource": [
+      {
+        "type": "amt",
+        "discovery": "manual",
+        "relay": "amt-relay.example.test"
+      }
+    ]
+  }
+}

package/test-vectors/catalog/positive/multicast-native-ssm-no-network-source.json

@@ -12,10 +12,11 @@
       "groupDurationMs": 1000,
       "fec": {
         "algorithm": "raptorq",
-        "blockProfile": "k-padded-v1",
+        "blockProfile": "iso-ssbg1-v1",
         "sourceSymbols": 768,
         "repairSymbols": 384,
         "symbolSize": 1312,
+        "interleaveDepthMs": 1000,
         "repairTrack": "video-repair",
         "mode": "interleaved"
       }