f4f6c5556f
ci / docs-site (push) Successful in 1m0s
ci / web (push) Successful in 1m0s
decky / build-publish (push) Successful in 19s
docker / build-push (--build-arg FEDORA_VERSION=44, ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora44-rpm) (push) Successful in 10s
docker / build-push (., web/Dockerfile, punktfunk-web) (push) Successful in 7s
docker / build-push (ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora-rpm) (push) Successful in 8s
docker / build-push (ci, ci/rust-ci.Dockerfile, punktfunk-rust-ci) (push) Successful in 8s
docker / build-push (docs-site, docs-site/Dockerfile, punktfunk-docs) (push) Successful in 8s
ci / bench (push) Successful in 6m4s
windows-host / package (push) Successful in 9m3s
flatpak / build-publish (push) Failing after 8m2s
docker / deploy-docs (push) Successful in 24s
deb / build-publish (push) Successful in 12m19s
android / android (push) Successful in 12m46s
windows-msix / package (arm64, C:\Users\Public\ffmpeg-arm64, --no-default-features, aarch64-pc-windows-msvc, C:\t-a64) (push) Successful in 4m22s
arch / build-publish (push) Successful in 14m45s
windows-msix / package (x64, C:\Users\Public\ffmpeg, , x86_64-pc-windows-msvc, C:\t) (push) Successful in 3m37s
rpm / build-publish (44, fedora-44, punktfunk-fedora44-rpm) (push) Successful in 13m42s
rpm / build-publish (43, bazzite, punktfunk-fedora-rpm) (push) Successful in 17m34s
windows / build (aarch64-pc-windows-msvc) (push) Successful in 4m57s
ci / rust (push) Successful in 23m21s
windows / build (x86_64-pc-windows-msvc) (push) Successful in 5m57s
release / apple (push) Has been cancelled
apple / screenshots (push) Has been cancelled
apple / swift (push) Has been cancelled
Phase 1.4 (throughput-beyond-1gbps.md): the send path built a fresh erasure codec and allocated fresh parity Vecs for every FEC block. New trait method ErasureCoder::encode_into generates parity into caller-pooled buffers; the packetizer keeps one parity pool that grows once to the session's high-water recovery count. - gf16: one cached reed_solomon_simd::ReedSolomonEncoder per coder, re-shaped per block via reset() (reuses its working space) — the old encode() convenience call paid engine CPU-feature detection, FFT planning, and work-buffer allocation per block. - gf8: last-used (k, m) Cauchy codec cached, so the generator-matrix build drops out of steady-state frames; parity buffers shaped without re-zeroing (encode_sep's first-input pass overwrites every row). The GameStream VideoPacketizer now owns a persistent coder so the cache survives frames. - encode() delegates to encode_into — one code path, and the nanors byte-exact parity vector keeps pinning Moonlight wire compatibility. Validated: 145 core + 308 host tests + clippy -D warnings on .21, loss-harness recovery curve identical, pipeline bench +0.6-2.4% thrpt (all configs, p<0.05; the loopback bench is encoder-dominated so the alloc savings mostly land outside it). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
215 lines
8.1 KiB
Rust
215 lines
8.1 KiB
Rust
//! GF(2⁸) classic Reed–Solomon backend (vendored `fec-rs`). Uses the **Cauchy** generator
|
||
//! matrix `M[j][i] = inv[(m+i)^j]` over GF(2⁸) (poly 0x1d) — byte-identical to the `nanors`
|
||
//! library Moonlight uses, so the parity this produces is recoverable by a stock Moonlight
|
||
//! client (unlike Vandermonde RS, whose parity is not interoperable). Hard ceiling: data +
|
||
//! recovery ≤ 255 shards/block.
|
||
|
||
use super::{
|
||
validate_block_shape, validate_encode_shape, validate_into_shape, ErasureCoder, FecError,
|
||
};
|
||
use crate::config::FecScheme;
|
||
use fec_rs::ReedSolomon;
|
||
use std::sync::Mutex;
|
||
|
||
#[derive(Default)]
|
||
pub struct Gf8Coder {
|
||
/// Last-used Cauchy codec, keyed by its `(k, m)` shape (plan Phase 1.4): video blocks
|
||
/// keep one shape for long stretches (it only moves with frame size / adaptive-FEC
|
||
/// steps), so caching the matrix kills the per-block generator construction. `Mutex`
|
||
/// only to keep the `&self` trait surface; uncontended on the one send thread.
|
||
rs: Mutex<Option<(usize, usize, ReedSolomon)>>,
|
||
}
|
||
|
||
impl ErasureCoder for Gf8Coder {
|
||
fn scheme(&self) -> FecScheme {
|
||
FecScheme::Gf8
|
||
}
|
||
|
||
fn encode(&self, data: &[&[u8]], recovery_count: usize) -> Result<Vec<Vec<u8>>, FecError> {
|
||
let mut out = Vec::new();
|
||
self.encode_into(data, recovery_count, &mut out)?;
|
||
Ok(out)
|
||
}
|
||
|
||
fn encode_into(
|
||
&self,
|
||
data: &[&[u8]],
|
||
recovery_count: usize,
|
||
out: &mut Vec<Vec<u8>>,
|
||
) -> Result<(), FecError> {
|
||
if recovery_count == 0 {
|
||
out.clear();
|
||
return Ok(());
|
||
}
|
||
validate_encode_shape(data)?;
|
||
let k = data.len();
|
||
let shard_len = data[0].len();
|
||
let mut guard = self.rs.lock().unwrap_or_else(|p| p.into_inner());
|
||
let cached = matches!(&*guard, Some((ck, cm, _)) if *ck == k && *cm == recovery_count);
|
||
if !cached {
|
||
let rs = ReedSolomon::new(k, recovery_count)
|
||
.map_err(|_| FecError::Config("invalid GF(2^8) shard counts"))?;
|
||
*guard = Some((k, recovery_count, rs));
|
||
}
|
||
let rs = &guard.as_ref().expect("cache populated above").2;
|
||
// Shape the caller's pooled parity buffers without zero-filling: `encode_sep`'s
|
||
// first-input pass overwrites every parity row, so stale bytes never survive.
|
||
out.truncate(recovery_count);
|
||
for buf in out.iter_mut() {
|
||
buf.resize(shard_len, 0);
|
||
}
|
||
while out.len() < recovery_count {
|
||
out.push(vec![0u8; shard_len]);
|
||
}
|
||
// `encode_sep` reads the data shards by reference and fills the parity in place —
|
||
// same Cauchy codec as `encode`, without copying the data into a shards scratch.
|
||
rs.encode_sep(data, out)
|
||
.map_err(|_| FecError::Backend("gf8 encode"))?;
|
||
Ok(())
|
||
}
|
||
|
||
fn reconstruct(
|
||
&self,
|
||
data_count: usize,
|
||
recovery_count: usize,
|
||
received: &mut [Option<Vec<u8>>],
|
||
) -> Result<Vec<Vec<u8>>, FecError> {
|
||
validate_block_shape(received, data_count, recovery_count)?;
|
||
let present = received.iter().filter(|s| s.is_some()).count();
|
||
if present < data_count {
|
||
return Err(FecError::TooFewShards {
|
||
have: present,
|
||
need: data_count,
|
||
});
|
||
}
|
||
if recovery_count == 0 {
|
||
// No FEC: every original must already be present.
|
||
return collect_originals(received, data_count);
|
||
}
|
||
let rs = ReedSolomon::new(data_count, recovery_count)
|
||
.map_err(|_| FecError::Config("invalid GF(2^8) shard counts"))?;
|
||
rs.reconstruct_data(received)
|
||
.map_err(|_| FecError::Backend("gf8 reconstruct"))?;
|
||
collect_originals(received, data_count)
|
||
}
|
||
|
||
fn reconstruct_into(
|
||
&self,
|
||
recovery_count: usize,
|
||
data: &mut [&mut [u8]],
|
||
have: &[bool],
|
||
recovery: &[(usize, &[u8])],
|
||
) -> Result<(), FecError> {
|
||
validate_into_shape(data, have, recovery, recovery_count)?;
|
||
if have.iter().all(|h| *h) {
|
||
return Ok(());
|
||
}
|
||
// Legacy-scheme shim: fec-rs reconstructs through owned `Option<Vec<u8>>` slots, so copy
|
||
// the present shards into that shape and the recovered ones back out. Only P1/gf8
|
||
// sessions on loss pay this — the hot gf16 path decodes straight into the caller's slots.
|
||
let data_count = data.len();
|
||
let mut received: Vec<Option<Vec<u8>>> = Vec::with_capacity(data_count + recovery_count);
|
||
for (s, h) in data.iter().zip(have) {
|
||
received.push(h.then(|| s.to_vec()));
|
||
}
|
||
received.resize(data_count + recovery_count, None);
|
||
for &(j, bytes) in recovery {
|
||
received[data_count + j] = Some(bytes.to_vec());
|
||
}
|
||
let rs = ReedSolomon::new(data_count, recovery_count)
|
||
.map_err(|_| FecError::Config("invalid GF(2^8) shard counts"))?;
|
||
rs.reconstruct_data(&mut received)
|
||
.map_err(|_| FecError::Backend("gf8 reconstruct"))?;
|
||
for (i, h) in have.iter().enumerate() {
|
||
if !*h {
|
||
let shard = received[i]
|
||
.as_ref()
|
||
.ok_or(FecError::Backend("reconstruction left an original missing"))?;
|
||
data[i].copy_from_slice(shard);
|
||
}
|
||
}
|
||
Ok(())
|
||
}
|
||
}
|
||
|
||
fn collect_originals(
|
||
received: &[Option<Vec<u8>>],
|
||
data_count: usize,
|
||
) -> Result<Vec<Vec<u8>>, FecError> {
|
||
let mut out = Vec::with_capacity(data_count);
|
||
for slot in received.iter().take(data_count) {
|
||
out.push(
|
||
slot.clone()
|
||
.ok_or(FecError::Backend("reconstruction left an original missing"))?,
|
||
);
|
||
}
|
||
Ok(out)
|
||
}
|
||
|
||
#[cfg(test)]
|
||
mod tests {
|
||
use super::*;
|
||
|
||
/// Locks byte-exact compatibility with Moonlight's `nanors` (Cauchy matrix
|
||
/// `M[j][i] = inv[(m+i)^j]`, GF(2⁸) poly 0x1d). If the backend ever switched matrices,
|
||
/// these vectors would break and our parity would no longer be Moonlight-decodable.
|
||
#[test]
|
||
fn nanors_exact_parity_vectors() {
|
||
let coder = Gf8Coder::default();
|
||
// The definitive nanors vector (k=4, m=2): single-byte shards [10,20,30,40] → [136, 0].
|
||
let data: [&[u8]; 4] = [&[10u8], &[20], &[30], &[40]];
|
||
let parity = coder.encode(&data, 2).unwrap();
|
||
assert_eq!(parity, vec![vec![136u8], vec![0u8]]);
|
||
|
||
// Cross-check independently from the Cauchy parity rows (proves the matrix, not just a
|
||
// memorized output): parity[j] = XOR_i M[j][i] · data[i] over GF(2⁸).
|
||
let rows = [[142u8, 244, 71, 167], [244, 142, 167, 71]];
|
||
let din = [10u8, 20, 30, 40];
|
||
for (j, row) in rows.iter().enumerate() {
|
||
let expect = row
|
||
.iter()
|
||
.zip(din)
|
||
.fold(0u8, |acc, (&m, d)| acc ^ gf_mul(m, d));
|
||
assert_eq!(parity[j][0], expect, "parity row {j}");
|
||
}
|
||
}
|
||
|
||
/// Round-trip: erase `m` data shards and confirm reconstruction recovers the originals.
|
||
#[test]
|
||
fn recovers_erased_data_shards() {
|
||
let coder = Gf8Coder::default();
|
||
let data: Vec<Vec<u8>> = (0..6).map(|i| vec![i as u8; 8]).collect();
|
||
let refs: Vec<&[u8]> = data.iter().map(|s| s.as_slice()).collect();
|
||
let parity = coder.encode(&refs, 3).unwrap();
|
||
let mut received: Vec<Option<Vec<u8>>> = data
|
||
.iter()
|
||
.cloned()
|
||
.map(Some)
|
||
.chain(parity.into_iter().map(Some))
|
||
.collect();
|
||
// Erase 3 data shards (the FEC budget) + nothing else.
|
||
received[1] = None;
|
||
received[3] = None;
|
||
received[5] = None;
|
||
let recovered = coder.reconstruct(6, 3, &mut received).unwrap();
|
||
assert_eq!(recovered, data);
|
||
}
|
||
|
||
/// GF(2⁸) multiply, reduction poly 0x1d — independent of the backend.
|
||
fn gf_mul(mut a: u8, mut b: u8) -> u8 {
|
||
let mut p = 0u8;
|
||
for _ in 0..8 {
|
||
if b & 1 != 0 {
|
||
p ^= a;
|
||
}
|
||
let hi = a & 0x80;
|
||
a <<= 1;
|
||
if hi != 0 {
|
||
a ^= 0x1d;
|
||
}
|
||
b >>= 1;
|
||
}
|
||
p
|
||
}
|
||
}
|