86526a7ad4
Phase 0 of the DRED integration (docs/PRD-dred-integration.md). No behavior change: inband FEC stays ON, no DRED, same bitrate, same quality. This commit unblocks Phase 1+ by getting us onto libopus 1.5.2 where DRED lives. Rationale for going straight to a custom DecoderHandle: opusic-c::Decoder's inner *mut OpusDecoder pointer is pub(crate), so we cannot reach it for the Phase 3 DRED reconstruction path. Running two parallel decoders (one for audio, one for DRED) would drift because the DRED decoder wouldn't see normal decode calls. Single unified DecoderHandle over raw opusic-sys is the only correct architecture, so we build it in Phase 0 rather than rewriting opus_dec.rs twice. Changes: - Cargo.toml (workspace + wzp-codec): remove audiopus 0.3.0-rc.0, add opusic-c 1.5.5 (bundled + dred features), opusic-sys 0.6.0 (bundled), bytemuck 1. Pinned exactly for reproducible libopus 1.5.2. - opus_enc.rs: rewritten against opusic_c::Encoder. Argument order for Encoder::new swapped (Channels first). set_inband_fec(bool) now maps to InbandFec::Mode1 (the libopus 1.5 equivalent of 1.3's LBRR). encode uses bytemuck::cast_slice<i16,u16> at the &[u16] boundary. - dred_ffi.rs (new): DecoderHandle wrapping *mut OpusDecoder directly via opusic-sys. Owns the allocation, frees on Drop. Exposes decode, decode_lost, and a pub(crate) as_raw_ptr() for the future Phase 3 DRED reconstruction. Send+Sync justified via &mut self access discipline. - opus_dec.rs: rewritten as a thin AudioDecoder impl over DecoderHandle. Behavior identical to pre-swap. Verification (Phase 0 acceptance gates): - cargo check --workspace: clean (30 pre-existing warnings in jni_bridge.rs unrelated to this work; zero in changed files). - cargo test -p wzp-codec: 53 tests pass (50 pre-swap + 6 new: 3 in dred_ffi.rs for DecoderHandle lifecycle, 3 in opus_enc.rs for version check and roundtrip). - linked_libopus_is_1_5 test asserts opusic_c::version() contains "1.5" — hard signal that the swap landed correctly. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
91 lines
2.7 KiB
TOML
91 lines
2.7 KiB
TOML
[workspace]
|
|
resolver = "2"
|
|
members = [
|
|
"crates/wzp-proto",
|
|
"crates/wzp-codec",
|
|
"crates/wzp-fec",
|
|
"crates/wzp-crypto",
|
|
"crates/wzp-transport",
|
|
"crates/wzp-relay",
|
|
"crates/wzp-client",
|
|
"crates/wzp-web",
|
|
"crates/wzp-android",
|
|
"crates/wzp-native",
|
|
"desktop/src-tauri",
|
|
]
|
|
|
|
[workspace.package]
|
|
version = "0.1.0"
|
|
edition = "2024"
|
|
license = "MIT OR Apache-2.0"
|
|
rust-version = "1.85"
|
|
|
|
[workspace.dependencies]
|
|
# Shared
|
|
bytes = "1"
|
|
thiserror = "2"
|
|
async-trait = "0.1"
|
|
tokio = { version = "1", features = ["full"] }
|
|
tracing = "0.1"
|
|
tracing-subscriber = "0.3"
|
|
serde = { version = "1", features = ["derive"] }
|
|
|
|
# Transport
|
|
quinn = "0.11"
|
|
|
|
# FEC
|
|
raptorq = "2"
|
|
|
|
# Codec
|
|
# opusic-c: high-level safe bindings over libopus 1.5.2 (encoder side).
|
|
# opusic-sys: raw FFI for the decoder side — we build our own DecoderHandle
|
|
# because opusic-c::Decoder.inner is pub(crate) and cannot be reached for the
|
|
# Phase 3 DRED reconstruction path. See docs/PRD-dred-integration.md.
|
|
# Pinned exactly (no caret) for reproducible libopus 1.5.2 across the fleet.
|
|
opusic-c = { version = "=1.5.5", default-features = false, features = ["bundled", "dred"] }
|
|
opusic-sys = { version = "=0.6.0", default-features = false, features = ["bundled"] }
|
|
bytemuck = "1"
|
|
codec2 = "0.3"
|
|
|
|
# Crypto
|
|
x25519-dalek = { version = "2", features = ["static_secrets"] }
|
|
ed25519-dalek = { version = "2", features = ["rand_core", "pkcs8"] }
|
|
chacha20poly1305 = "0.10"
|
|
hkdf = "0.12"
|
|
sha2 = "0.10"
|
|
rand = "0.8"
|
|
|
|
# Workspace crates
|
|
wzp-proto = { path = "crates/wzp-proto" }
|
|
wzp-codec = { path = "crates/wzp-codec" }
|
|
wzp-fec = { path = "crates/wzp-fec" }
|
|
wzp-crypto = { path = "crates/wzp-crypto" }
|
|
wzp-transport = { path = "crates/wzp-transport" }
|
|
wzp-client = { path = "crates/wzp-client" }
|
|
|
|
# Fast dev profile: optimized but with debug info and incremental compilation.
|
|
# Use with: cargo run --profile dev-fast
|
|
[profile.dev-fast]
|
|
inherits = "dev"
|
|
opt-level = 2
|
|
|
|
# Optimize heavy compute deps even in debug builds —
|
|
# real-time audio needs < 20ms per frame, impossible unoptimized.
|
|
[profile.dev.package.nnnoiseless]
|
|
opt-level = 3
|
|
[profile.dev.package.opusic-sys]
|
|
opt-level = 3
|
|
[profile.dev.package.raptorq]
|
|
opt-level = 3
|
|
[profile.dev.package.wzp-codec]
|
|
opt-level = 3
|
|
[profile.dev.package.wzp-fec]
|
|
opt-level = 3
|
|
|
|
# Phase 0 (opus-DRED): removed the [patch.crates-io] audiopus_sys = { path =
|
|
# "vendor/audiopus_sys" } block. That patch existed to fix a Windows clang-cl
|
|
# SIMD compile bug in libopus 1.3.1. With the swap to opusic-sys (libopus
|
|
# 1.5.2), the upstream SIMD gating was fixed and the vendor patch is
|
|
# obsolete. The vendor/audiopus_sys directory itself should be deleted as
|
|
# part of the same cleanup — see the commit that follows this Phase 0.
|