enricobuehlerandClaude Opus 4.8
2064c0780c
origin/main landed the shared clipboard (design/clipboard-and-file-transfer.md) while
this branch split quic/msgs.rs -> quic/{caps,control,...} and client.rs ->
client/{mod,control,worker,pump,planes,...} (W7) and deleted the two monoliths. The
feature had modified both deleted files, so its delta is re-applied onto the split
instead of resurrecting the monoliths:
- HOST_CAP_CLIPBOARD -> quic/caps.rs
- MSG_CLIP_* / CLIP_* consts, the six Clip*
structs, and their encode/decode impls -> quic/control.rs (beside the clock codecs)
- CtrlRequest::{ClipControl,ClipOffer} +
Negotiated.host_caps -> client/control.rs
- WorkerArgs.{clip_event_tx,clip_cmd_rx} -> client/worker.rs
- CLIP_EVENT_QUEUE -> client/planes.rs
- NativeClient clip fields, the 7 clip_* /
host_caps / next_clip methods, connect()
channel wiring -> client/mod.rs
- the control-task encode/decode arms and
the clipboard-task spawn -> client/pump.rs
Cargo.lock reconciled (adds pf-clipboard), punktfunk-host/Cargo.toml unions the W6
pf-* subsystem deps with pf-clipboard, and include/punktfunk_core.h is the cbindgen
union (clipboard + rumble C-ABI). punktfunk-core builds --all-features and its 174
lib tests pass, including quic::tests::clip_loopback.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
69 lines
3.8 KiB
Rust
69 lines
3.8 KiB
Rust
//! `CtrlRequest` (the embedder's control-stream requests) and `Negotiated` (the handshake result).
|
|
|
|
use crate::config::{CompositorPref, GamepadPref, Mode};
|
|
use crate::quic::{ClipControl, ClipOffer, ColorInfo, LossReport, ProbeRequest, RfiRequest};
|
|
|
|
/// A control-stream request the embedder makes on the open handshake stream: a mode switch or a
|
|
/// speed test. One outbound channel carries both so the worker's `select!` has a single writer
|
|
/// (two `&mut ctrl_send` borrows across select branches don't compile).
|
|
pub(crate) enum CtrlRequest {
|
|
Mode(Mode),
|
|
Probe(ProbeRequest),
|
|
Keyframe,
|
|
/// Reference-frame-invalidation recovery: the client saw a `frame_index` gap and reports the
|
|
/// invalidation range so an RFI-capable host re-references a known-good picture instead of
|
|
/// forcing a full IDR. See [`RfiRequest`].
|
|
Rfi(RfiRequest),
|
|
Loss(LossReport),
|
|
/// Adaptive bitrate: ask the host to re-target its encoder (kbps). Sent by the pump's
|
|
/// [`BitrateController`] when the user's bitrate setting is Automatic.
|
|
SetBitrate(u32),
|
|
/// Start a mid-stream clock re-sync batch now (see [`ClockResync`]). Sent by the pump on
|
|
/// its report tick after the first no-op clock flush — the "the clock stepped under me"
|
|
/// signal; the control task also self-triggers one every [`CLOCK_RESYNC_INTERVAL`].
|
|
ClockResync,
|
|
/// Shared-clipboard enable/disable for this session (`design/clipboard-and-file-transfer.md`
|
|
/// §3.1). Idempotent; carries the file-permission flag.
|
|
ClipControl(ClipControl),
|
|
/// Announce that the local clipboard changed — the lazy format-list offer (bytes cross later on
|
|
/// a fetch stream). Symmetric message; the host may send one too.
|
|
ClipOffer(ClipOffer),
|
|
}
|
|
|
|
/// What the worker reports to [`NativeClient::connect`] once the handshake lands: the
|
|
/// [`Welcome`]-resolved session parameters (mode, backends, encode/colour/audio geometry) plus the
|
|
/// host certificate fingerprint and the connect-time clock offset. Mirrored one-to-one onto the
|
|
/// public `NativeClient` fields of the same names.
|
|
#[derive(Clone, Copy)]
|
|
pub(crate) struct Negotiated {
|
|
pub(crate) mode: Mode,
|
|
/// Wire shard payload — the chunk-aligned parse window (plan §4.4).
|
|
pub(crate) shard_payload: u16,
|
|
pub(crate) compositor: CompositorPref,
|
|
pub(crate) gamepad: GamepadPref,
|
|
/// SHA-256 of the certificate the host actually presented (TOFU callers persist this).
|
|
pub(crate) host_fingerprint: [u8; 32],
|
|
/// The encoder bitrate the host actually configured (kbps); `0` = an older host.
|
|
pub(crate) bitrate_kbps: u32,
|
|
/// Host clock minus client clock (ns); `0` = no skew handshake (old host / synced clocks).
|
|
pub(crate) clock_offset_ns: i64,
|
|
/// Min RTT of the connect-time skew handshake (ns); `None` = the host never answered —
|
|
/// mid-stream re-syncs are pointless then and stay off. The re-sync acceptance guard
|
|
/// compares each batch against this baseline ([`accept_resync`]).
|
|
pub(crate) clock_rtt_ns: Option<u64>,
|
|
/// Resolved encode bit depth: `8`, or `10` for a Main10 / HDR session.
|
|
pub(crate) bit_depth: u8,
|
|
/// Resolved CICP colour signalling.
|
|
pub(crate) color: ColorInfo,
|
|
/// Resolved chroma subsampling as the HEVC `chroma_format_idc` (1 = 4:2:0, 3 = 4:4:4).
|
|
pub(crate) chroma_format: u8,
|
|
/// Resolved audio channel count (2/6/8) — what the Opus decoders must be built from.
|
|
pub(crate) audio_channels: u8,
|
|
/// The single codec the host will emit (`quic::CODEC_*`).
|
|
pub(crate) codec: u8,
|
|
/// The host capability bitfield ([`crate::quic::Welcome::host_caps`]):
|
|
/// [`crate::quic::HOST_CAP_GAMEPAD_STATE`], [`crate::quic::HOST_CAP_CLIPBOARD`]. Exposed to the
|
|
/// embedder via [`NativeClient::host_caps`] so a native client greys out unsupported toggles.
|
|
pub(crate) host_caps: u8,
|
|
}
|