@blockcast/mmt-fec 0.4.0 → 0.4.1-main.2e0aa69d293d
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +14 -12
- package/dist/block-manager.d.ts +7 -4
- package/dist/block-manager.d.ts.map +1 -1
- package/dist/block-manager.js +8 -5
- package/dist/block-manager.js.map +1 -1
- package/dist/block-processor.js +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/oti.d.ts +0 -20
- package/dist/oti.d.ts.map +1 -1
- package/dist/oti.js +0 -38
- package/dist/oti.js.map +1 -1
- package/package.json +2 -2
- package/src/block-manager.ts +9 -6
- package/src/block-processor.ts +1 -1
- package/src/index.ts +0 -1
- package/src/oti.ts +0 -42
package/README.md
CHANGED
|
@@ -10,19 +10,19 @@ pnpm add @blockcast/mmt-fec
|
|
|
10
10
|
|
|
11
11
|
```ts
|
|
12
12
|
import { FecBlockManager, processFecBlock } from "@blockcast/mmt-fec"
|
|
13
|
-
import { buildOTIFromCatalog,
|
|
13
|
+
import { buildOTIFromCatalog, fecBlockBudgetMs } from "@blockcast/mmt-fec"
|
|
14
14
|
|
|
15
15
|
// Catalog says K=32 source symbols, P=8 repair, T=1320 byte symbols,
|
|
16
|
-
// interleaveDepthMs=200 (the FULL FEC block span in ms, §5.1),
|
|
16
|
+
// interleaveDepthMs=200 (the FULL FEC block span in ms, §5.1),
|
|
17
|
+
// reorderToleranceMs=40 (the signaled network allowance, §9).
|
|
17
18
|
const K = 32
|
|
18
19
|
const T = 1320
|
|
19
20
|
const interleaveDepthMs = 200
|
|
20
|
-
const
|
|
21
|
-
const gopDurationMs = 1000 / fps
|
|
21
|
+
const reorderToleranceMs = 40
|
|
22
22
|
|
|
23
23
|
const oti = buildOTIFromCatalog(K, T)
|
|
24
|
-
|
|
25
|
-
const timeoutMs =
|
|
24
|
+
// §9: span + tolerance, each once. No K, group count or multiplier.
|
|
25
|
+
const timeoutMs = fecBlockBudgetMs(interleaveDepthMs, reorderToleranceMs)
|
|
26
26
|
const blocks = new FecBlockManager({ k: K, timeoutMs })
|
|
27
27
|
|
|
28
28
|
// `recovered` comes from the container/worker-owned MmtFecDecoder.
|
|
@@ -48,7 +48,7 @@ Mirrors `package.json#exports`. Each subpath is a tree-shakeable entry point.
|
|
|
48
48
|
| `./cmaf-recovery` | `src/cmaf-recovery.ts` | `CmafFecRecovery` — stateful recovery for CMAF chunks + LOC frames |
|
|
49
49
|
| `./loc` | `src/loc-symbols.ts` | `splitFrameToSymbol`, `recoverFrameFromSymbol` — LOC 1:1 frame ↔ symbol |
|
|
50
50
|
|
|
51
|
-
The aggregator entry also re-exports OTI helpers (`buildOTI`, `buildOTIFromCatalog`, `parseOTI`, `
|
|
51
|
+
The aggregator entry also re-exports OTI helpers (`buildOTI`, `buildOTIFromCatalog`, `parseOTI`, `fecBlockDeadlineMs`, `fecBlockBudgetMs`, `parseRepairPacket`) the block-geometry mappers (`FecBlockMapper`, `NullBlockMapper`, `createMapper`, `recoveredPacketMediaGroup`), and the `iso-ssbg1-v1` MoQ repair group helpers (`extSsStart`, `extendSsId`, `repairFetchRange`, `repairGroupIdMatches`). Canonical MMTP Source FEC Payload ID parsing lives in `@blockcast/mmt-base`; canonical LOC FEC source information lives in `@blockcast/mmt-container`.
|
|
52
52
|
|
|
53
53
|
## Architecture
|
|
54
54
|
|
|
@@ -169,12 +169,14 @@ The higher-level `FecManager` that orchestrates CMSF catalog parsing, base/delta
|
|
|
169
169
|
```ts
|
|
170
170
|
buildOTIFromCatalog(K, T) // fixed profile: F=K*T, Z=1, N=1, Al=8
|
|
171
171
|
parseOTI(otiBytes) // returns { transferLength, symbolSize, ... K }
|
|
172
|
-
|
|
173
|
-
//
|
|
172
|
+
fecBlockDeadlineMs({ firstAcceptedAtMs, interleaveDepthMs, reorderToleranceMs })
|
|
173
|
+
// first-accepted ts + span + tolerance (§9)
|
|
174
|
+
fecBlockBudgetMs(interleaveDepthMs, reorderToleranceMs)
|
|
175
|
+
// span + tolerance, for duration-only APIs
|
|
174
176
|
parseRepairPacket(mmtpPacket) // ISO 23008-1 §C.5.3 repair FEC PID
|
|
175
177
|
```
|
|
176
178
|
|
|
177
|
-
`
|
|
179
|
+
`fecBlockDeadlineMs` is the block-recovery deadline (draft-ramadan-moq-fec §9): the first accepted packet's receiver-local timestamp plus the catalog `interleaveDepthMs` (the full block span, §5.1) plus the catalog `reorderToleranceMs`, each added once. Nothing derives a span or deadline from K, a Group count, or a multiplier. **Do not** hardcode `setTimeout` values upstream.
|
|
178
180
|
|
|
179
181
|
`./` (root) exposes the catalog block geometry via `FecBlockMapper` (`k`, `d`, `interleaveDepthMs`, `gopDurationMs`, `pacingThresholdMs`, and the required `blockProfile`). It does not map MoQ groups to FEC blocks: a recovered packet's media group comes from its own header (`mediaGroupOf` / `recoveredPacketMediaGroup`), and `fromSsId` throws for every stream with an FEC instance, whose `iso-ssbg1-v1` blocks are located by `(SS_Start, SSB_length)` range membership. `NullBlockMapper` (no FEC, no profile) keeps its identity `derive` and `fromSsId`; `createMapper({ mode: 'object' })` throws, since per-group object FEC numbers SS_IDs on the retired `k-padded-v1` stride. Under `iso-ssbg1-v1` the MoQ repair group id is the 62-bit wrap-epoch-extended SS_Start (`extSsStart`); a receiver that lost SS_ID x in a block it has not delimited FETCHes `repairFetchRange(x, K, { previousBlockStart })`, or `repairFetchRange(x, K, { reference })` from its wrap-epoch reference when no delimited block ends before x (draft-ramadan-moq-fec §7.5), and discards a repair object whose Group ID fails `repairGroupIdMatches`.
|
|
180
182
|
|
|
@@ -228,8 +230,8 @@ Common broadcast configuration (also documented in the parent README):
|
|
|
228
230
|
Specs:
|
|
229
231
|
- **RFC 6330** — RaptorQ Forward Error Correction Scheme (incl. §3.3.2.1 interleaved scheme)
|
|
230
232
|
- **ISO/IEC 23008-1:2023** — MMT, Annex C; Amendment 1:2025 — AL-FEC framework
|
|
231
|
-
- **ATSC A/331
|
|
232
|
-
- **draft-ramadan-moq-fec-
|
|
233
|
+
- **ATSC A/331:2026-02 8.1.2.5** — AL-FEC for MMTP (informative for draft-fec-01)
|
|
234
|
+
- **draft-ramadan-moq-fec-01** — AL-FEC over MoQ wire format: §4.2 RaptorQ OTI, §7.1 repair object header, §8.3 source symbol location (SS_ID), §9 interleaving; the §7.6 `moq-object-v1` block profile is not implemented here
|
|
233
235
|
|
|
234
236
|
## Performance
|
|
235
237
|
|
package/dist/block-manager.d.ts
CHANGED
|
@@ -10,9 +10,12 @@
|
|
|
10
10
|
* ↓
|
|
11
11
|
* FALLBACK (timeout) → WebTransport repair → DECODED
|
|
12
12
|
*
|
|
13
|
-
*
|
|
13
|
+
* Receiver behaviour (block-level reading of draft-ramadan-moq-fec-01 Section 11.4
|
|
14
|
+
* and draft-ramadan-moq-multicast-01 Section 6.2):
|
|
14
15
|
* - k source symbols complete a block (no FEC decode needed)
|
|
15
|
-
* - After timeout, missing symbols are requested via WebTransport
|
|
16
|
+
* - After timeout, missing symbols are requested via WebTransport (libmmt falls
|
|
17
|
+
* back for every block class; it does not implement the Section 11.4.1
|
|
18
|
+
* classification or the keyframe-only repair-track FETCH)
|
|
16
19
|
* - With k symbols (source + repair), FEC decode recovers block
|
|
17
20
|
*/
|
|
18
21
|
export declare const FEC_STATE: {
|
|
@@ -28,7 +31,7 @@ export interface FecBlockManagerOptions {
|
|
|
28
31
|
/** Block timeout (ms). Derive from catalog: interleaveDepthMs or frameDurationMs * K. Required. */
|
|
29
32
|
timeoutMs: number;
|
|
30
33
|
/** K — source symbols per block from catalog fec.sourceSymbols. Required for interleaved mode.
|
|
31
|
-
* For object FEC (
|
|
34
|
+
* For object FEC (Blockcast extension, not in draft-ramadan-moq-fec-01), this is the max K — actual K varies per block via addSourcePacket/addRepairPacket blockK param. */
|
|
32
35
|
k: number;
|
|
33
36
|
/** Max concurrent blocks in flight. Resource bound, not timing — default 64. */
|
|
34
37
|
maxBlocks?: number;
|
|
@@ -64,7 +67,7 @@ export declare class FecBlockManager {
|
|
|
64
67
|
}): void;
|
|
65
68
|
/**
|
|
66
69
|
* Add a source symbol to a block.
|
|
67
|
-
* @param blockK — per-block K for object FEC (
|
|
70
|
+
* @param blockK — per-block K for object FEC (Blockcast extension, not in draft-ramadan-moq-fec-01). When provided, overrides
|
|
68
71
|
* the global K for this block. For interleaved mode, omit (uses global K).
|
|
69
72
|
*/
|
|
70
73
|
addSourcePacket(blockId: number, esi: number, data: Uint8Array, blockK?: number): Uint8Array | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block-manager.d.ts","sourceRoot":"","sources":["../src/block-manager.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"block-manager.d.ts","sourceRoot":"","sources":["../src/block-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,eAAO,MAAM,SAAS;;;;;;;CAOZ,CAAC;AAEX,MAAM,MAAM,QAAQ,GAAG,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,OAAO,SAAS,CAAC,CAAC;AAElE,MAAM,WAAW,sBAAsB;IACtC,mGAAmG;IACnG,SAAS,EAAE,MAAM,CAAC;IAClB;iLAC6K;IAC7K,CAAC,EAAE,MAAM,CAAC;IACV,gFAAgF;IAChF,SAAS,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC7B,aAAa,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;CACrB;AAqED;;;;;;;;GAQG;AACH,qBAAa,eAAe;;IAI3B,SAAS,EAAE,MAAM,CAAC;gBAaN,OAAO,EAAE,sBAAsB;IAQ3C,iBAAiB,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,KAAK,IAAI,GAAG,IAAI;IAInF,iBAAiB,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,KAAK,IAAI,GAAG,IAAI;IAI9E,YAAY,CAAC,MAAM,EAAE;QAAE,CAAC,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI;IAK9D;;;;OAIG;IACH,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;IAgBnG;;;;;;OAMG;IACH,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI;IAoBnG,QAAQ,IAAI,aAAa;IAWzB,KAAK,IAAI,IAAI;CAmJb"}
|
package/dist/block-manager.js
CHANGED
|
@@ -10,9 +10,12 @@
|
|
|
10
10
|
* ↓
|
|
11
11
|
* FALLBACK (timeout) → WebTransport repair → DECODED
|
|
12
12
|
*
|
|
13
|
-
*
|
|
13
|
+
* Receiver behaviour (block-level reading of draft-ramadan-moq-fec-01 Section 11.4
|
|
14
|
+
* and draft-ramadan-moq-multicast-01 Section 6.2):
|
|
14
15
|
* - k source symbols complete a block (no FEC decode needed)
|
|
15
|
-
* - After timeout, missing symbols are requested via WebTransport
|
|
16
|
+
* - After timeout, missing symbols are requested via WebTransport (libmmt falls
|
|
17
|
+
* back for every block class; it does not implement the Section 11.4.1
|
|
18
|
+
* classification or the keyframe-only repair-track FETCH)
|
|
16
19
|
* - With k symbols (source + repair), FEC decode recovers block
|
|
17
20
|
*/
|
|
18
21
|
export const FEC_STATE = {
|
|
@@ -128,7 +131,7 @@ export class FecBlockManager {
|
|
|
128
131
|
}
|
|
129
132
|
/**
|
|
130
133
|
* Add a source symbol to a block.
|
|
131
|
-
* @param blockK — per-block K for object FEC (
|
|
134
|
+
* @param blockK — per-block K for object FEC (Blockcast extension, not in draft-ramadan-moq-fec-01). When provided, overrides
|
|
132
135
|
* the global K for this block. For interleaved mode, omit (uses global K).
|
|
133
136
|
*/
|
|
134
137
|
addSourcePacket(blockId, esi, data, blockK) {
|
|
@@ -191,7 +194,7 @@ export class FecBlockManager {
|
|
|
191
194
|
};
|
|
192
195
|
}
|
|
193
196
|
/**
|
|
194
|
-
* @param blockK — per-block K for object FEC (
|
|
197
|
+
* @param blockK — per-block K for object FEC (Blockcast extension, not in draft-ramadan-moq-fec-01). Falls back to global #k.
|
|
195
198
|
*/
|
|
196
199
|
#createBlock(blockId, blockK) {
|
|
197
200
|
if (this.#blocks.size >= this.maxBlocks) {
|
|
@@ -199,7 +202,7 @@ export class FecBlockManager {
|
|
|
199
202
|
}
|
|
200
203
|
const k = blockK ?? this.#k;
|
|
201
204
|
if (k <= 0) {
|
|
202
|
-
throw new Error(`[FecBlockManager] Cannot create block ${blockId}: K=${k}. Derive K from catalog (interleaved) or frame size (object
|
|
205
|
+
throw new Error(`[FecBlockManager] Cannot create block ${blockId}: K=${k}. Derive K from catalog (interleaved) or frame size (object FEC, a Blockcast extension).`);
|
|
203
206
|
}
|
|
204
207
|
const block = new FecBlock(blockId, k);
|
|
205
208
|
this.#blocks.set(blockId, block);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block-manager.js","sourceRoot":"","sources":["../src/block-manager.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"block-manager.js","sourceRoot":"","sources":["../src/block-manager.ts"],"names":[],"mappings":"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"}
|
package/dist/block-processor.js
CHANGED
|
@@ -68,7 +68,7 @@ function gateMpuHeader(data, bump) {
|
|
|
68
68
|
*/
|
|
69
69
|
function parseProtectedPacket(packetData, hdr, index, bump) {
|
|
70
70
|
// WASM-decoded source symbols retain fecType bits from the original FFmpeg
|
|
71
|
-
// packet (fecType=1 per draft-ramadan-moq-mmt-
|
|
71
|
+
// packet (fecType=1 per draft-ramadan-moq-mmt-01 §3.1), but the 4-byte
|
|
72
72
|
// Source FEC Payload ID (ISO 23008-1 §C.5.2) is never part of the protected
|
|
73
73
|
// packet (C.4.2). Tell extractMFUPayload to skip FEC PID subtraction so it
|
|
74
74
|
// does not truncate video data; any legacy authenticator trailer must then consume the
|
package/dist/index.d.ts
CHANGED
|
@@ -17,7 +17,7 @@ export { ReorderBuffer, type ReorderBufferConfig, } from "./reorder-buffer.js";
|
|
|
17
17
|
export { splitToSymbols, recoverFromSymbols, computeK, } from "./cmaf-symbols.js";
|
|
18
18
|
export { splitFrameToSymbol, recoverFrameFromSymbol, } from "./loc-symbols.js";
|
|
19
19
|
export { CmafFecRecovery, type CmafFecRecoveryConfig, type FecDecoder, } from "./cmaf-recovery.js";
|
|
20
|
-
export { buildOTI, buildOTIFromCatalog, parseOTI,
|
|
20
|
+
export { buildOTI, buildOTIFromCatalog, parseOTI, deriveFecInterleaveDepth, catalogFecInterleaveMs, type FecInterleaveCatalog, parseRepairPacket, type OTIParams, fecBlockDeadlineMs, fecBlockBudgetMs, deriveFecRetentionBlocks, tryDeriveFecRetentionBlocks, MAX_FEC_RETENTION_BLOCKS, LOCAL_FEC_RETENTION_BLOCKS, LOCAL_FEC_TIMEOUT_MS, playbackLatencyMs, } from "./oti.js";
|
|
21
21
|
export { FecBlockMapper, NullBlockMapper, createMapper, recoveredPacketMediaGroup, type FecBlockConfig, type FecCoordinates, } from "./fec-block-mapper.js";
|
|
22
22
|
/**
|
|
23
23
|
* MoQ repair group ids for `iso-ssbg1-v1` blocks: the 62-bit
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EACN,eAAe,EACf,SAAS,EACT,KAAK,QAAQ,EACb,KAAK,sBAAsB,EAC3B,KAAK,aAAa,GAClB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACN,eAAe,EACf,gBAAgB,EAChB,KAAK,eAAe,EACpB,KAAK,sBAAsB,EAC3B,KAAK,qBAAqB,EAC1B,KAAK,uBAAuB,GAC5B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACN,aAAa,EACb,KAAK,mBAAmB,GACxB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACN,cAAc,EACd,kBAAkB,EAClB,QAAQ,GACR,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EACN,kBAAkB,EAClB,sBAAsB,GACtB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACN,eAAe,EACf,KAAK,qBAAqB,EAC1B,KAAK,UAAU,GACf,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACN,QAAQ,EACR,mBAAmB,EACnB,QAAQ,EACR,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EACN,eAAe,EACf,SAAS,EACT,KAAK,QAAQ,EACb,KAAK,sBAAsB,EAC3B,KAAK,aAAa,GAClB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACN,eAAe,EACf,gBAAgB,EAChB,KAAK,eAAe,EACpB,KAAK,sBAAsB,EAC3B,KAAK,qBAAqB,EAC1B,KAAK,uBAAuB,GAC5B,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACN,aAAa,EACb,KAAK,mBAAmB,GACxB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACN,cAAc,EACd,kBAAkB,EAClB,QAAQ,GACR,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EACN,kBAAkB,EAClB,sBAAsB,GACtB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACN,eAAe,EACf,KAAK,qBAAqB,EAC1B,KAAK,UAAU,GACf,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACN,QAAQ,EACR,mBAAmB,EACnB,QAAQ,EACR,wBAAwB,EACxB,sBAAsB,EACtB,KAAK,oBAAoB,EACzB,iBAAiB,EACjB,KAAK,SAAS,EACd,kBAAkB,EAClB,gBAAgB,EAChB,wBAAwB,EACxB,2BAA2B,EAC3B,wBAAwB,EACxB,0BAA0B,EAC1B,oBAAoB,EACpB,iBAAiB,GACjB,MAAM,UAAU,CAAC;AAElB,OAAO,EACN,cAAc,EACd,eAAe,EACf,YAAY,EACZ,yBAAyB,EACzB,KAAK,cAAc,EACnB,KAAK,cAAc,GACnB,MAAM,uBAAuB,CAAC;AAE/B;;;;GAIG;AACH,OAAO,EACN,UAAU,EACV,UAAU,EACV,gBAAgB,EAChB,oBAAoB,EACpB,qBAAqB,EACrB,KAAK,gBAAgB,EACrB,KAAK,iBAAiB,EACtB,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,oBAAoB,GACzB,MAAM,mBAAmB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -17,7 +17,7 @@ export { ReorderBuffer, } from "./reorder-buffer.js";
|
|
|
17
17
|
export { splitToSymbols, recoverFromSymbols, computeK, } from "./cmaf-symbols.js";
|
|
18
18
|
export { splitFrameToSymbol, recoverFrameFromSymbol, } from "./loc-symbols.js";
|
|
19
19
|
export { CmafFecRecovery, } from "./cmaf-recovery.js";
|
|
20
|
-
export { buildOTI, buildOTIFromCatalog, parseOTI,
|
|
20
|
+
export { buildOTI, buildOTIFromCatalog, parseOTI, deriveFecInterleaveDepth, catalogFecInterleaveMs, parseRepairPacket, fecBlockDeadlineMs, fecBlockBudgetMs, deriveFecRetentionBlocks, tryDeriveFecRetentionBlocks, MAX_FEC_RETENTION_BLOCKS, LOCAL_FEC_RETENTION_BLOCKS, LOCAL_FEC_TIMEOUT_MS, playbackLatencyMs, } from "./oti.js";
|
|
21
21
|
export { FecBlockMapper, NullBlockMapper, createMapper, recoveredPacketMediaGroup, } from "./fec-block-mapper.js";
|
|
22
22
|
/**
|
|
23
23
|
* MoQ repair group ids for `iso-ssbg1-v1` blocks: the 62-bit
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EACN,eAAe,EACf,SAAS,GAIT,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACN,eAAe,EACf,gBAAgB,GAKhB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACN,aAAa,GAEb,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACN,cAAc,EACd,kBAAkB,EAClB,QAAQ,GACR,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EACN,kBAAkB,EAClB,sBAAsB,GACtB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACN,eAAe,GAGf,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACN,QAAQ,EACR,mBAAmB,EACnB,QAAQ,EACR,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EACN,eAAe,EACf,SAAS,GAIT,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACN,eAAe,EACf,gBAAgB,GAKhB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EACN,aAAa,GAEb,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACN,cAAc,EACd,kBAAkB,EAClB,QAAQ,GACR,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EACN,kBAAkB,EAClB,sBAAsB,GACtB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EACN,eAAe,GAGf,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACN,QAAQ,EACR,mBAAmB,EACnB,QAAQ,EACR,wBAAwB,EACxB,sBAAsB,EAEtB,iBAAiB,EAEjB,kBAAkB,EAClB,gBAAgB,EAChB,wBAAwB,EACxB,2BAA2B,EAC3B,wBAAwB,EACxB,0BAA0B,EAC1B,oBAAoB,EACpB,iBAAiB,GACjB,MAAM,UAAU,CAAC;AAElB,OAAO,EACN,cAAc,EACd,eAAe,EACf,YAAY,EACZ,yBAAyB,GAGzB,MAAM,uBAAuB,CAAC;AAE/B;;;;GAIG;AACH,OAAO,EACN,UAAU,EACV,UAAU,EACV,gBAAgB,EAChB,oBAAoB,EACpB,qBAAqB,GAMrB,MAAM,mBAAmB,CAAC"}
|
package/dist/oti.d.ts
CHANGED
|
@@ -76,26 +76,6 @@ export declare function catalogFecInterleaveMs(fec: FecInterleaveCatalog | undef
|
|
|
76
76
|
* but represents D=120 rather than D=121.
|
|
77
77
|
*/
|
|
78
78
|
export declare function deriveFecInterleaveDepth(interleaveDepthMs: number, mediaUnitDurationMs: number): number;
|
|
79
|
-
/**
|
|
80
|
-
* Compute the full FEC block completion timeout from the catalog block span.
|
|
81
|
-
*
|
|
82
|
-
* The catalog's `interleaveDepthMs` IS the full FEC block span in
|
|
83
|
-
* milliseconds (draft-ramadan-moq-fec §5.1): producers emit
|
|
84
|
-
* D × unit-duration, and every symbol of a block — source and repair —
|
|
85
|
-
* arrives within that span. The full-block timeout is therefore
|
|
86
|
-
* K-INDEPENDENT:
|
|
87
|
-
*
|
|
88
|
-
* timeout = interleaveDepthMs * safetyFactor
|
|
89
|
-
*
|
|
90
|
-
* A caller that genuinely needs a per-sub-block deadline scales the block
|
|
91
|
-
* span by K_sub / K. Never scale it by a symbol count: the span already
|
|
92
|
-
* covers every symbol of the block.
|
|
93
|
-
*
|
|
94
|
-
* @param interleaveDepthMs - Full FEC block span in ms (catalog fec.interleaveDepthMs)
|
|
95
|
-
* @param safetyFactor - Jitter margin (default 3.0)
|
|
96
|
-
* @returns Timeout in milliseconds
|
|
97
|
-
*/
|
|
98
|
-
export declare function computeFecTimeout(interleaveDepthMs: number, safetyFactor?: number): number;
|
|
99
79
|
/**
|
|
100
80
|
* Absolute deadline for one FEC block.
|
|
101
81
|
*
|
package/dist/oti.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oti.d.ts","sourceRoot":"","sources":["../src/oti.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,MAAM,WAAW,SAAS;IACzB,2DAA2D;IAC3D,cAAc,EAAE,MAAM,CAAC;IACvB,uCAAuC;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,YAAY,EAAE,MAAM,CAAC;IACrB,6BAA6B;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,0BAA0B;IAC1B,SAAS,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,UAAU,CAwBtD;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,UAAU,CAWpE;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,UAAU,GAAG,SAAS,GAAG;IAAE,CAAC,EAAE,MAAM,CAAA;CAAE,CAYnE;AAwBD;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,MAAM,oBAAoB,GAAG;IAClC,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,wBAAgB,sBAAsB,CACrC,GAAG,EAAE,oBAAoB,GAAG,SAAS,GACnC,MAAM,GAAG,SAAS,CAGpB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,wBAAwB,CACvC,iBAAiB,EAAE,MAAM,EACzB,mBAAmB,EAAE,MAAM,GACzB,MAAM,CAQR;AAED
|
|
1
|
+
{"version":3,"file":"oti.d.ts","sourceRoot":"","sources":["../src/oti.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,MAAM,WAAW,SAAS;IACzB,2DAA2D;IAC3D,cAAc,EAAE,MAAM,CAAC;IACvB,uCAAuC;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,YAAY,EAAE,MAAM,CAAC;IACrB,6BAA6B;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,0BAA0B;IAC1B,SAAS,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,SAAS,GAAG,UAAU,CAwBtD;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,UAAU,CAWpE;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,UAAU,GAAG,SAAS,GAAG;IAAE,CAAC,EAAE,MAAM,CAAA;CAAE,CAYnE;AAwBD;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,MAAM,oBAAoB,GAAG;IAClC,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAEF,wBAAgB,sBAAsB,CACrC,GAAG,EAAE,oBAAoB,GAAG,SAAS,GACnC,MAAM,GAAG,SAAS,CAGpB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,wBAAwB,CACvC,iBAAiB,EAAE,MAAM,EACzB,mBAAmB,EAAE,MAAM,GACzB,MAAM,CAQR;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE;IAC1C,iBAAiB,EAAE,MAAM,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC;CAC3B,GAAG,MAAM,CAMT;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAAC,iBAAiB,EAAE,MAAM,EAAE,kBAAkB,EAAE,MAAM,GAAG,MAAM,CAkB9F;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6DG;AACH,wBAAgB,wBAAwB,CACvC,gBAAgB,EAAE,MAAM,EACxB,iBAAiB,EAAE,MAAM,GACvB,MAAM,CAmCR;AAED;;;;GAIG;AACH,eAAO,MAAM,wBAAwB,MAAO,CAAC;AAE7C;;;;GAIG;AACH,eAAO,MAAM,0BAA0B,IAAI,CAAC;AAE5C,+EAA+E;AAC/E,eAAO,MAAM,oBAAoB,MAAM,CAAC;AAExC;;;;;;;;;;GAUG;AACH,wBAAgB,2BAA2B,CAC1C,gBAAgB,EAAE,MAAM,EACxB,iBAAiB,EAAE,MAAM,GACvB,MAAM,GAAG,SAAS,CAKpB;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,iBAAiB,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAYtG;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,UAAU,GAAG;IACtD,OAAO,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,UAAU,CAAC;CACzE,GAAG,IAAI,CASP"}
|
package/dist/oti.js
CHANGED
|
@@ -117,44 +117,6 @@ export function deriveFecInterleaveDepth(interleaveDepthMs, mediaUnitDurationMs)
|
|
|
117
117
|
}
|
|
118
118
|
return Math.max(1, Math.floor(interleaveDepthMs / mediaUnitDurationMs + 0.5));
|
|
119
119
|
}
|
|
120
|
-
/**
|
|
121
|
-
* Compute the full FEC block completion timeout from the catalog block span.
|
|
122
|
-
*
|
|
123
|
-
* The catalog's `interleaveDepthMs` IS the full FEC block span in
|
|
124
|
-
* milliseconds (draft-ramadan-moq-fec §5.1): producers emit
|
|
125
|
-
* D × unit-duration, and every symbol of a block — source and repair —
|
|
126
|
-
* arrives within that span. The full-block timeout is therefore
|
|
127
|
-
* K-INDEPENDENT:
|
|
128
|
-
*
|
|
129
|
-
* timeout = interleaveDepthMs * safetyFactor
|
|
130
|
-
*
|
|
131
|
-
* A caller that genuinely needs a per-sub-block deadline scales the block
|
|
132
|
-
* span by K_sub / K. Never scale it by a symbol count: the span already
|
|
133
|
-
* covers every symbol of the block.
|
|
134
|
-
*
|
|
135
|
-
* @param interleaveDepthMs - Full FEC block span in ms (catalog fec.interleaveDepthMs)
|
|
136
|
-
* @param safetyFactor - Jitter margin (default 3.0)
|
|
137
|
-
* @returns Timeout in milliseconds
|
|
138
|
-
*/
|
|
139
|
-
export function computeFecTimeout(interleaveDepthMs, safetyFactor = 3.0) {
|
|
140
|
-
// Finite, not merely > 0, and on BOTH arguments: the product is the caller's
|
|
141
|
-
// expiry deadline, so a non-finite either side makes every `now > deadline`
|
|
142
|
-
// comparison false and the block never expires -- strictly worse than
|
|
143
|
-
// expiring late. `NaN <= 0` is false, so a bare `> 0` guard passes it
|
|
144
|
-
// through. Both values reach here from JSON (the catalog span, and the
|
|
145
|
-
// safety factor via test-vectors/catalog-validation.json), where an
|
|
146
|
-
// overflowing literal such as `1e999` parses to Infinity -- JSON has no
|
|
147
|
-
// Infinity literal, so there is no other way to spell it.
|
|
148
|
-
if (!Number.isFinite(interleaveDepthMs) || interleaveDepthMs <= 0) {
|
|
149
|
-
throw new Error(`[FEC] interleaveDepthMs must be a finite value > 0 (got ${interleaveDepthMs}ms). Fix encoder config.`);
|
|
150
|
-
}
|
|
151
|
-
if (!Number.isFinite(safetyFactor) || safetyFactor <= 0) {
|
|
152
|
-
throw new Error(`[FEC] safetyFactor must be a finite value > 0 (got ${safetyFactor}). Fix encoder config.`);
|
|
153
|
-
}
|
|
154
|
-
// interleaveDepthMs IS the block span. K=4, D=4 at 30fps:
|
|
155
|
-
// interleaveDepthMs = 133ms → timeout = ceil(133 * 3) = 399ms.
|
|
156
|
-
return Math.ceil(interleaveDepthMs * safetyFactor);
|
|
157
|
-
}
|
|
158
120
|
/**
|
|
159
121
|
* Absolute deadline for one FEC block.
|
|
160
122
|
*
|
package/dist/oti.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oti.js","sourceRoot":"","sources":["../src/oti.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAe1D;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,QAAQ,CAAC,MAAiB;IACzC,MAAM,EACL,cAAc,EAAE,CAAC,EACjB,UAAU,EAAE,CAAC,EACb,YAAY,EAAE,CAAC,EACf,SAAS,EAAE,CAAC,EACZ,SAAS,EAAE,EAAE,GACb,GAAG,MAAM,CAAC;IACX,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAClC,MAAM,GAAG,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC;IAC/B,2DAA2D;IAC3D,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,WAAW,CAAC,GAAG,IAAI,CAAC;IAClC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC;IAC3B,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC;IAC3B,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC;IAC1B,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IAClB,mBAAmB;IACnB,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC;IAC1B,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IAClB,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IAClB,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC;IAC1B,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC;IACnB,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;IACpB,OAAO,GAAG,CAAC;AACZ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,CAAS,EAAE,CAAS;IACvD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,GAAG,CAAC,CAAC;IAChE,CAAC;IACD,OAAO,QAAQ,CAAC;QACf,cAAc,EAAE,CAAC,GAAG,CAAC;QACrB,UAAU,EAAE,CAAC;QACb,YAAY,EAAE,CAAC;QACf,SAAS,EAAE,CAAC;QACZ,SAAS,EAAE,CAAC;KACZ,CAAC,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,QAAQ,CAAC,GAAe;IACvC,IAAI,GAAG,CAAC,MAAM,KAAK,EAAE;QAAE,MAAM,IAAI,KAAK,CAAC,qCAAqC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;IAC3F,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,yCAAyC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACtF,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,WAAW,CAAC;QACxC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IACpE,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IACjC,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IACjB,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,GAAG,CAAC,EAAE,CAAC,CAAC;IAClC,MAAM,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC,CAAC;IACnB,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAClC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1C,OAAO,EAAE,cAAc,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;AAC9F,CAAC;AAED,SAAS,iBAAiB,CAAC,CAAS,EAAE,CAAS,EAAE,CAAS,EAAE,CAAS,EAAE,EAAU;IAChF,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,YAAY,EAAE,CAAC;QAC5D,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,GAAG,CAAC,CAAC;IACnE,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,GAAG,CAAC,CAAC;IAChE,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,GAAG,CAAC,CAAC;IAC9D,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,GAAG,CAAC,CAAC;IAChE,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,CAAC;QACnE,MAAM,IAAI,KAAK,CAAC,0DAA0D,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1F,CAAC;IACD,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1C,IAAI,CAAC,GAAG,MAAM,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,6CAA6C,CAAC,CAAC;IACnF,CAAC;AACF,CAAC;AAwBD,MAAM,UAAU,sBAAsB,CACrC,GAAqC;IAErC,MAAM,EAAE,GAAG,GAAG,EAAE,iBAAiB,CAAC;IAClC,OAAO,OAAO,EAAE,KAAK,QAAQ,IAAI,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;AACvF,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,wBAAwB,CACvC,iBAAyB,EACzB,mBAA2B;IAE3B,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,CAAC,IAAI,iBAAiB,IAAI,CAAC,EAAE,CAAC;QACnE,MAAM,IAAI,KAAK,CAAC,uDAAuD,iBAAiB,GAAG,CAAC,CAAC;IAC9F,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAC,IAAI,mBAAmB,IAAI,CAAC,EAAE,CAAC;QACvE,MAAM,IAAI,KAAK,CAAC,yDAAyD,mBAAmB,GAAG,CAAC,CAAC;IAClG,CAAC;IACD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,iBAAiB,GAAG,mBAAmB,GAAG,GAAG,CAAC,CAAC,CAAC;AAC/E,CAAC;AAED
|
|
1
|
+
{"version":3,"file":"oti.js","sourceRoot":"","sources":["../src/oti.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@blockcast/mmt-fec",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.1-main.2e0aa69d293d",
|
|
4
4
|
"description": "Container-agnostic FEC client for RaptorQ (RFC 6330) decoding via WASM",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
"test:watch": "vitest"
|
|
56
56
|
},
|
|
57
57
|
"dependencies": {
|
|
58
|
-
"@blockcast/mmt-base": "
|
|
58
|
+
"@blockcast/mmt-base": "0.4.1-main.2e0aa69d293d"
|
|
59
59
|
},
|
|
60
60
|
"devDependencies": {
|
|
61
61
|
"typescript": "^5.3.0",
|
package/src/block-manager.ts
CHANGED
|
@@ -10,9 +10,12 @@
|
|
|
10
10
|
* ↓
|
|
11
11
|
* FALLBACK (timeout) → WebTransport repair → DECODED
|
|
12
12
|
*
|
|
13
|
-
*
|
|
13
|
+
* Receiver behaviour (block-level reading of draft-ramadan-moq-fec-01 Section 11.4
|
|
14
|
+
* and draft-ramadan-moq-multicast-01 Section 6.2):
|
|
14
15
|
* - k source symbols complete a block (no FEC decode needed)
|
|
15
|
-
* - After timeout, missing symbols are requested via WebTransport
|
|
16
|
+
* - After timeout, missing symbols are requested via WebTransport (libmmt falls
|
|
17
|
+
* back for every block class; it does not implement the Section 11.4.1
|
|
18
|
+
* classification or the keyframe-only repair-track FETCH)
|
|
16
19
|
* - With k symbols (source + repair), FEC decode recovers block
|
|
17
20
|
*/
|
|
18
21
|
|
|
@@ -31,7 +34,7 @@ export interface FecBlockManagerOptions {
|
|
|
31
34
|
/** Block timeout (ms). Derive from catalog: interleaveDepthMs or frameDurationMs * K. Required. */
|
|
32
35
|
timeoutMs: number;
|
|
33
36
|
/** K — source symbols per block from catalog fec.sourceSymbols. Required for interleaved mode.
|
|
34
|
-
* For object FEC (
|
|
37
|
+
* For object FEC (Blockcast extension, not in draft-ramadan-moq-fec-01), this is the max K — actual K varies per block via addSourcePacket/addRepairPacket blockK param. */
|
|
35
38
|
k: number;
|
|
36
39
|
/** Max concurrent blocks in flight. Resource bound, not timing — default 64. */
|
|
37
40
|
maxBlocks?: number;
|
|
@@ -164,7 +167,7 @@ export class FecBlockManager {
|
|
|
164
167
|
|
|
165
168
|
/**
|
|
166
169
|
* Add a source symbol to a block.
|
|
167
|
-
* @param blockK — per-block K for object FEC (
|
|
170
|
+
* @param blockK — per-block K for object FEC (Blockcast extension, not in draft-ramadan-moq-fec-01). When provided, overrides
|
|
168
171
|
* the global K for this block. For interleaved mode, omit (uses global K).
|
|
169
172
|
*/
|
|
170
173
|
addSourcePacket(blockId: number, esi: number, data: Uint8Array, blockK?: number): Uint8Array | null {
|
|
@@ -237,7 +240,7 @@ export class FecBlockManager {
|
|
|
237
240
|
}
|
|
238
241
|
|
|
239
242
|
/**
|
|
240
|
-
* @param blockK — per-block K for object FEC (
|
|
243
|
+
* @param blockK — per-block K for object FEC (Blockcast extension, not in draft-ramadan-moq-fec-01). Falls back to global #k.
|
|
241
244
|
*/
|
|
242
245
|
#createBlock(blockId: number, blockK?: number): FecBlock {
|
|
243
246
|
if (this.#blocks.size >= this.maxBlocks) {
|
|
@@ -246,7 +249,7 @@ export class FecBlockManager {
|
|
|
246
249
|
|
|
247
250
|
const k = blockK ?? this.#k;
|
|
248
251
|
if (k <= 0) {
|
|
249
|
-
throw new Error(`[FecBlockManager] Cannot create block ${blockId}: K=${k}. Derive K from catalog (interleaved) or frame size (object
|
|
252
|
+
throw new Error(`[FecBlockManager] Cannot create block ${blockId}: K=${k}. Derive K from catalog (interleaved) or frame size (object FEC, a Blockcast extension).`)
|
|
250
253
|
}
|
|
251
254
|
const block = new FecBlock(blockId, k);
|
|
252
255
|
this.#blocks.set(blockId, block);
|
package/src/block-processor.ts
CHANGED
|
@@ -168,7 +168,7 @@ function parseProtectedPacket(
|
|
|
168
168
|
bump: FailureCounter,
|
|
169
169
|
): ParsedFecSymbol | null {
|
|
170
170
|
// WASM-decoded source symbols retain fecType bits from the original FFmpeg
|
|
171
|
-
// packet (fecType=1 per draft-ramadan-moq-mmt-
|
|
171
|
+
// packet (fecType=1 per draft-ramadan-moq-mmt-01 §3.1), but the 4-byte
|
|
172
172
|
// Source FEC Payload ID (ISO 23008-1 §C.5.2) is never part of the protected
|
|
173
173
|
// packet (C.4.2). Tell extractMFUPayload to skip FEC PID subtraction so it
|
|
174
174
|
// does not truncate video data; any legacy authenticator trailer must then consume the
|
package/src/index.ts
CHANGED
package/src/oti.ts
CHANGED
|
@@ -169,48 +169,6 @@ export function deriveFecInterleaveDepth(
|
|
|
169
169
|
return Math.max(1, Math.floor(interleaveDepthMs / mediaUnitDurationMs + 0.5));
|
|
170
170
|
}
|
|
171
171
|
|
|
172
|
-
/**
|
|
173
|
-
* Compute the full FEC block completion timeout from the catalog block span.
|
|
174
|
-
*
|
|
175
|
-
* The catalog's `interleaveDepthMs` IS the full FEC block span in
|
|
176
|
-
* milliseconds (draft-ramadan-moq-fec §5.1): producers emit
|
|
177
|
-
* D × unit-duration, and every symbol of a block — source and repair —
|
|
178
|
-
* arrives within that span. The full-block timeout is therefore
|
|
179
|
-
* K-INDEPENDENT:
|
|
180
|
-
*
|
|
181
|
-
* timeout = interleaveDepthMs * safetyFactor
|
|
182
|
-
*
|
|
183
|
-
* A caller that genuinely needs a per-sub-block deadline scales the block
|
|
184
|
-
* span by K_sub / K. Never scale it by a symbol count: the span already
|
|
185
|
-
* covers every symbol of the block.
|
|
186
|
-
*
|
|
187
|
-
* @param interleaveDepthMs - Full FEC block span in ms (catalog fec.interleaveDepthMs)
|
|
188
|
-
* @param safetyFactor - Jitter margin (default 3.0)
|
|
189
|
-
* @returns Timeout in milliseconds
|
|
190
|
-
*/
|
|
191
|
-
export function computeFecTimeout(
|
|
192
|
-
interleaveDepthMs: number,
|
|
193
|
-
safetyFactor: number = 3.0,
|
|
194
|
-
): number {
|
|
195
|
-
// Finite, not merely > 0, and on BOTH arguments: the product is the caller's
|
|
196
|
-
// expiry deadline, so a non-finite either side makes every `now > deadline`
|
|
197
|
-
// comparison false and the block never expires -- strictly worse than
|
|
198
|
-
// expiring late. `NaN <= 0` is false, so a bare `> 0` guard passes it
|
|
199
|
-
// through. Both values reach here from JSON (the catalog span, and the
|
|
200
|
-
// safety factor via test-vectors/catalog-validation.json), where an
|
|
201
|
-
// overflowing literal such as `1e999` parses to Infinity -- JSON has no
|
|
202
|
-
// Infinity literal, so there is no other way to spell it.
|
|
203
|
-
if (!Number.isFinite(interleaveDepthMs) || interleaveDepthMs <= 0) {
|
|
204
|
-
throw new Error(`[FEC] interleaveDepthMs must be a finite value > 0 (got ${interleaveDepthMs}ms). Fix encoder config.`);
|
|
205
|
-
}
|
|
206
|
-
if (!Number.isFinite(safetyFactor) || safetyFactor <= 0) {
|
|
207
|
-
throw new Error(`[FEC] safetyFactor must be a finite value > 0 (got ${safetyFactor}). Fix encoder config.`);
|
|
208
|
-
}
|
|
209
|
-
// interleaveDepthMs IS the block span. K=4, D=4 at 30fps:
|
|
210
|
-
// interleaveDepthMs = 133ms → timeout = ceil(133 * 3) = 399ms.
|
|
211
|
-
return Math.ceil(interleaveDepthMs * safetyFactor);
|
|
212
|
-
}
|
|
213
|
-
|
|
214
172
|
/**
|
|
215
173
|
* Absolute deadline for one FEC block.
|
|
216
174
|
*
|