89ff326ebf
design/midstream-resolution-resize.md Phase 2, Apple client. The stream mode follows the session window/scene: a windowed macOS window resize or an iPad Stage Manager / Split View scene change renegotiates the host's virtual display + encoder via the existing PunktfunkConnection.requestMode, so a windowed session streams native-resolution pixels instead of scaling. Decode/present need nothing — VideoToolbox recreates its session on the keyframe-derived format-description change (§1 table). - MatchWindowFollower (new): the shared D2 trigger discipline — physical pixels even-floored + clamped ≥320×200, debounce to resize-end, ≥1 s between requests, skip a size equal to the live mode, request each distinct size at most once (stops re-asking a rejected size / looping on a host rollback). Pure normalize/request core is unit-tested (MatchWindowTests). - macOS StreamLayerView: fed from layoutPresenter() (bounds → convertToBacking), guarded to once-in-a-window. - iOS StreamViewController: fed from viewDidLayoutSubviews (bounds × render scale); iOS-only (iPhone fullscreen no-ops, tvOS uses AVDisplayManager). - Settings: "Match window" toggle in the Stream mode section (iOS + macOS), DefaultsKey.matchWindow, read per session by the follower. Verified on a Linux Swift 6.1.2 toolchain (the app target needs AppKit/UIKit, unavailable here): the real MatchWindowFollower.swift type-checks in Swift 5 mode against a connection stub, and the pure discipline + the follower's decision path pass a standalone harness (drag-settle + grow → exactly two switches, refresh preserved, no re-request loop). A full build + on-device run (macOS window, iPad Stage Manager) remains for a Mac. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
110 lines
8.2 KiB
Swift
110 lines
8.2 KiB
Swift
// One source of truth for the client's UserDefaults / @AppStorage keys. A magic-string key
|
|
// duplicated across a setting's writer (a Settings @AppStorage) and reader (e.g. a stream view
|
|
// reading UserDefaults) splits silently on a typo — the setting just stops taking effect. These
|
|
// live in PunktfunkKit because both the app and the kit's views read them.
|
|
|
|
import Foundation
|
|
|
|
/// Persisted-setting keys. The string VALUES are stable on disk — rename the symbol freely, but
|
|
/// never the string (it would orphan everyone's saved value).
|
|
public enum DefaultsKey {
|
|
public static let streamWidth = "punktfunk.width"
|
|
public static let streamHeight = "punktfunk.height"
|
|
public static let streamHz = "punktfunk.hz"
|
|
/// Match-window resolution policy (design/midstream-resolution-resize.md D1/D2): when on, the
|
|
/// stream mode FOLLOWS the session view — the connect asks for the view's pixel size and a
|
|
/// mid-session resize (a windowed macOS window, an iPad Stage Manager / Split View scene)
|
|
/// renegotiates the host's virtual display + encoder (`PunktfunkConnection.requestMode`), so a
|
|
/// windowed session streams native-resolution pixels instead of scaling. Off (default): the
|
|
/// explicit `streamWidth`/`streamHeight` are used and never auto-resized (a fullscreen session
|
|
/// is native either way, so this degenerates to Auto-native there). Read per session by the
|
|
/// stream views' `MatchWindowFollower`.
|
|
public static let matchWindow = "punktfunk.matchWindow"
|
|
public static let compositor = "punktfunk.compositor"
|
|
public static let gamepadType = "punktfunk.gamepadType"
|
|
public static let gamepadID = "punktfunk.gamepadID"
|
|
public static let bitrateKbps = "punktfunk.bitrateKbps"
|
|
/// Requested audio channel count: 2 (stereo), 6 (5.1) or 8 (7.1). The host clamps to what it
|
|
/// can capture; the resolved count drives the in-core decode + AVAudioEngine layout.
|
|
public static let audioChannels = "punktfunk.audioChannels"
|
|
/// Preferred video codec: `"auto"` (host decides), `"hevc"`, or `"h264"`. A soft preference —
|
|
/// the host emits it when it can, else falls back. Drives the decoder via `Welcome.codec`.
|
|
public static let codec = "punktfunk.codec"
|
|
public static let micEnabled = "punktfunk.micEnabled"
|
|
public static let speakerUID = "punktfunk.speakerUID"
|
|
public static let micUID = "punktfunk.micUID"
|
|
/// macOS: which input channel of the chosen mic device feeds the host. 0 = "Auto" (sum every
|
|
/// channel to mono — a mic on a single input of a multi-channel interface passes at full
|
|
/// level); n≥1 pins 1-based input channel n. Multi-channel interfaces expose the mic on ONE
|
|
/// discrete channel, and the default N→stereo downmix grabs channels 0/1 (silence when the mic
|
|
/// is higher up), so we fold to mono ourselves. Only meaningful for multi-channel devices.
|
|
public static let micChannel = "punktfunk.micChannel"
|
|
/// Which presenter runs a session: "stage2" (default — explicit decode + Metal present on
|
|
/// frame arrival), "stage3" (same pipeline, glass-gated present pacing — the experimental
|
|
/// low-display-latency A/B; see Stage2Pipeline's PresentPacing), or "stage1" (DEBUG-only
|
|
/// system-layer fallback). Resolved once per session by SessionPresenter;
|
|
/// PUNKTFUNK_PRESENTER=stage1|stage2|stage3 overrides it for A/B.
|
|
public static let presenter = "punktfunk.presenter"
|
|
/// macOS: V-Sync the stream's presents — each decoded frame flips on the next display vsync
|
|
/// (evenly paced, no tearing under direct scanout) instead of as soon as the GPU finishes
|
|
/// (lowest latency — the default, OFF). Resolved once per session;
|
|
/// PUNKTFUNK_PRESENT_MODE=immediate|vsync overrides it for A/B. See Stage2Pipeline's header.
|
|
public static let vsync = "punktfunk.vsync"
|
|
/// Allow variable refresh rate: hand the display link a wide frame-rate RANGE (low floor,
|
|
/// preferred = stream rate) so a ProMotion / adaptive-sync display can vary its physical
|
|
/// refresh to match the stream. On by default; a no-op on fixed-refresh displays. When off,
|
|
/// macOS lets the link free-run at the display's native rate and iOS keeps its proven 30 Hz
|
|
/// floor. Read per session/reconfigure by `SessionPresenter.syncFrameRate`.
|
|
public static let allowVRR = "punktfunk.allowVRR"
|
|
/// Request a 10-bit BT.2020 PQ (HDR10) stream. On by default; only takes effect when the host
|
|
/// has HDR content AND this display supports HDR — otherwise the stream stays 8-bit SDR.
|
|
public static let hdrEnabled = "punktfunk.hdrEnabled"
|
|
/// Request a full-chroma 4:4:4 stream when this device can HARDWARE-decode it (`Stage444Probe`).
|
|
/// On by default; only takes effect when the host also opted in to 4:4:4 (otherwise the stream
|
|
/// stays 4:2:0). Sharper text/UI at the cost of more bandwidth.
|
|
public static let enable444 = "punktfunk.enable444"
|
|
public static let hosts = "punktfunk.hosts"
|
|
/// Client-side cursor mode: "auto" (shown only in gamescope sessions), "always", "never".
|
|
public static let cursorMode = "punktfunk.cursorMode"
|
|
/// iPad: capture the mouse/trackpad pointer (pointer lock → relative movement) for games,
|
|
/// rather than forwarding an absolute cursor position. On by default. Only meaningful on iPad
|
|
/// with a hardware mouse/trackpad; the system grants the lock only to a full-screen, frontmost
|
|
/// scene and silently falls back to the absolute pointer when it can't (Stage Manager / Slide
|
|
/// Over). Read by `StreamViewController.prefersPointerLocked`.
|
|
public static let pointerCapture = "punktfunk.pointerCapture"
|
|
/// iPhone/iPad: how touchscreen fingers drive the host — a `TouchInputMode` raw value:
|
|
/// "trackpad" (default: relative cursor with tap-click / two-finger-scroll gestures),
|
|
/// "pointer" (the cursor jumps to the finger), or "touch" (real multi-touch passthrough).
|
|
/// Read live per gesture by `StreamLayerUIView`.
|
|
public static let touchMode = "punktfunk.touchMode"
|
|
/// Experimental: show the host's game library (browsed over the management API). Off by default.
|
|
public static let libraryEnabled = "punktfunk.libraryEnabled"
|
|
/// macOS: take the window fullscreen while streaming and restore it on the host list. On by default.
|
|
public static let fullscreenWhileStreaming = "punktfunk.fullscreenWhileStreaming"
|
|
/// LEGACY (pre-tiered overlay): the old boolean stats-overlay toggle. Kept ONLY as the
|
|
/// migration fallback `StatsVerbosity.current` reads when `statsVerbosity` was never
|
|
/// written (absent-or-true → .normal, explicit false → .off). Never written anymore.
|
|
public static let hudEnabled = "punktfunk.hudEnabled"
|
|
/// The statistics overlay tier — a `StatsVerbosity` raw value ("off"/"compact"/"normal"/
|
|
/// "detailed"). Absent → migrated from the legacy `hudEnabled` bool (see above). Cycle it
|
|
/// while streaming with ⌃⌥⇧S (the cross-client Ctrl+Alt+Shift+S; macOS / hardware
|
|
/// keyboard) or a three-finger tap (touch), matching the Android client.
|
|
public static let statsVerbosity = "punktfunk.statsVerbosity"
|
|
/// Which corner the statistics overlay sits in — a `HUDPlacement` raw value
|
|
/// ("topLeading"/"topTrailing"/"bottomLeading"/"bottomTrailing"). Default top-trailing.
|
|
public static let hudPlacement = "punktfunk.hudPlacement"
|
|
/// iOS/iPadOS/macOS: switch the host list, settings and game library to a controller-friendly
|
|
/// layout (the console launcher, gamepad-navigable settings, a coverflow-style library)
|
|
/// whenever a gamepad is connected. On by default; see `GamepadUIEnvironment.isActive`.
|
|
public static let gamepadUIEnabled = "punktfunk.gamepadUIEnabled"
|
|
}
|
|
|
|
extension Notification.Name {
|
|
/// Posted by the app's Stream menu ("Release Mouse", ⌃⌥⇧Q): the key window's stream view
|
|
/// releases input capture if it holds it. Only reachable while NOT captured (a captured
|
|
/// session swallows the combo in InputCapture's monitor and the frozen cursor can't click
|
|
/// menus) — it exists so the menu item is honest whenever it CAN fire, and as the shortcut's
|
|
/// discoverable menu-bar surface.
|
|
public static let punktfunkReleaseCapture = Notification.Name("io.unom.punktfunk.release-capture")
|
|
}
|