75627c8afe
apple / swift (push) Failing after 10s
release / apple (push) Failing after 7s
apple / screenshots (push) Has been skipped
audit / cargo-audit (push) Failing after 1m19s
windows-host / package (push) Failing after 2m44s
windows-msix / package (arm64, C:\Users\Public\ffmpeg-arm64, aarch64-pc-windows-msvc, C:\t-a64) (push) Failing after 39s
windows-msix / package (x64, C:\Users\Public\ffmpeg, x86_64-pc-windows-msvc, C:\t) (push) Failing after 39s
windows / build (aarch64-pc-windows-msvc) (push) Failing after 45s
android / android (push) Successful in 5m17s
windows / build (x86_64-pc-windows-msvc) (push) Failing after 45s
ci / web (push) Successful in 57s
ci / docs-site (push) Successful in 56s
ci / rust (push) Successful in 9m19s
ci / bench (push) Successful in 4m40s
decky / build-publish (push) Successful in 26s
deb / build-publish (push) Successful in 2m57s
docker / build-push (., web/Dockerfile, punktfunk-web) (push) Successful in 33s
docker / build-push (--build-arg FEDORA_VERSION=44, ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora44-rpm) (push) Successful in 2m56s
docker / build-push (ci, ci/fedora-rpm.Dockerfile, punktfunk-fedora-rpm) (push) Successful in 2m35s
docker / build-push (ci, ci/rust-ci.Dockerfile, punktfunk-rust-ci) (push) Successful in 2m20s
docker / build-push (docs-site, docs-site/Dockerfile, punktfunk-docs) (push) Successful in 53s
flatpak / build-publish (push) Successful in 4m22s
rpm / build-publish (bazzite, punktfunk-fedora-rpm) (push) Successful in 8m51s
docker / deploy-docs (push) Successful in 21s
rpm / build-publish (fedora-44, punktfunk-fedora44-rpm) (push) Successful in 8m50s
Adds negotiated 5.1/7.1 surround to the punktfunk/1 protocol and every client (previously stereo-only): - core: new shared `audio` layout table (LAYOUT_51/71 + identity multistream mapping, canonical wire order FL FR FC LFE RL RR SL SR); Hello/Welcome `audio_channels` negotiation via the trailing-byte back-compat pattern (old peers fall back to stereo); C-ABI `punktfunk_connect_ex6`, `punktfunk_connection_audio_channels`, and in-core multistream decode `punktfunk_connection_next_audio_pcm` for embedders without a multistream Opus decoder. Real-libopus channel-identity round-trip test. - host: native audio thread captures + Opus-(multi)stream-encodes at the negotiated count (with a cross-session cached-capturer channel-mismatch fix); GameStream surround unified onto the safe `opus::MSEncoder`, dropping `audiopus_sys` (~4 unsafe blocks) and un-gating Windows GameStream surround; WASAPI loopback capture relaxed to 2/6/8 with the correct dwChannelMask. - clients: Linux (PipeWire), Windows (WASAPI), Android (AAudio) decode via `opus::MSDecoder` + render multichannel; Apple decodes in-core to PCM → AVAudioEngine with an explicit wire-order channel layout; each gains a Stereo/5.1/7.1 setting. `punktfunk-probe --audio-channels N` is the headless validator. Verified on Linux: core/host/linux/probe test suites + the Android Rust (cargo-ndk) build, clippy -D warnings, and rustfmt all green. Windows/Apple builds, all on-glass checks, and the live native loopback are pending (CI / a free box). Also lands the concurrent in-tree HEVC 4:4:4 host work (PUNKTFUNK_444): it shares the same touched files (quic.rs, punktfunk1.rs, encode/*, ...) and so cannot be committed separately from the surround changes. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
213 lines
7.3 KiB
Rust
213 lines
7.3 KiB
Rust
//! Preferences dialog: stream mode, bitrate, host compositor, gamepad type, microphone,
|
||
//! capture behavior. Written back to disk when the dialog closes.
|
||
|
||
use crate::trust::Settings;
|
||
use adw::prelude::*;
|
||
use std::cell::RefCell;
|
||
use std::rc::Rc;
|
||
|
||
/// `(0, 0)` = the native size of the monitor the window is on, resolved at connect.
|
||
const RESOLUTIONS: &[(u32, u32)] = &[
|
||
(0, 0),
|
||
(1280, 720),
|
||
(1920, 1080),
|
||
(2560, 1440),
|
||
(3840, 2160),
|
||
];
|
||
/// `0` = the monitor's native refresh, resolved at connect.
|
||
const REFRESH: &[u32] = &[0, 30, 60, 90, 120, 144, 165, 240];
|
||
const GAMEPADS: &[&str] = &["auto", "xbox360", "dualsense", "xboxone", "dualshock4"];
|
||
const COMPOSITORS: &[&str] = &["auto", "kwin", "wlroots", "mutter", "gamescope"];
|
||
|
||
pub fn show(
|
||
parent: &impl IsA<gtk::Widget>,
|
||
settings: Rc<RefCell<Settings>>,
|
||
gamepads: &crate::gamepad::GamepadService,
|
||
) {
|
||
let page = adw::PreferencesPage::new();
|
||
|
||
let stream = adw::PreferencesGroup::builder().title("Stream").build();
|
||
let res_names: Vec<String> = RESOLUTIONS
|
||
.iter()
|
||
.map(|&(w, h)| {
|
||
if w == 0 {
|
||
"Native display".to_string()
|
||
} else {
|
||
format!("{w} × {h}")
|
||
}
|
||
})
|
||
.collect();
|
||
let res_row = adw::ComboRow::builder()
|
||
.title("Resolution")
|
||
.subtitle("The host creates a virtual output at exactly this size")
|
||
.model(>k::StringList::new(
|
||
&res_names.iter().map(String::as_str).collect::<Vec<_>>(),
|
||
))
|
||
.build();
|
||
let hz_names: Vec<String> = REFRESH
|
||
.iter()
|
||
.map(|&r| {
|
||
if r == 0 {
|
||
"Native".to_string()
|
||
} else {
|
||
format!("{r} Hz")
|
||
}
|
||
})
|
||
.collect();
|
||
let hz_row = adw::ComboRow::builder()
|
||
.title("Refresh rate")
|
||
.model(>k::StringList::new(
|
||
&hz_names.iter().map(String::as_str).collect::<Vec<_>>(),
|
||
))
|
||
.build();
|
||
let bitrate_row = adw::SpinRow::with_range(0.0, 3000.0, 5.0);
|
||
bitrate_row.set_title("Bitrate");
|
||
bitrate_row.set_subtitle("Mbit/s · 0 = host default · run a speed test before going high");
|
||
let compositor_row = adw::ComboRow::builder()
|
||
.title("Host compositor")
|
||
.subtitle("Advisory — the host falls back to auto-detect when unavailable")
|
||
.model(>k::StringList::new(&[
|
||
"Automatic",
|
||
"KWin",
|
||
"wlroots (Sway/Hyprland)",
|
||
"Mutter (GNOME)",
|
||
"gamescope",
|
||
]))
|
||
.build();
|
||
stream.add(&res_row);
|
||
stream.add(&hz_row);
|
||
stream.add(&bitrate_row);
|
||
stream.add(&compositor_row);
|
||
|
||
let input = adw::PreferencesGroup::builder().title("Input").build();
|
||
// Which physical controller forwards as pad 0: automatic = the most recently
|
||
// connected; pinning survives until the app exits (Swift parity).
|
||
let pads = gamepads.pads();
|
||
let mut pad_names = vec!["Automatic (most recent)".to_string()];
|
||
pad_names.extend(pads.iter().map(|p| {
|
||
let kind = p.kind_label();
|
||
if kind.is_empty() {
|
||
p.name.clone()
|
||
} else {
|
||
format!("{} · {kind}", p.name)
|
||
}
|
||
}));
|
||
let forward_row = adw::ComboRow::builder()
|
||
.title("Forwarded controller")
|
||
.subtitle(if pads.is_empty() {
|
||
"No controllers detected"
|
||
} else {
|
||
"Exactly one controller is forwarded to the host"
|
||
})
|
||
.model(>k::StringList::new(
|
||
&pad_names.iter().map(String::as_str).collect::<Vec<_>>(),
|
||
))
|
||
.build();
|
||
let pinned_i = gamepads
|
||
.pinned()
|
||
.and_then(|id| pads.iter().position(|p| p.id == id))
|
||
.map_or(0, |i| i + 1);
|
||
forward_row.set_selected(pinned_i as u32);
|
||
{
|
||
let svc = gamepads.clone();
|
||
let ids: Vec<u32> = pads.iter().map(|p| p.id).collect();
|
||
forward_row.connect_selected_notify(move |row| {
|
||
let sel = row.selected() as usize;
|
||
svc.set_pinned(if sel == 0 {
|
||
None
|
||
} else {
|
||
ids.get(sel - 1).copied()
|
||
});
|
||
});
|
||
}
|
||
let pad_row = adw::ComboRow::builder()
|
||
.title("Gamepad type")
|
||
.subtitle("The virtual pad the host creates — Automatic matches the physical pad")
|
||
.model(>k::StringList::new(&[
|
||
"Automatic",
|
||
"Xbox 360",
|
||
"DualSense",
|
||
"Xbox One",
|
||
"DualShock 4",
|
||
]))
|
||
.build();
|
||
let inhibit_row = adw::SwitchRow::builder()
|
||
.title("Capture system shortcuts")
|
||
.subtitle("Forward Alt+Tab, Super, … to the host while input is captured")
|
||
.build();
|
||
input.add(&forward_row);
|
||
input.add(&pad_row);
|
||
input.add(&inhibit_row);
|
||
|
||
let audio = adw::PreferencesGroup::builder().title("Audio").build();
|
||
let surround_row = adw::ComboRow::builder()
|
||
.title("Audio channels")
|
||
.subtitle("Request stereo or surround (the host downmixes if its output has fewer)")
|
||
.model(>k::StringList::new(&[
|
||
"Stereo",
|
||
"5.1 Surround",
|
||
"7.1 Surround",
|
||
]))
|
||
.build();
|
||
audio.add(&surround_row);
|
||
let mic_row = adw::SwitchRow::builder()
|
||
.title("Stream microphone")
|
||
.subtitle("Send the default input device to the host's virtual microphone")
|
||
.build();
|
||
audio.add(&mic_row);
|
||
|
||
page.add(&stream);
|
||
page.add(&input);
|
||
page.add(&audio);
|
||
|
||
// Seed from the current settings.
|
||
{
|
||
let s = settings.borrow();
|
||
let res_i = RESOLUTIONS
|
||
.iter()
|
||
.position(|&(w, h)| w == s.width && h == s.height)
|
||
.unwrap_or(0);
|
||
res_row.set_selected(res_i as u32);
|
||
let hz_i = REFRESH.iter().position(|&r| r == s.refresh_hz).unwrap_or(0);
|
||
hz_row.set_selected(hz_i as u32);
|
||
bitrate_row.set_value(f64::from(s.bitrate_kbps) / 1000.0);
|
||
let pad_i = GAMEPADS.iter().position(|&g| g == s.gamepad).unwrap_or(0);
|
||
pad_row.set_selected(pad_i as u32);
|
||
let comp_i = COMPOSITORS
|
||
.iter()
|
||
.position(|&c| c == s.compositor)
|
||
.unwrap_or(0);
|
||
compositor_row.set_selected(comp_i as u32);
|
||
inhibit_row.set_active(s.inhibit_shortcuts);
|
||
mic_row.set_active(s.mic_enabled);
|
||
surround_row.set_selected(match s.audio_channels {
|
||
6 => 1,
|
||
8 => 2,
|
||
_ => 0,
|
||
});
|
||
}
|
||
|
||
let dialog = adw::PreferencesDialog::new();
|
||
dialog.set_title("Preferences");
|
||
dialog.add(&page);
|
||
dialog.connect_closed(move |_| {
|
||
let mut s = settings.borrow_mut();
|
||
let (w, h) = RESOLUTIONS[(res_row.selected() as usize).min(RESOLUTIONS.len() - 1)];
|
||
(s.width, s.height) = (w, h);
|
||
s.refresh_hz = REFRESH[(hz_row.selected() as usize).min(REFRESH.len() - 1)];
|
||
s.bitrate_kbps = (bitrate_row.value() * 1000.0) as u32;
|
||
s.gamepad = GAMEPADS[(pad_row.selected() as usize).min(GAMEPADS.len() - 1)].to_string();
|
||
s.compositor = COMPOSITORS[(compositor_row.selected() as usize).min(COMPOSITORS.len() - 1)]
|
||
.to_string();
|
||
s.inhibit_shortcuts = inhibit_row.is_active();
|
||
s.mic_enabled = mic_row.is_active();
|
||
s.audio_channels = match surround_row.selected() {
|
||
1 => 6,
|
||
2 => 8,
|
||
_ => 2,
|
||
};
|
||
s.save();
|
||
});
|
||
dialog.present(Some(parent));
|
||
}
|