mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-16 16:50:41 +01:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7a86fab340 | ||
|
|
d631849f1d | ||
|
|
d04d241411 | ||
|
|
2eece30287 | ||
|
|
1e94175414 | ||
|
|
cfe9601874 | ||
|
|
ab5d0a656b | ||
|
|
dcc67ed550 | ||
|
|
bf7bd50062 | ||
|
|
287b21a622 | ||
|
|
bcde9f967c | ||
|
|
df9429495f | ||
|
|
ba82bc432a |
No files matched your search
Generated
+1
-1
@@ -2741,7 +2741,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "uu-remote-linux"
|
name = "uu-remote-linux"
|
||||||
version = "0.2.30"
|
version = "0.2.34"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "uu-remote-linux"
|
name = "uu-remote-linux"
|
||||||
version = "0.2.30"
|
version = "0.2.34"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
default-run = "uuremote-server"
|
default-run = "uuremote-server"
|
||||||
authors = ["uu-remote-linux contributors"]
|
authors = ["uu-remote-linux contributors"]
|
||||||
|
|||||||
@@ -348,6 +348,7 @@ Common environment variables:
|
|||||||
| `UU_TERMINAL_SHORTCUTS=0` | Disable the Ctrl+V paste rewrite in terminal windows |
|
| `UU_TERMINAL_SHORTCUTS=0` | Disable the Ctrl+V paste rewrite in terminal windows |
|
||||||
| `UU_VIDEO_ENCODER` | `cpu`: libx264; `vaapi`: opt-in Intel/AMD; `nvenc`: force NVENC; unset or `auto`: a background probe (one synthetic IDR per candidate, 3 s each). With an NVIDIA driver the order is NVENC then CPU; without one the only candidate is CPU and the probe is skipped. A session that starts before the probe finishes uses the previous rule (NVENC if NVIDIA is present, else CPU). On a self-built `--features inproc-av` binary, a process-only failure of NVENC when the in-process engine would try it first on X11 is logged `native_unprobed` and keeps the previous NVENC choice (Wayland, portal, and KMS fall back to CPU). The skipped CPU-only probe is logged `not probed (only candidate)`. A successful probe and that CPU-only skip stay cached while NVIDIA presence matches the report. A later desktop connection whose presence differs starts one background re-probe and still uses the cached encoder until the new result is stored. A hardware-candidate failure (NVENC failed, CPU chosen) is kept for 10 minutes; the next desktop connection after that starts the same re-probe and still uses the cached encoder until the new result is stored. Explicit `cpu` / `vaapi` / `nvenc` does not start the probe. Another failure restarts the 10 minutes. `native_unprobed` is not a temporary failure. A non-`auto` `video_encoder` in `host_settings.json` wins. VAAPI stays out of auto until #33 |
|
| `UU_VIDEO_ENCODER` | `cpu`: libx264; `vaapi`: opt-in Intel/AMD; `nvenc`: force NVENC; unset or `auto`: a background probe (one synthetic IDR per candidate, 3 s each). With an NVIDIA driver the order is NVENC then CPU; without one the only candidate is CPU and the probe is skipped. A session that starts before the probe finishes uses the previous rule (NVENC if NVIDIA is present, else CPU). On a self-built `--features inproc-av` binary, a process-only failure of NVENC when the in-process engine would try it first on X11 is logged `native_unprobed` and keeps the previous NVENC choice (Wayland, portal, and KMS fall back to CPU). The skipped CPU-only probe is logged `not probed (only candidate)`. A successful probe and that CPU-only skip stay cached while NVIDIA presence matches the report. A later desktop connection whose presence differs starts one background re-probe and still uses the cached encoder until the new result is stored. A hardware-candidate failure (NVENC failed, CPU chosen) is kept for 10 minutes; the next desktop connection after that starts the same re-probe and still uses the cached encoder until the new result is stored. Explicit `cpu` / `vaapi` / `nvenc` does not start the probe. Another failure restarts the 10 minutes. `native_unprobed` is not a temporary failure. A non-`auto` `video_encoder` in `host_settings.json` wins. VAAPI stays out of auto until #33 |
|
||||||
| `UU_VAAPI_BUFFER_MS` | VAAPI VBV buffer in ms (10-1000, VAAPI only); raise it when keyframes are squeezed into a blur at high resolution |
|
| `UU_VAAPI_BUFFER_MS` | VAAPI VBV buffer in ms (10-1000, VAAPI only); raise it when keyframes are squeezed into a blur at high resolution |
|
||||||
|
| `UU_NVENC_BUFFER_MS` | NVENC VBV buffer in ms (10-1000, NVENC only, including the in-process engine); the default is 100-500 kbit, set `1000` when high-resolution keyframes blur and flicker once per GOP (#103) |
|
||||||
| `UU_FFMPEG_ROOT` | Use FFmpeg from this prefix |
|
| `UU_FFMPEG_ROOT` | Use FFmpeg from this prefix |
|
||||||
| `UU_AUDIO=0` | Disable sound; `UU_AUDIO_SOURCE` picks the PulseAudio source |
|
| `UU_AUDIO=0` | Disable sound; `UU_AUDIO_SOURCE` picks the PulseAudio source |
|
||||||
| `UU_REMOTE_ASSIST=0` | Disable remote assistance (no guest assistance before sign-in either) |
|
| `UU_REMOTE_ASSIST=0` | Disable remote assistance (no guest assistance before sign-in either) |
|
||||||
|
|||||||
@@ -316,6 +316,7 @@ systemctl --user restart uuremote-native.service
|
|||||||
| `UU_TERMINAL_SHORTCUTS=0` | 关闭终端窗口里的 Ctrl+V 粘贴转换 |
|
| `UU_TERMINAL_SHORTCUTS=0` | 关闭终端窗口里的 Ctrl+V 粘贴转换 |
|
||||||
| `UU_VIDEO_ENCODER` | `cpu` 强制 CPU;`vaapi` 显式启用 Intel/AMD 硬编;`nvenc` 强制 NVENC;未设置或 `auto` 时后台探测(每个候选编码一帧,限时 3 秒)。有 NVIDIA 驱动时顺序是 NVENC → CPU;没有 NVIDIA 时只有 CPU,不探测。探测未完成就建流则沿用旧规则(有 NVIDIA 用 NVENC,否则 CPU)。自行编译的 `--features inproc-av` 上,仅 X11 会先走进程内引擎:外部 FFmpeg 探测失败时记为 `native_unprobed`,沿用旧规则(NVENC);Wayland、portal、KMS 回退 CPU。只有 CPU 时跳过探测,记为 `not probed (only candidate)`。探测成功和这种只含 CPU 的跳过会缓存到 NVIDIA 是否存在发生变化为止(`/proc/driver/nvidia/version` 或 `/dev/nvidia0`)。之后的桌面连接在后台再探测一次(不挡住这一路,仍用缓存的编码器)。NVENC 探测失败、选用 CPU 时只缓存 10 分钟;到期后下一次桌面连接同样在后台再探测一次,再次失败则重新计 10 分钟。显式 `cpu` / `vaapi` / `nvenc` 不启动探测。`native_unprobed` 不算失败缓存。优先级低于 `host_settings.json` 里非 `auto` 的 `video_encoder`。VAAPI 要等 #33 解决后才会进入 auto |
|
| `UU_VIDEO_ENCODER` | `cpu` 强制 CPU;`vaapi` 显式启用 Intel/AMD 硬编;`nvenc` 强制 NVENC;未设置或 `auto` 时后台探测(每个候选编码一帧,限时 3 秒)。有 NVIDIA 驱动时顺序是 NVENC → CPU;没有 NVIDIA 时只有 CPU,不探测。探测未完成就建流则沿用旧规则(有 NVIDIA 用 NVENC,否则 CPU)。自行编译的 `--features inproc-av` 上,仅 X11 会先走进程内引擎:外部 FFmpeg 探测失败时记为 `native_unprobed`,沿用旧规则(NVENC);Wayland、portal、KMS 回退 CPU。只有 CPU 时跳过探测,记为 `not probed (only candidate)`。探测成功和这种只含 CPU 的跳过会缓存到 NVIDIA 是否存在发生变化为止(`/proc/driver/nvidia/version` 或 `/dev/nvidia0`)。之后的桌面连接在后台再探测一次(不挡住这一路,仍用缓存的编码器)。NVENC 探测失败、选用 CPU 时只缓存 10 分钟;到期后下一次桌面连接同样在后台再探测一次,再次失败则重新计 10 分钟。显式 `cpu` / `vaapi` / `nvenc` 不启动探测。`native_unprobed` 不算失败缓存。优先级低于 `host_settings.json` 里非 `auto` 的 `video_encoder`。VAAPI 要等 #33 解决后才会进入 auto |
|
||||||
| `UU_VAAPI_BUFFER_MS` | VAAPI 的 VBV 缓冲(10–1000 ms,仅 `UU_VIDEO_ENCODER=vaapi` 时生效);高分辨率下关键帧被压糊时用它换稳定画质 |
|
| `UU_VAAPI_BUFFER_MS` | VAAPI 的 VBV 缓冲(10–1000 ms,仅 `UU_VIDEO_ENCODER=vaapi` 时生效);高分辨率下关键帧被压糊时用它换稳定画质 |
|
||||||
|
| `UU_NVENC_BUFFER_MS` | NVENC 的 VBV 缓冲(10–1000 ms,仅 NVENC 生效,含进程内引擎);默认 100–500 kbit,1440p 等高分辨率下关键帧被压糊、按 GOP 周期闪烁时设 `1000`(#103) |
|
||||||
| `UU_FFMPEG_ROOT` | 使用指定目录下的 FFmpeg |
|
| `UU_FFMPEG_ROOT` | 使用指定目录下的 FFmpeg |
|
||||||
| `UU_AUDIO=0` | 关闭声音转发;`UU_AUDIO_SOURCE` 指定 PulseAudio 采集源 |
|
| `UU_AUDIO=0` | 关闭声音转发;`UU_AUDIO_SOURCE` 指定 PulseAudio 采集源 |
|
||||||
| `UU_LOGIN_WINDOW=0` | 凭证缺失时不自动弹出登录窗口 |
|
| `UU_LOGIN_WINDOW=0` | 凭证缺失时不自动弹出登录窗口 |
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
NVENC 新增可选 VBV 缓冲开关,缓解高分辨率下关键帧按 GOP 周期闪烁。/ Opt-in NVENC VBV buffer for high-resolution keyframe pulsing.
|
||||||
|
|
||||||
|
### 新增 / Added
|
||||||
|
- **`UU_NVENC_BUFFER_MS`(#103,感谢 @zhl-HFUT 的分析)**:NVENC 的 VBV 缓冲(10–1000 ms,缓冲 = 码率上限 × 毫秒 / 1000),FFmpeg 进程管线和进程内引擎都生效。
|
||||||
|
默认缓冲(100–500 kbit)在 1440p 等高分辨率下会把关键帧压糊,画面按 GOP 周期“糊一下再变清”;遇到时可设 `UU_NVENC_BUFFER_MS=1000`。默认行为不变。
|
||||||
|
- New `UU_NVENC_BUFFER_MS` (10–1000 ms of the bitrate cap) for NVENC, applied to both the FFmpeg pipeline and the in-process engine. Default unchanged.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
仅单元测试与 CI,尚未在 NVENC 实机上验证,欢迎反馈。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.31_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.31-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.31`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,17 @@
|
|||||||
|
修复端口映射在 ICE 瞬断恢复后被续房拆掉、信令卡死后长时间假在线,以及查看器 CLI 的指针偏移与滚轮。/ Fixes port-mapping teardown after ICE recovery, stalled signaling, and viewer CLI pointer/wheel input.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **ICE 瞬断恢复后连接被拆(#109,感谢 @sinoyster 的细致分析)**:WebRTC 的 ICE 状态回调读到的是占位 DTLS 对象,ICE `Disconnected → Connected` 恢复后 PeerConnection 停在 `New`,15 分钟续房把仍在使用的端口映射当成空闲,拆房并断开所有映射 TCP 流。现在恢复后会回到 `Connected`。
|
||||||
|
After a brief ICE drop the peer state settled on `New` instead of `Connected`, so the idle room renewal tore down live port-mapping streams.
|
||||||
|
- **信令投递卡住时心跳检测失效(#104,感谢 @RiverOnVenus)**:事件队列阻塞时 Engine.IO 超时不再执行,主机可能带着半关闭的连接“在线”数小时。现在有独立看门狗、发送超时和关闭超时。
|
||||||
|
Heartbeat detection keeps running when event delivery stalls; the host reconnects instead of staying half-online.
|
||||||
|
- **查看器 CLI**:16:10 等非 16:9 主机的指针按内容区域映射,不再内偏(#107,感谢 @liuyanghejerry);鼠标滚轮/触控板转发为滚动(#108,感谢 @liuyanghejerry)。
|
||||||
|
Viewer CLI: pointer mapped to the content rectangle of the padded canvas; mouse wheel forwarded.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;#109 的 ICE 恢复场景尚未实机复现,欢迎反馈。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.32_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.32-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.32`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,13 @@
|
|||||||
|
修复 Wayland 锁屏或熄屏后,由工具连接(端口映射)升级的桌面视频结束后无法再次打开。/ Fixes a promoted tool connection whose desktop video could not be reopened after the screen locked or blanked.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **锁屏/熄屏后桌面无法重新打开(#114,感谢 @sinoyster 的完整报告)**:通过 capture_desktop 升级为桌面的工具连接上,若 Wayland 采集因锁屏或 DPMS 关闭而结束,再次 capture_desktop 不会重建视频,查看器只剩黑屏。现在会重新请求桌面并在原连接上重启视频,保留原输入租约。
|
||||||
|
On a tool connection promoted with capture_desktop, a desktop stream that ended (e.g. Wayland capture failing on lock/DPMS) is now restarted on the next capture_desktop, keeping the original input lease.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;#114 的锁屏场景尚未实机复现,欢迎反馈。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.33_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.33-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.33`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
修复网络波动后信令重连卡住,以及 Linux 控制端在平铺窗口管理器下画面空白。/ Fixes signaling reconnect stalling after a network hiccup, and the Linux viewer showing a blank window under tiling compositors.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **网络异常后停在 Acquired room signaling credentials(#115,感谢 @Changxi-M)**:信令 WebSocket 握手没有超时,网络半断时会无限等待,重连不再重试。现在握手限时 20 秒,超时后按原有退避重试。
|
||||||
|
The signaling WebSocket handshake is now bounded to 20 s, so a stalled handshake falls back to the normal reconnect retry instead of hanging forever.
|
||||||
|
- **控制端窗口平铺后画面空白(#118,感谢 @shao-zhijie)**:Linux 控制端只在收到新解码帧时绘制,合成器调整窗口尺寸后静止画面不会重绘;在尚未收到首帧时,Wayland 也不会映射没有提交缓冲的窗口。现在窗口尺寸变化/重新显示时用最后一帧重绘,无帧时先画黑底。
|
||||||
|
The Linux viewer now repaints the last frame after a compositor resize/expose, and paints a black frame before the first decoded frame so Wayland maps the window.
|
||||||
|
|
||||||
|
### 验证范围 / Validation
|
||||||
|
单元测试与 CI;#115、#118 的场景尚未实机复现,欢迎反馈。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux_0.2.34_<amd64|arm64>.deb`,或 `uu-remote-linux-v0.2.34-<x86_64|aarch64>-linux.tar.gz`(解压后运行 `./install.sh`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.34`(x86_64)。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -244,6 +244,15 @@ async fn capture_desktop_on_a_port_mapping_peer_promotes_it_once() {
|
|||||||
let lease = host.role.input().unwrap();
|
let lease = host.role.input().unwrap();
|
||||||
host.promote(None);
|
host.promote(None);
|
||||||
assert!(lease.is_current());
|
assert!(lease.is_current());
|
||||||
|
// Its video ended on its own (capture failed while locked, #114): capture_desktop restarts it
|
||||||
|
// on the same input lease.
|
||||||
|
let ended = tokio::spawn(async {});
|
||||||
|
*host.role.stream_task.lock().unwrap() = Some(ended.abort_handle());
|
||||||
|
ended.await.unwrap();
|
||||||
|
send(&viewer, "CONTROL_DATA_CHANNEL", crate::initialization::envelope(9, 0, 3, &[8, 4])).await;
|
||||||
|
tokio::time::timeout(Duration::from_secs(5), requested.recv()).await.unwrap().unwrap();
|
||||||
|
host.promote(None);
|
||||||
|
assert!(host.role.is_desktop() && !host.role.stream_ended() && lease.is_current());
|
||||||
// A newer desktop demotes it; the port mapping stays, and capture_desktop promotes it again.
|
// A newer desktop demotes it; the port mapping stays, and capture_desktop promotes it again.
|
||||||
host.demote();
|
host.demote();
|
||||||
assert!(!host.role.is_desktop() && host.role.input().is_none());
|
assert!(!host.role.is_desktop() && host.role.input().is_none());
|
||||||
|
|||||||
+15
-7
@@ -73,6 +73,14 @@ fn superseded_peer_ids(sessions: &HashMap<String, WebRtcSession>, ice: &str, des
|
|||||||
sessions.iter().filter(|(id, peer)| id.as_str() == ice || (desktop && peer.desktop))
|
sessions.iter().filter(|(id, peer)| id.as_str() == ice || (desktop && peer.desktop))
|
||||||
.map(|(id, _)| id.clone()).collect()
|
.map(|(id, _)| id.clone()).collect()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// A peer whose transport is already broken can leave `PeerConnection::close`
|
||||||
|
/// waiting indefinitely; signaling must keep flowing without it.
|
||||||
|
async fn close_peer(pc: &::webrtc::peer_connection::RTCPeerConnection) {
|
||||||
|
if tokio::time::timeout(std::time::Duration::from_secs(5), pc.close()).await.is_err() {
|
||||||
|
log::warn!("Peer connection close timed out; continuing");
|
||||||
|
}
|
||||||
|
}
|
||||||
fn released_peer_ids<T>(sessions: &HashMap<String, T>, ice: Option<&serde_json::Value>) -> Vec<String> {
|
fn released_peer_ids<T>(sessions: &HashMap<String, T>, ice: Option<&serde_json::Value>) -> Vec<String> {
|
||||||
let ice = ice.map(|id| id.as_str().map(str::to_owned).unwrap_or_else(|| id.to_string()));
|
let ice = ice.map(|id| id.as_str().map(str::to_owned).unwrap_or_else(|| id.to_string()));
|
||||||
sessions.keys().filter(|id| ice.as_deref().map_or(true, |ice| id.as_str() == ice)).cloned().collect()
|
sessions.keys().filter(|id| ice.as_deref().map_or(true, |ice| id.as_str() == ice)).cloned().collect()
|
||||||
@@ -685,7 +693,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
|||||||
if let Some(task) = command_task { task.abort(); }
|
if let Some(task) = command_task { task.abort(); }
|
||||||
// One exit path for commands, signals, transport failures and UI failures.
|
// One exit path for commands, signals, transport failures and UI failures.
|
||||||
if let Some(session) = assist.as_mut() { session.allowed = false; }
|
if let Some(session) = assist.as_mut() { session.allowed = false; }
|
||||||
for (_, old) in webrtc_sessions.lock().await.drain() { let _ = old.pc.close().await; }
|
for (_, old) in webrtc_sessions.lock().await.drain() { close_peer(&old.pc).await; }
|
||||||
virtual_audio::disable(); input.shutdown(); terminal::shutdown_all();
|
virtual_audio::disable(); input.shutdown(); terminal::shutdown_all();
|
||||||
// Switching identity (signed in / out) restarts at once and the new identity republishes the same
|
// Switching identity (signed in / out) restarts at once and the new identity republishes the same
|
||||||
// device share: logout already withdrew it, and after a QR login the cloud moved it to the account
|
// device share: logout already withdrew it, and after a QR login the cloud moved it to the account
|
||||||
@@ -858,7 +866,7 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
::webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Closed |
|
::webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Closed |
|
||||||
::webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Failed)).map(|(id, _)| id.clone()).collect();
|
::webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Failed)).map(|(id, _)| id.clone()).collect();
|
||||||
let mut desktop_ended = false;
|
let mut desktop_ended = false;
|
||||||
for id in ended { if let Some(s) = sessions.remove(&id) { desktop_ended |= s.role.is_desktop(); let _ = s.pc.close().await; } }
|
for id in ended { if let Some(s) = sessions.remove(&id) { desktop_ended |= s.role.is_desktop(); close_peer(&s.pc).await; } }
|
||||||
if desktop_ended && !sessions.values().any(|s| s.role.is_desktop()) { if let Some(s) = assist.as_mut() { s.session_ended()?; } }
|
if desktop_ended && !sessions.values().any(|s| s.role.is_desktop()) { if let Some(s) = assist.as_mut() { s.session_ended()?; } }
|
||||||
if let Some(s) = assist.as_mut() { s.tick()?; }
|
if let Some(s) = assist.as_mut() { s.tick()?; }
|
||||||
}
|
}
|
||||||
@@ -946,7 +954,7 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
::webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Closed |
|
::webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Closed |
|
||||||
::webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Failed)).map(|(k, _)| k.clone()).collect();
|
::webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Failed)).map(|(k, _)| k.clone()).collect();
|
||||||
let mut desktop_ended = false;
|
let mut desktop_ended = false;
|
||||||
for k in ended { if let Some(old) = sessions.remove(&k) { desktop_ended |= old.role.is_desktop(); let _ = old.pc.close().await; } }
|
for k in ended { if let Some(old) = sessions.remove(&k) { desktop_ended |= old.role.is_desktop(); close_peer(&old.pc).await; } }
|
||||||
if desktop_ended && !sessions.values().any(|s| s.role.is_desktop()) { if let Some(s) = assist.as_mut() { s.session_ended()?; } }
|
if desktop_ended && !sessions.values().any(|s| s.role.is_desktop()) { if let Some(s) = assist.as_mut() { s.session_ended()?; } }
|
||||||
if let Some(s) = assist.as_mut() { s.tick()?; }
|
if let Some(s) = assist.as_mut() { s.tick()?; }
|
||||||
|
|
||||||
@@ -961,7 +969,7 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
if desktop { video::warm_auto_probe(); video::check_ffmpeg_usable(); }
|
if desktop { video::warm_auto_probe(); video::check_ffmpeg_usable(); }
|
||||||
// Replace only this ICE id or a previous desktop, never tool peers.
|
// Replace only this ICE id or a previous desktop, never tool peers.
|
||||||
for id in superseded_peer_ids(&sessions, &ice, desktop) {
|
for id in superseded_peer_ids(&sessions, &ice, desktop) {
|
||||||
if let Some(old) = sessions.remove(&id) { let _ = old.pc.close().await; }
|
if let Some(old) = sessions.remove(&id) { close_peer(&old.pc).await; }
|
||||||
}
|
}
|
||||||
// A tool peer promoted by capture_desktop stops its desktop but keeps its tools.
|
// A tool peer promoted by capture_desktop stops its desktop but keeps its tools.
|
||||||
if desktop { for old in sessions.values() { old.demote(); } }
|
if desktop { for old in sessions.values() { old.demote(); } }
|
||||||
@@ -1014,7 +1022,7 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
}
|
}
|
||||||
Err(_) => {
|
Err(_) => {
|
||||||
log::error!("Failed to handle offer (details omitted)");
|
log::error!("Failed to handle offer (details omitted)");
|
||||||
if let Some(session) = sessions.remove(&ice) { let _ = session.pc.close().await; }
|
if let Some(session) = sessions.remove(&ice) { close_peer(&session.pc).await; }
|
||||||
}
|
}
|
||||||
}},
|
}},
|
||||||
Err(_) => log::error!("Create peer failed (details omitted)"),
|
Err(_) => log::error!("Create peer failed (details omitted)"),
|
||||||
@@ -1037,7 +1045,7 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
for k in targets {
|
for k in targets {
|
||||||
if let Some(old) = sessions.remove(&k) {
|
if let Some(old) = sessions.remove(&k) {
|
||||||
desktop_ended |= old.role.is_desktop();
|
desktop_ended |= old.role.is_desktop();
|
||||||
if let Err(e) = old.pc.close().await { log::warn!("Close released peer failed: {}", e); }
|
close_peer(&old.pc).await;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if desktop_ended && !sessions.values().any(|s| s.role.is_desktop()) { if let Some(s) = assist.as_mut() { s.session_ended()?; } }
|
if desktop_ended && !sessions.values().any(|s| s.role.is_desktop()) { if let Some(s) = assist.as_mut() { s.session_ended()?; } }
|
||||||
@@ -1075,7 +1083,7 @@ async fn serve(mut capture: Arc<ScreenCapture>, input: Arc<InputInjector>, shutd
|
|||||||
let superseded: Vec<String> = sessions.iter().filter(|(id, old)| id.as_str() != ice && old.role.is_desktop())
|
let superseded: Vec<String> = sessions.iter().filter(|(id, old)| id.as_str() != ice && old.role.is_desktop())
|
||||||
.map(|(id, _)| id.clone()).collect();
|
.map(|(id, _)| id.clone()).collect();
|
||||||
for id in superseded {
|
for id in superseded {
|
||||||
if sessions[&id].desktop { if let Some(old) = sessions.remove(&id) { let _ = old.pc.close().await; } }
|
if sessions[&id].desktop { if let Some(old) = sessions.remove(&id) { close_peer(&old.pc).await; } }
|
||||||
else { sessions[&id].demote(); }
|
else { sessions[&id].demote(); }
|
||||||
}
|
}
|
||||||
if let Some(peer) = sessions.get(&ice) { peer.promote(screen); }
|
if let Some(peer) = sessions.get(&ice) { peer.promote(screen); }
|
||||||
|
|||||||
+196
-40
@@ -3,12 +3,23 @@
|
|||||||
use futures_util::{SinkExt, StreamExt};
|
use futures_util::{SinkExt, StreamExt};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use serde_json::Value;
|
use serde_json::Value;
|
||||||
|
use std::sync::atomic::{AtomicBool, AtomicU64, Ordering};
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
use std::time::{Duration, Instant};
|
||||||
use tokio::sync::mpsc;
|
use tokio::sync::mpsc;
|
||||||
use tokio_tungstenite::connect_async;
|
use tokio_tungstenite::connect_async;
|
||||||
use tokio_tungstenite::tungstenite::client::IntoClientRequest;
|
use tokio_tungstenite::tungstenite::client::IntoClientRequest;
|
||||||
use tokio_tungstenite::tungstenite::Message;
|
use tokio_tungstenite::tungstenite::Message;
|
||||||
|
|
||||||
|
/// A peer that stops reading must not park the heartbeat loop on a full queue.
|
||||||
|
/// Kept below the Engine.IO window so the protocol deadline still fires.
|
||||||
|
const SEND_STALL_TIMEOUT: Duration = Duration::from_secs(10);
|
||||||
|
// DNS/TCP/TLS/WebSocket upgrade must finish in bounded time: after a network
|
||||||
|
// change the handshake can stall forever and the reconnect loop never retries.
|
||||||
|
const CONNECT_TIMEOUT: Duration = Duration::from_secs(20);
|
||||||
|
/// How often the watchdog checks the last inbound frame.
|
||||||
|
const WATCHDOG_TICK: Duration = Duration::from_secs(1);
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
pub struct SoacMessage {
|
pub struct SoacMessage {
|
||||||
#[serde(rename = "type")]
|
#[serde(rename = "type")]
|
||||||
@@ -70,6 +81,11 @@ fn refreshed_key(ack:&Value)->Option<String> {
|
|||||||
(!key.is_empty() && key.len()<=16384).then(||key.to_owned())
|
(!key.is_empty() && key.len()<=16384).then(||key.to_owned())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Deliver an event without letting a stalled consumer hide a dead socket.
|
||||||
|
async fn send_event(sender: &mpsc::Sender<SignalingEvent>, event: SignalingEvent) -> bool {
|
||||||
|
matches!(tokio::time::timeout(SEND_STALL_TIMEOUT, sender.send(event)).await, Ok(Ok(())))
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod refresh_tests {
|
mod refresh_tests {
|
||||||
use super::refreshed_key;
|
use super::refreshed_key;
|
||||||
@@ -128,6 +144,101 @@ mod refresh_tests {
|
|||||||
assert!(disconnected.is_ok(),"a socket without pings must be reported dead");
|
assert!(disconnected.is_ok(),"a socket without pings must be reported dead");
|
||||||
drop(hold_tx);
|
drop(hold_tx);
|
||||||
}
|
}
|
||||||
|
#[tokio::test]
|
||||||
|
async fn blocked_event_consumer_does_not_hide_a_dead_socket() {
|
||||||
|
use futures_util::{SinkExt,StreamExt};
|
||||||
|
use tokio_tungstenite::tungstenite::Message;
|
||||||
|
let listener=tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
|
||||||
|
let address=listener.local_addr().unwrap();
|
||||||
|
let (closed_tx,closed_rx)=tokio::sync::oneshot::channel::<()>();
|
||||||
|
tokio::spawn(async move {
|
||||||
|
let (tcp,_)=listener.accept().await.unwrap();
|
||||||
|
let socket=tokio_tungstenite::accept_async(tcp).await.unwrap();
|
||||||
|
let (mut sink,mut stream)=socket.split();
|
||||||
|
// Shortest accepted window (clamped to 5 s); never ping, only events.
|
||||||
|
sink.send(Message::Text(r#"0{"pingInterval":1000,"pingTimeout":1000}"#.into())).await.unwrap();
|
||||||
|
let _=stream.next().await;
|
||||||
|
sink.send(Message::Text("40{}".into())).await.unwrap();
|
||||||
|
loop {
|
||||||
|
tokio::select! {
|
||||||
|
r=stream.next()=>match r {
|
||||||
|
None|Some(Err(_))|Some(Ok(Message::Close(_)))=>{let _=closed_tx.send(());return;}
|
||||||
|
_=>{}
|
||||||
|
},
|
||||||
|
_=tokio::time::sleep(std::time::Duration::from_millis(50))=>{
|
||||||
|
if sink.send(Message::Text(r#"42["bmsg_push",{}]"#.into())).await.is_err() {
|
||||||
|
let _=closed_tx.send(());return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
// Capacity 1 and no reader: the first event fills the queue, so the
|
||||||
|
// receive loop would park inside `send().await` without the watchdog.
|
||||||
|
let (sender,_events)=tokio::sync::mpsc::channel(1);
|
||||||
|
let _client=super::SignalingClient::connect(&format!("ws://{address}"),"synthetic-only",sender).await.unwrap();
|
||||||
|
let closed=tokio::time::timeout(std::time::Duration::from_secs(15),closed_rx).await;
|
||||||
|
assert!(closed.is_ok(),"a blocked consumer must not keep a dead signaling socket open");
|
||||||
|
}
|
||||||
|
#[tokio::test]
|
||||||
|
async fn stalled_handshake_times_out() {
|
||||||
|
use tokio_tungstenite::tungstenite::client::IntoClientRequest;
|
||||||
|
// Accepts TCP but never answers the upgrade, like a stalled path after a network change.
|
||||||
|
let listener=tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
|
||||||
|
let address=listener.local_addr().unwrap();
|
||||||
|
tokio::spawn(async move {
|
||||||
|
let (_tcp,_)=listener.accept().await.unwrap();
|
||||||
|
tokio::time::sleep(std::time::Duration::from_secs(30)).await;
|
||||||
|
});
|
||||||
|
let req=format!("ws://{address}/socket.io/").into_client_request().unwrap();
|
||||||
|
let result=tokio::time::timeout(std::time::Duration::from_secs(5),super::open_socket(req,std::time::Duration::from_secs(1))).await;
|
||||||
|
assert!(matches!(result,Ok(Err(_))),"a stalled handshake must fail within the connect timeout");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn stalled_event_delivery_still_reports_disconnected() {
|
||||||
|
use futures_util::{SinkExt,StreamExt};
|
||||||
|
use tokio_tungstenite::tungstenite::Message;
|
||||||
|
let listener=tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();
|
||||||
|
let address=listener.local_addr().unwrap();
|
||||||
|
tokio::spawn(async move {
|
||||||
|
let (tcp,_)=listener.accept().await.unwrap();
|
||||||
|
let socket=tokio_tungstenite::accept_async(tcp).await.unwrap();
|
||||||
|
let (mut sink,mut stream)=socket.split();
|
||||||
|
// A long window: the send stall must fire before the heartbeat deadline.
|
||||||
|
sink.send(Message::Text(r#"0{"pingInterval":30000,"pingTimeout":30000}"#.into())).await.unwrap();
|
||||||
|
let _=stream.next().await;
|
||||||
|
sink.send(Message::Text("40{}".into())).await.unwrap();
|
||||||
|
loop {
|
||||||
|
tokio::select! {
|
||||||
|
r=stream.next()=>{ if matches!(r,None|Some(Err(_))|Some(Ok(Message::Close(_)))){return} }
|
||||||
|
_=tokio::time::sleep(std::time::Duration::from_millis(50))=>{
|
||||||
|
if sink.send(Message::Text(r#"42["bmsg_push",{}]"#.into())).await.is_err(){return}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
let (sender,mut events)=tokio::sync::mpsc::channel(1);
|
||||||
|
let _client=super::SignalingClient::connect(&format!("ws://{address}"),"synthetic-only",sender).await.unwrap();
|
||||||
|
// Let SEND_STALL_TIMEOUT expire while nothing drains the queue.
|
||||||
|
tokio::time::sleep(std::time::Duration::from_secs(12)).await;
|
||||||
|
assert!(matches!(events.recv().await,Some(super::SignalingEvent::Connected)));
|
||||||
|
let disconnected=tokio::time::timeout(std::time::Duration::from_secs(5),events.recv()).await;
|
||||||
|
assert!(matches!(disconnected,Ok(Some(super::SignalingEvent::Disconnected))),"a stalled delivery must still report Disconnected");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn open_socket(
|
||||||
|
req: tokio_tungstenite::tungstenite::handshake::client::Request,
|
||||||
|
limit: Duration,
|
||||||
|
) -> Result<tokio_tungstenite::WebSocketStream<tokio_tungstenite::MaybeTlsStream<tokio::net::TcpStream>>, String> {
|
||||||
|
match tokio::time::timeout(limit, connect_async(req)).await {
|
||||||
|
Ok(result) => result.map(|(ws, _)| ws).map_err(|e| format!("WS connect failed: {}", e)),
|
||||||
|
Err(_) => {
|
||||||
|
log::warn!("Signaling connect timed out after {}s", limit.as_secs());
|
||||||
|
Err("WS connect timed out".into())
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl SignalingClient {
|
impl SignalingClient {
|
||||||
@@ -151,24 +262,30 @@ impl SignalingClient {
|
|||||||
room_token.parse().map_err(|_| "Invalid token header")?,
|
room_token.parse().map_err(|_| "Invalid token header")?,
|
||||||
);
|
);
|
||||||
|
|
||||||
let (ws_stream, _) = connect_async(req)
|
let ws_stream = open_socket(req, CONNECT_TIMEOUT).await?;
|
||||||
.await
|
|
||||||
.map_err(|e| format!("WS connect failed: {}", e))?;
|
|
||||||
|
|
||||||
log::info!("Connected to Engine.IO / Socket.IO");
|
log::info!("Connected to Engine.IO / Socket.IO");
|
||||||
let (mut write, mut read) = ws_stream.split();
|
let (mut write, mut read) = ws_stream.split();
|
||||||
let (tx_outgoing, mut rx_outgoing) = mpsc::channel::<String>(32);
|
let (tx_outgoing, mut rx_outgoing) = mpsc::channel::<String>(32);
|
||||||
|
let started = Instant::now();
|
||||||
|
let last_rx = Arc::new(AtomicU64::new(0));
|
||||||
|
let ping_window_ms = Arc::new(AtomicU64::new(45_000));
|
||||||
|
let receiver_done = Arc::new(AtomicBool::new(false));
|
||||||
|
|
||||||
// 发送协程
|
// 发送协程
|
||||||
let writer=tokio::spawn(async move {
|
let writer=tokio::spawn(async move {
|
||||||
while let Some(msg) = rx_outgoing.recv().await {
|
while let Some(msg) = rx_outgoing.recv().await {
|
||||||
if let Err(e) = write.send(Message::Text(msg)).await {
|
match tokio::time::timeout(SEND_STALL_TIMEOUT, write.send(Message::Text(msg))).await {
|
||||||
let _ = e;
|
Ok(Ok(())) => {}
|
||||||
log::warn!("WS send failed (details omitted)");
|
Ok(Err(_)) | Err(_) => {
|
||||||
break;
|
// A peer that stopped reading must not park every producer.
|
||||||
|
log::warn!("WS send failed or stalled (details omitted)");
|
||||||
|
break;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
let writer_abort = writer.abort_handle();
|
||||||
|
|
||||||
let tx_out_clone = tx_outgoing.clone();
|
let tx_out_clone = tx_outgoing.clone();
|
||||||
static GENERATION: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(1);
|
static GENERATION: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(1);
|
||||||
@@ -177,9 +294,12 @@ impl SignalingClient {
|
|||||||
let refreshed=reconnect_key.clone();
|
let refreshed=reconnect_key.clone();
|
||||||
|
|
||||||
// 接收与状态机协程
|
// 接收与状态机协程
|
||||||
tokio::spawn(async move {
|
let watchdog_events = event_sender.clone();
|
||||||
|
let watchdog_last_rx = last_rx.clone();
|
||||||
|
let watchdog_ping_window_ms = ping_window_ms.clone();
|
||||||
|
let watchdog_done = receiver_done.clone();
|
||||||
|
let receiver = tokio::spawn(async move {
|
||||||
let mut req_counter = 10;
|
let mut req_counter = 10;
|
||||||
let started=std::time::Instant::now();
|
|
||||||
let mut last_ping=started;
|
let mut last_ping=started;
|
||||||
let mut pings=0u64;
|
let mut pings=0u64;
|
||||||
let mut pong_queued=0u64;
|
let mut pong_queued=0u64;
|
||||||
@@ -202,7 +322,7 @@ impl SignalingClient {
|
|||||||
_=event_sender.closed()=>break,
|
_=event_sender.closed()=>break,
|
||||||
_=tokio::time::sleep_until(ping_deadline) => {
|
_=tokio::time::sleep_until(ping_deadline) => {
|
||||||
log::warn!("Signaling heartbeat lost: generation={} age_s={} pings={} last_ping_gap_s={}",generation,started.elapsed().as_secs(),pings,last_ping.elapsed().as_secs());
|
log::warn!("Signaling heartbeat lost: generation={} age_s={} pings={} last_ping_gap_s={}",generation,started.elapsed().as_secs(),pings,last_ping.elapsed().as_secs());
|
||||||
let _ = event_sender.send(SignalingEvent::Disconnected).await;
|
let _ = send_event(&event_sender, SignalingEvent::Disconnected).await;
|
||||||
break;
|
break;
|
||||||
},
|
},
|
||||||
// Official ControlledSession RefreshSignalTokenLoop: first
|
// Official ControlledSession RefreshSignalTokenLoop: first
|
||||||
@@ -213,8 +333,8 @@ impl SignalingClient {
|
|||||||
refresh_acks.push_back(req_counter);
|
refresh_acks.push_back(req_counter);
|
||||||
if refresh_acks.len()>16 { refresh_acks.pop_front(); }
|
if refresh_acks.len()>16 { refresh_acks.pop_front(); }
|
||||||
let packet=format!("42{}[\"refresh_reconnect_key\"]",req_counter);
|
let packet=format!("42{}[\"refresh_reconnect_key\"]",req_counter);
|
||||||
if tx_out_clone.send(packet).await.is_err() {
|
if tx_out_clone.try_send(packet).is_err() {
|
||||||
let _=event_sender.send(SignalingEvent::Disconnected).await;break;
|
let _=send_event(&event_sender, SignalingEvent::Disconnected).await;break;
|
||||||
}
|
}
|
||||||
next_refresh=tokio::time::Instant::now()+std::time::Duration::from_secs(30);
|
next_refresh=tokio::time::Instant::now()+std::time::Duration::from_secs(30);
|
||||||
log::info!("Signaling reconnect-key refresh requested: generation={} age_s={}",generation,started.elapsed().as_secs());
|
log::info!("Signaling reconnect-key refresh requested: generation={} age_s={}",generation,started.elapsed().as_secs());
|
||||||
@@ -222,9 +342,14 @@ impl SignalingClient {
|
|||||||
},
|
},
|
||||||
msg=read.next()=>match msg {
|
msg=read.next()=>match msg {
|
||||||
Some(msg)=>msg,
|
Some(msg)=>msg,
|
||||||
None=>{let _=event_sender.send(SignalingEvent::Disconnected).await;break;}
|
None=>{let _=send_event(&event_sender, SignalingEvent::Disconnected).await;break;}
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
// Any inbound frame proves the socket is alive. A reader parked on
|
||||||
|
// event delivery stops updating this, which the watchdog catches.
|
||||||
|
if msg_res.is_ok() {
|
||||||
|
last_rx.store(started.elapsed().as_millis() as u64, Ordering::Relaxed);
|
||||||
|
}
|
||||||
match msg_res {
|
match msg_res {
|
||||||
Ok(Message::Text(txt)) => {
|
Ok(Message::Text(txt)) => {
|
||||||
// Engine.IO 报文处理
|
// Engine.IO 报文处理
|
||||||
@@ -233,16 +358,20 @@ impl SignalingClient {
|
|||||||
log::info!("Signaling heartbeat config: generation={} ping_interval_ms={:?} ping_timeout_ms={:?}",generation,open.get("pingInterval").and_then(Value::as_u64),open.get("pingTimeout").and_then(Value::as_u64));
|
log::info!("Signaling heartbeat config: generation={} ping_interval_ms={:?} ping_timeout_ms={:?}",generation,open.get("pingInterval").and_then(Value::as_u64),open.get("pingTimeout").and_then(Value::as_u64));
|
||||||
if let (Some(interval),Some(timeout))=(open.get("pingInterval").and_then(Value::as_u64),open.get("pingTimeout").and_then(Value::as_u64)) {
|
if let (Some(interval),Some(timeout))=(open.get("pingInterval").and_then(Value::as_u64),open.get("pingTimeout").and_then(Value::as_u64)) {
|
||||||
ping_window=std::time::Duration::from_millis(interval.saturating_add(timeout).clamp(5_000,300_000));
|
ping_window=std::time::Duration::from_millis(interval.saturating_add(timeout).clamp(5_000,300_000));
|
||||||
|
ping_window_ms.store(ping_window.as_millis() as u64, Ordering::Relaxed);
|
||||||
ping_deadline=tokio::time::Instant::now()+ping_window;
|
ping_deadline=tokio::time::Instant::now()+ping_window;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Open packet -> 发送 Socket.IO connect
|
// Open packet -> 发送 Socket.IO connect
|
||||||
let _ = tx_out_clone.send("40".into()).await;
|
if tx_out_clone.try_send("40".into()).is_err() {
|
||||||
|
let _=send_event(&event_sender, SignalingEvent::Disconnected).await;break;
|
||||||
|
}
|
||||||
} else if txt == "2" {
|
} else if txt == "2" {
|
||||||
// Ping -> 回复 Pong
|
// Ping -> 回复 Pong
|
||||||
let gap=last_ping.elapsed().as_secs();last_ping=std::time::Instant::now();pings+=1;
|
let gap=last_ping.elapsed().as_secs();last_ping=std::time::Instant::now();pings+=1;
|
||||||
ping_deadline=tokio::time::Instant::now()+ping_window;
|
ping_deadline=tokio::time::Instant::now()+ping_window;
|
||||||
if tx_out_clone.send("3".into()).await.is_ok() { pong_queued+=1; }
|
if tx_out_clone.try_send("3".into()).is_ok() { pong_queued+=1; }
|
||||||
|
else { let _=send_event(&event_sender, SignalingEvent::Disconnected).await;break; }
|
||||||
if pings==1 || pings%12==0 {
|
if pings==1 || pings%12==0 {
|
||||||
log::info!("Signaling heartbeat progress: generation={} age_s={} pings={} pong_queued={} gap_s={}",generation,started.elapsed().as_secs(),pings,pong_queued,gap);
|
log::info!("Signaling heartbeat progress: generation={} age_s={} pings={} pong_queued={} gap_s={}",generation,started.elapsed().as_secs(),pings,pong_queued,gap);
|
||||||
}
|
}
|
||||||
@@ -252,8 +381,10 @@ impl SignalingClient {
|
|||||||
// Socket.IO connected -> 发送 room_info 请求
|
// Socket.IO connected -> 发送 room_info 请求
|
||||||
req_counter += 1;
|
req_counter += 1;
|
||||||
let room_req = format!("42{}[\"room_info\"]", req_counter);
|
let room_req = format!("42{}[\"room_info\"]", req_counter);
|
||||||
let _ = tx_out_clone.send(room_req).await;
|
if tx_out_clone.try_send(room_req).is_err() {
|
||||||
let _ = event_sender.send(SignalingEvent::Connected).await;
|
let _=send_event(&event_sender, SignalingEvent::Disconnected).await;break;
|
||||||
|
}
|
||||||
|
if !send_event(&event_sender, SignalingEvent::Connected).await { break; }
|
||||||
} else if txt.starts_with("43") {
|
} else if txt.starts_with("43") {
|
||||||
// Socket.IO ack 回调
|
// Socket.IO ack 回调
|
||||||
let begin=txt.find('[').unwrap_or(2);
|
let begin=txt.find('[').unwrap_or(2);
|
||||||
@@ -272,7 +403,7 @@ impl SignalingClient {
|
|||||||
next_refresh=tokio::time::Instant::now()+std::time::Duration::from_secs(300);
|
next_refresh=tokio::time::Instant::now()+std::time::Duration::from_secs(300);
|
||||||
}
|
}
|
||||||
log::info!("Signaling reconnect-key refresh acknowledged: generation={} age_s={} success={}",generation,started.elapsed().as_secs(),success);
|
log::info!("Signaling reconnect-key refresh acknowledged: generation={} age_s={} success={}",generation,started.elapsed().as_secs(),success);
|
||||||
} else { let _ = event_sender.send(SignalingEvent::RoomInfoAck(v)).await; }
|
} else if !send_event(&event_sender, SignalingEvent::RoomInfoAck(v)).await { break; }
|
||||||
}
|
}
|
||||||
} else if txt.starts_with("45") || txt.starts_with("46") {
|
} else if txt.starts_with("45") || txt.starts_with("46") {
|
||||||
// Socket.IO binary event/ack: header text, attachments follow as binary frames.
|
// Socket.IO binary event/ack: header text, attachments follow as binary frames.
|
||||||
@@ -296,14 +427,10 @@ impl SignalingClient {
|
|||||||
|
|
||||||
match event_name {
|
match event_name {
|
||||||
"bmsg_push" => {
|
"bmsg_push" => {
|
||||||
let _ = event_sender
|
if !send_event(&event_sender, SignalingEvent::DeviceInfoChanged(data.clone())).await { break; }
|
||||||
.send(SignalingEvent::DeviceInfoChanged(data.clone()))
|
|
||||||
.await;
|
|
||||||
}
|
}
|
||||||
"be-controlled" => {
|
"be-controlled" => {
|
||||||
let _ = event_sender
|
if !send_event(&event_sender, SignalingEvent::BeControlled(data.clone())).await { break; }
|
||||||
.send(SignalingEvent::BeControlled(data.clone()))
|
|
||||||
.await;
|
|
||||||
}
|
}
|
||||||
"soac" => {
|
"soac" => {
|
||||||
// Offers only: structure (keys, types, lengths), never SDP text or ids.
|
// Offers only: structure (keys, types, lengths), never SDP text or ids.
|
||||||
@@ -326,9 +453,7 @@ impl SignalingClient {
|
|||||||
if soac.client_id.is_none() {
|
if soac.client_id.is_none() {
|
||||||
soac.client_id = client_id_opt;
|
soac.client_id = client_id_opt;
|
||||||
}
|
}
|
||||||
let _ = event_sender
|
if !send_event(&event_sender, SignalingEvent::Soac(soac)).await { break; }
|
||||||
.send(SignalingEvent::Soac(soac))
|
|
||||||
.await;
|
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
let _ = e;
|
let _ = e;
|
||||||
@@ -338,20 +463,16 @@ impl SignalingClient {
|
|||||||
}
|
}
|
||||||
"released" => {
|
"released" => {
|
||||||
log::info!("Cloud peer event: generation={} event=released age_s={} pings={} last_ping_gap_s={} ice_id_present={}",generation,started.elapsed().as_secs(),pings,last_ping.elapsed().as_secs(),data.get("ice_id").is_some());
|
log::info!("Cloud peer event: generation={} event=released age_s={} pings={} last_ping_gap_s={} ice_id_present={}",generation,started.elapsed().as_secs(),pings,last_ping.elapsed().as_secs(),data.get("ice_id").is_some());
|
||||||
let _ = event_sender
|
if !send_event(&event_sender, SignalingEvent::Released(data.clone())).await { break; }
|
||||||
.send(SignalingEvent::Released(data.clone()))
|
|
||||||
.await;
|
|
||||||
}
|
}
|
||||||
"left" | "leave" => {
|
"left" | "leave" => {
|
||||||
log::info!("Cloud peer event: generation={} event={} age_s={} pings={} last_ping_gap_s={} ice_id_present={}",generation,event_name,started.elapsed().as_secs(),pings,last_ping.elapsed().as_secs(),data.get("ice_id").is_some());
|
log::info!("Cloud peer event: generation={} event={} age_s={} pings={} last_ping_gap_s={} ice_id_present={}",generation,event_name,started.elapsed().as_secs(),pings,last_ping.elapsed().as_secs(),data.get("ice_id").is_some());
|
||||||
let ice_id = data.get("ice_id").and_then(|v| v.as_str()).unwrap_or("");
|
let ice_id = data.get("ice_id").and_then(|v| v.as_str()).unwrap_or("");
|
||||||
if ice_id.is_empty() {
|
if ice_id.is_empty() {
|
||||||
log::warn!("Cloud room leave without peer identifier; renewing signaling (expiry cause unknown)");
|
log::warn!("Cloud room leave without peer identifier; renewing signaling (expiry cause unknown)");
|
||||||
let _ = event_sender.send(SignalingEvent::Disconnected).await;
|
if !send_event(&event_sender, SignalingEvent::Disconnected).await { break; }
|
||||||
} else {
|
} else {
|
||||||
let _ = event_sender
|
if !send_event(&event_sender, SignalingEvent::Left(data.clone())).await { break; }
|
||||||
.send(SignalingEvent::Left(data.clone()))
|
|
||||||
.await;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_ => {
|
_ => {
|
||||||
@@ -401,28 +522,60 @@ impl SignalingClient {
|
|||||||
let controller_mac = platform.is_some_and(|v| v.as_i64() == Some(4)
|
let controller_mac = platform.is_some_and(|v| v.as_i64() == Some(4)
|
||||||
|| v.as_str().is_some_and(|s| s == "4" || s.to_ascii_lowercase().contains("mac") || s.to_ascii_lowercase().contains("darwin")));
|
|| v.as_str().is_some_and(|s| s == "4" || s.to_ascii_lowercase().contains("mac") || s.to_ascii_lowercase().contains("darwin")));
|
||||||
log::info!("Controller platform: {} mac={}", platform.map(|v| v.to_string()).unwrap_or_default().chars().take(24).collect::<String>(), controller_mac);
|
log::info!("Controller platform: {} mac={}", platform.map(|v| v.to_string()).unwrap_or_default().chars().take(24).collect::<String>(), controller_mac);
|
||||||
let _ = event_sender.send(SignalingEvent::ConnectRequest { capture_type, ice_id, transport:crate::session_ice::SessionIce::from_header(&header), controller_mac }).await;
|
if !send_event(&event_sender, SignalingEvent::ConnectRequest { capture_type, ice_id, transport:crate::session_ice::SessionIce::from_header(&header), controller_mac }).await { break; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Ok(Message::Close(frame)) => {
|
Ok(Message::Close(frame)) => {
|
||||||
log::warn!("Signaling socket closed: generation={} age_s={} close_code={:?} pings={} last_ping_gap_s={}",generation,started.elapsed().as_secs(),frame.map(|f|u16::from(f.code)),pings,last_ping.elapsed().as_secs());
|
log::warn!("Signaling socket closed: generation={} age_s={} close_code={:?} pings={} last_ping_gap_s={}",generation,started.elapsed().as_secs(),frame.map(|f|u16::from(f.code)),pings,last_ping.elapsed().as_secs());
|
||||||
let _ = event_sender.send(SignalingEvent::Disconnected).await;
|
let _ = send_event(&event_sender, SignalingEvent::Disconnected).await;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
Err(_) => {
|
Err(_) => {
|
||||||
log::warn!("Signaling socket receive failed: generation={} age_s={} pings={} last_ping_gap_s={}",generation,started.elapsed().as_secs(),pings,last_ping.elapsed().as_secs());
|
log::warn!("Signaling socket receive failed: generation={} age_s={} pings={} last_ping_gap_s={}",generation,started.elapsed().as_secs(),pings,last_ping.elapsed().as_secs());
|
||||||
let _ = event_sender.send(SignalingEvent::Disconnected).await;
|
let _ = send_event(&event_sender, SignalingEvent::Disconnected).await;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
_ => {}
|
_ => {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// A stalled event queue or a writer that already stopped can end this
|
||||||
|
// loop without a delivered Disconnected. Hand one off from a detached
|
||||||
|
// task so the main loop always learns the room is dead; duplicates are
|
||||||
|
// harmless because it breaks on the first one.
|
||||||
|
let events = event_sender.clone();
|
||||||
|
tokio::spawn(async move { let _ = events.send(SignalingEvent::Disconnected).await; });
|
||||||
|
receiver_done.store(true, Ordering::Relaxed);
|
||||||
log::info!("Signaling receiver stopped: generation={} age_s={}",generation,started.elapsed().as_secs());
|
log::info!("Signaling receiver stopped: generation={} age_s={}",generation,started.elapsed().as_secs());
|
||||||
// Live peer callbacks can retain the old SignalingClient sender.
|
// Live peer callbacks can retain the old SignalingClient sender.
|
||||||
// Explicitly drop its write half too when this room stops reading.
|
// Explicitly drop its write half too when this room stops reading.
|
||||||
writer.abort();
|
writer.abort();
|
||||||
});
|
});
|
||||||
|
let receiver_abort = receiver.abort_handle();
|
||||||
|
|
||||||
|
// Independent of the receive loop: a consumer that stops draining events
|
||||||
|
// parks the loop inside an `.await`, where the ping deadline can no longer
|
||||||
|
// be observed. The watchdog closes the socket anyway.
|
||||||
|
tokio::spawn(async move {
|
||||||
|
let mut tick = tokio::time::interval(WATCHDOG_TICK);
|
||||||
|
tick.set_missed_tick_behavior(tokio::time::MissedTickBehavior::Delay);
|
||||||
|
loop {
|
||||||
|
tick.tick().await;
|
||||||
|
if watchdog_done.load(Ordering::Relaxed) || watchdog_events.is_closed() { return; }
|
||||||
|
let window_ms = watchdog_ping_window_ms.load(Ordering::Relaxed);
|
||||||
|
let idle_ms = (started.elapsed().as_millis() as u64)
|
||||||
|
.saturating_sub(watchdog_last_rx.load(Ordering::Relaxed));
|
||||||
|
if idle_ms <= window_ms { continue; }
|
||||||
|
log::warn!("Signaling heartbeat lost (watchdog): idle_s={} window_ms={}", idle_ms/1000, window_ms);
|
||||||
|
// Deliver from a detached task: the receiver may be the one parked
|
||||||
|
// on a full queue, and the main loop still needs this event.
|
||||||
|
let events = watchdog_events.clone();
|
||||||
|
tokio::spawn(async move { let _ = events.send(SignalingEvent::Disconnected).await; });
|
||||||
|
receiver_abort.abort();
|
||||||
|
writer_abort.abort();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
Ok(Self { tx_outgoing, _reconnect_key:reconnect_key })
|
Ok(Self { tx_outgoing, _reconnect_key:reconnect_key })
|
||||||
}
|
}
|
||||||
@@ -430,7 +583,10 @@ impl SignalingClient {
|
|||||||
pub async fn emit_event(&self, event: &str, payload: serde_json::Value) -> Result<(), String> {
|
pub async fn emit_event(&self, event: &str, payload: serde_json::Value) -> Result<(), String> {
|
||||||
let packet = format!("42{}", serde_json::json!([event, payload]));
|
let packet = format!("42{}", serde_json::json!([event, payload]));
|
||||||
log::info!("Emitting signaling event: {}", event);
|
log::info!("Emitting signaling event: {}", event);
|
||||||
self.tx_outgoing.send(packet).await.map_err(|e| e.to_string())
|
tokio::time::timeout(SEND_STALL_TIMEOUT, self.tx_outgoing.send(packet))
|
||||||
|
.await
|
||||||
|
.map_err(|_| "signaling send stalled".to_string())?
|
||||||
|
.map_err(|e| e.to_string())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 发送 SOAC 消息(Answer 或 Candidate)
|
/// 发送 SOAC 消息(Answer 或 Candidate)
|
||||||
@@ -445,9 +601,9 @@ impl SignalingClient {
|
|||||||
};
|
};
|
||||||
let msg = format!("42[\"soac\",{}]", payload);
|
let msg = format!("42[\"soac\",{}]", payload);
|
||||||
log::info!("Emitting soac packet: type={}", soac.msg_type);
|
log::info!("Emitting soac packet: type={}", soac.msg_type);
|
||||||
self.tx_outgoing
|
tokio::time::timeout(SEND_STALL_TIMEOUT, self.tx_outgoing.send(msg))
|
||||||
.send(msg)
|
|
||||||
.await
|
.await
|
||||||
|
.map_err(|_| "Send soac timed out".to_string())?
|
||||||
.map_err(|e| format!("Send soac error: {}", e))
|
.map_err(|e| format!("Send soac error: {}", e))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+18
-17
@@ -780,19 +780,20 @@ async fn read_inprocess(
|
|||||||
/// whole IDR frame, otherwise large desktops get near-grey keyframes that sharpen over the GOP (#8).
|
/// whole IDR frame, otherwise large desktops get near-grey keyframes that sharpen over the GOP (#8).
|
||||||
/// Half a second of bitrate still starved repeated 0.5 s-GOP keyframes at 3296x2036/2M; one second did not.
|
/// Half a second of bitrate still starved repeated 0.5 s-GOP keyframes at 3296x2036/2M; one second did not.
|
||||||
fn buffer_kbits(max_kbps: u32, encoder: Encoder) -> u32 {
|
fn buffer_kbits(max_kbps: u32, encoder: Encoder) -> u32 {
|
||||||
if encoder == Encoder::Cpu { max_kbps.clamp(500, 8000) }
|
let env = match encoder {
|
||||||
else if encoder == Encoder::Vaapi {
|
Encoder::Cpu => return max_kbps.clamp(500, 8000),
|
||||||
let requested = std::env::var("UU_VAAPI_BUFFER_MS").ok();
|
Encoder::Vaapi => "UU_VAAPI_BUFFER_MS",
|
||||||
vaapi_buffer_kbits(max_kbps, requested.as_deref()).unwrap_or((max_kbps / 8).clamp(100, 500))
|
Encoder::Nvenc => "UU_NVENC_BUFFER_MS",
|
||||||
}
|
};
|
||||||
else { (max_kbps / 8).clamp(100, 500) }
|
let requested = std::env::var(env).ok();
|
||||||
|
buffer_ms_kbits(max_kbps, requested.as_deref()).unwrap_or((max_kbps / 8).clamp(100, 500))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Opt-in VAAPI VBV buffer: `码率上限 × 毫秒 / 1000` for `UU_VAAPI_BUFFER_MS` in 10-1000 ms.
|
/// Opt-in hardware VBV buffer: `码率上限 × 毫秒 / 1000` for `UU_VAAPI_BUFFER_MS` /
|
||||||
/// The 100-500 kbit default is sized for NVENC; VAAPI quantizes a whole desktop keyframe when
|
/// `UU_NVENC_BUFFER_MS` in 10-1000 ms. With the 100-500 kbit default the encoder quantizes a
|
||||||
/// the buffer is that small, which reads as a blur that sharpens over each GOP (#42).
|
/// whole desktop keyframe, which reads as a blur that sharpens over each GOP (#42 VAAPI, #103 NVENC).
|
||||||
/// Unset, out of range or unparsable values keep the default buffer.
|
/// Unset, out of range or unparsable values keep the default buffer.
|
||||||
fn vaapi_buffer_kbits(max_kbps: u32, value: Option<&str>) -> Option<u32> {
|
fn buffer_ms_kbits(max_kbps: u32, value: Option<&str>) -> Option<u32> {
|
||||||
let ms = value?.trim().parse::<u32>().ok().filter(|ms| (10..=1000).contains(ms))?;
|
let ms = value?.trim().parse::<u32>().ok().filter(|ms| (10..=1000).contains(ms))?;
|
||||||
Some((max_kbps.saturating_mul(ms) / 1000).max(1))
|
Some((max_kbps.saturating_mul(ms) / 1000).max(1))
|
||||||
}
|
}
|
||||||
@@ -1570,17 +1571,17 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn vaapi_buffer_env_is_opt_in_and_bounded() {
|
fn hw_buffer_env_is_opt_in_and_bounded() {
|
||||||
assert_eq!(vaapi_buffer_kbits(30_000, None), None);
|
assert_eq!(buffer_ms_kbits(30_000, None), None);
|
||||||
assert_eq!(vaapi_buffer_kbits(30_000, Some("250")), Some(7500));
|
assert_eq!(buffer_ms_kbits(30_000, Some("250")), Some(7500));
|
||||||
assert_eq!(vaapi_buffer_kbits(30_000, Some(" 10 ")), Some(300));
|
assert_eq!(buffer_ms_kbits(30_000, Some(" 10 ")), Some(300));
|
||||||
assert_eq!(vaapi_buffer_kbits(30_000, Some("1000")), Some(30_000));
|
assert_eq!(buffer_ms_kbits(30_000, Some("1000")), Some(30_000));
|
||||||
// Out of the documented range, empty or unparsable keeps the default buffer.
|
// Out of the documented range, empty or unparsable keeps the default buffer.
|
||||||
for value in ["", "9", "1001", "0", "abc", "-250", "250ms"] {
|
for value in ["", "9", "1001", "0", "abc", "-250", "250ms"] {
|
||||||
assert_eq!(vaapi_buffer_kbits(30_000, Some(value)), None, "{value}");
|
assert_eq!(buffer_ms_kbits(30_000, Some(value)), None, "{value}");
|
||||||
}
|
}
|
||||||
// A tiny cap must not produce a zero-sized buffer.
|
// A tiny cap must not produce a zero-sized buffer.
|
||||||
assert_eq!(vaapi_buffer_kbits(1, Some("10")), Some(1));
|
assert_eq!(buffer_ms_kbits(1, Some("10")), Some(1));
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ impl Decoder for Ffmpeg {
|
|||||||
let mut rgb=av::frame::Video::empty();scaler.run(&decoded,&mut rgb).map_err(|_|"Frame conversion failed")?;
|
let mut rgb=av::frame::Video::empty();scaler.run(&decoded,&mut rgb).map_err(|_|"Frame conversion failed")?;
|
||||||
let mut data=Vec::with_capacity(w as usize*h as usize*3);
|
let mut data=Vec::with_capacity(w as usize*h as usize*3);
|
||||||
for row in 0..h as usize {let start=row*rgb.stride(0);data.extend_from_slice(&rgb.data(0)[start..start+w as usize*3]);}
|
for row in 0..h as usize {let start=row*rgb.stride(0);data.extend_from_slice(&rgb.data(0)[start..start+w as usize*3]);}
|
||||||
frames.push(Frame{width:w,height:h,rgb:data});
|
frames.push(Frame{width:w,height:h,rgb:data,content:None});
|
||||||
} Ok(frames)
|
} Ok(frames)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,13 +1,16 @@
|
|||||||
//! H.264/H.265 decoding through an external `ffmpeg` process, like the host's encoder pipeline.
|
//! H.264/H.265 decoding through an external `ffmpeg` process, like the host's encoder pipeline.
|
||||||
//! Needs only the ffmpeg CLI, not FFmpeg development libraries.
|
//! Needs only the ffmpeg CLI, not FFmpeg development libraries.
|
||||||
//! Output is scaled into a fixed letterboxed size so every frame has a known byte length.
|
//! Output is scaled into a fixed letterboxed canvas so every frame has a known byte length; the
|
||||||
|
//! source size from ffmpeg's stream line tells the window which sub-rectangle is picture content.
|
||||||
use super::desktop::{Decoder,Frame};
|
use super::desktop::{Decoder,Frame};
|
||||||
use super::media::Codec;
|
use super::media::Codec;
|
||||||
use std::io::{Read,Write};
|
use std::io::{BufRead,Read,Write};
|
||||||
use std::process::{Child,ChildStdin,Command,Stdio};
|
use std::process::{Child,ChildStdin,Command,Stdio};
|
||||||
|
use std::sync::Arc;
|
||||||
|
use std::sync::atomic::{AtomicU64,Ordering};
|
||||||
use std::sync::mpsc::{Receiver,TryRecvError};
|
use std::sync::mpsc::{Receiver,TryRecvError};
|
||||||
|
|
||||||
pub struct Cli { child:Child, input:Option<ChildStdin>, codec:Codec, frames:Receiver<Vec<u8>>, width:u32, height:u32 }
|
pub struct Cli { child:Child, input:Option<ChildStdin>, codec:Codec, frames:Receiver<Vec<u8>>, width:u32, height:u32, source:Arc<AtomicU64> }
|
||||||
|
|
||||||
impl Cli {
|
impl Cli {
|
||||||
/// `UU_VIEWER_SIZE=WxH` picks the decoded size (default 1920x1080); `UU_VIEWER_FFMPEG` the binary.
|
/// `UU_VIEWER_SIZE=WxH` picks the decoded size (default 1920x1080); `UU_VIEWER_FFMPEG` the binary.
|
||||||
@@ -23,16 +26,27 @@ impl Cli {
|
|||||||
let filter=format!("scale={width}:{height}:force_original_aspect_ratio=decrease,pad={width}:{height}:(ow-iw)/2:(oh-ih)/2");
|
let filter=format!("scale={width}:{height}:force_original_aspect_ratio=decrease,pad={width}:{height}:(ow-iw)/2:(oh-ih)/2");
|
||||||
let passthrough=passthrough_args(&ffmpeg);
|
let passthrough=passthrough_args(&ffmpeg);
|
||||||
let mut child=Command::new(&ffmpeg)
|
let mut child=Command::new(&ffmpeg)
|
||||||
.args(["-hide_banner","-loglevel","error","-nostdin","-threads","1","-probesize","32","-analyzeduration","0",
|
.args(["-hide_banner","-loglevel","info","-nostats","-nostdin","-threads","1","-probesize","32","-analyzeduration","0",
|
||||||
"-fflags","nobuffer","-flags","low_delay","-f",codec.demuxer(),"-i","pipe:0","-an","-vf",&filter,
|
"-fflags","nobuffer","-flags","low_delay","-f",codec.demuxer(),"-i","pipe:0","-an","-vf",&filter,
|
||||||
"-pix_fmt","rgb24",
|
"-pix_fmt","rgb24",
|
||||||
// Raw H.264/H.265 carries no timestamps; constant-rate output dropped almost every frame of
|
// Raw H.264/H.265 carries no timestamps; constant-rate output dropped almost every frame of
|
||||||
// the official Mac host's stream (270 → 2). Pass frames through unchanged.
|
// the official Mac host's stream (270 → 2). Pass frames through unchanged.
|
||||||
passthrough.0,passthrough.1,"-f","rawvideo","pipe:1"])
|
passthrough.0,passthrough.1,"-f","rawvideo","pipe:1"])
|
||||||
.stdin(Stdio::piped()).stdout(Stdio::piped()).stderr(Stdio::null())
|
.stdin(Stdio::piped()).stdout(Stdio::piped()).stderr(Stdio::piped())
|
||||||
.spawn().map_err(|e|format!("Start ffmpeg decoder: {e}"))?;
|
.spawn().map_err(|e|format!("Start ffmpeg decoder: {e}"))?;
|
||||||
let input=child.stdin.take().ok_or("ffmpeg stdin missing")?;
|
let input=child.stdin.take().ok_or("ffmpeg stdin missing")?;
|
||||||
let mut output=child.stdout.take().ok_or("ffmpeg stdout missing")?;
|
let mut output=child.stdout.take().ok_or("ffmpeg stdout missing")?;
|
||||||
|
// Source picture size from the one-time stream line; 0 until parsed. Only the numbers are kept.
|
||||||
|
let source=Arc::new(AtomicU64::new(0));
|
||||||
|
if let Some(stderr)=child.stderr.take() {
|
||||||
|
let source=source.clone();
|
||||||
|
let _=std::thread::Builder::new().name("uu-viewer-ffmpeg-info".into()).spawn(move||{
|
||||||
|
for line in std::io::BufReader::new(stderr).lines().map_while(Result::ok) {
|
||||||
|
if source.load(Ordering::Relaxed)!=0 {continue}
|
||||||
|
if let Some((w,h))=parse_video_size(&line) {source.store((u64::from(w)<<32)|u64::from(h),Ordering::Relaxed);}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
let size=width as usize*height as usize*3;
|
let size=width as usize*height as usize*3;
|
||||||
// Bounded: a slow window drops decoded frames instead of growing memory.
|
// Bounded: a slow window drops decoded frames instead of growing memory.
|
||||||
let (tx,frames)=std::sync::mpsc::sync_channel(2);
|
let (tx,frames)=std::sync::mpsc::sync_channel(2);
|
||||||
@@ -43,10 +57,23 @@ impl Cli {
|
|||||||
match tx.try_send(frame) { Ok(())|Err(std::sync::mpsc::TrySendError::Full(_))=>{}, Err(_)=>break }
|
match tx.try_send(frame) { Ok(())|Err(std::sync::mpsc::TrySendError::Full(_))=>{}, Err(_)=>break }
|
||||||
}
|
}
|
||||||
}).map_err(|e|format!("Decoder reader: {e}"))?;
|
}).map_err(|e|format!("Decoder reader: {e}"))?;
|
||||||
Ok(Self{child,input:Some(input),codec,frames,width,height})
|
Ok(Self{child,input:Some(input),codec,frames,width,height,source})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// `30000/1001`-style or display strings are irrelevant here: the first WxH on a `Video:` line is the
|
||||||
|
/// coded picture size, which is the aspect the scale+pad filter letterboxes into the canvas.
|
||||||
|
fn parse_video_size(line:&str)->Option<(u32,u32)> {
|
||||||
|
let rest=line.split_once("Video:")?.1;
|
||||||
|
rest.split(|c:char|c==','||c==' '||c=='('||c==')'||c=='['||c==']').find_map(|token|{
|
||||||
|
let token=token.trim_matches(|c:char|!c.is_ascii_digit()&&c!='x');
|
||||||
|
let (w,h)=token.split_once('x')?;
|
||||||
|
if w.is_empty()||h.is_empty()||!w.bytes().all(|b|b.is_ascii_digit())||!h.bytes().all(|b|b.is_ascii_digit()) {return None}
|
||||||
|
let (w,h)=(w.parse::<u32>().ok()?,h.parse::<u32>().ok()?);
|
||||||
|
((16..=16384).contains(&w)&&(16..=16384).contains(&h)).then_some((w,h))
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
/// FFmpeg ≥ 5.1 has `-fps_mode`; FFmpeg 8+ removed `-vsync`, and Ubuntu 22.04's 4.4 lacks `-fps_mode`.
|
/// FFmpeg ≥ 5.1 has `-fps_mode`; FFmpeg 8+ removed `-vsync`, and Ubuntu 22.04's 4.4 lacks `-fps_mode`.
|
||||||
/// Probe once per binary with a one-frame null run instead of parsing version strings.
|
/// Probe once per binary with a one-frame null run instead of parsing version strings.
|
||||||
fn passthrough_args(ffmpeg:&str)->(&'static str,&'static str) {
|
fn passthrough_args(ffmpeg:&str)->(&'static str,&'static str) {
|
||||||
@@ -75,7 +102,11 @@ impl Decoder for Cli {
|
|||||||
let mut out=Vec::new();
|
let mut out=Vec::new();
|
||||||
loop {
|
loop {
|
||||||
match self.frames.try_recv() {
|
match self.frames.try_recv() {
|
||||||
Ok(rgb)=>out.push(Frame{width:self.width,height:self.height,rgb}),
|
Ok(rgb)=>{
|
||||||
|
let source=self.source.load(Ordering::Relaxed);
|
||||||
|
let content=(source!=0).then(||((source>>32) as u32,source as u32));
|
||||||
|
out.push(Frame{width:self.width,height:self.height,rgb,content})
|
||||||
|
},
|
||||||
Err(TryRecvError::Empty)=>break,
|
Err(TryRecvError::Empty)=>break,
|
||||||
Err(TryRecvError::Disconnected)=>return Err("ffmpeg decoder exited".into()),
|
Err(TryRecvError::Disconnected)=>return Err("ffmpeg decoder exited".into()),
|
||||||
}
|
}
|
||||||
@@ -115,7 +146,7 @@ impl Drop for Cli { fn drop(&mut self) { let _=self.child.kill(); let _=self.chi
|
|||||||
// Exercise the same streaming process and RGB conversion as SDL, then drain at EOF.
|
// Exercise the same streaming process and RGB conversion as SDL, then drain at EOF.
|
||||||
let mut frames=cli.decode(data).unwrap();drop(cli.input.take());
|
let mut frames=cli.decode(data).unwrap();drop(cli.input.take());
|
||||||
loop {match cli.frames.recv_timeout(std::time::Duration::from_secs(5)) {
|
loop {match cli.frames.recv_timeout(std::time::Duration::from_secs(5)) {
|
||||||
Ok(rgb)=>frames.push(Frame{width:32,height:32,rgb}),
|
Ok(rgb)=>frames.push(Frame{width:32,height:32,rgb,content:None}),
|
||||||
Err(std::sync::mpsc::RecvTimeoutError::Disconnected)=>break,
|
Err(std::sync::mpsc::RecvTimeoutError::Disconnected)=>break,
|
||||||
Err(e)=>panic!("{codec:?} decoder did not finish: {e}"),
|
Err(e)=>panic!("{codec:?} decoder did not finish: {e}"),
|
||||||
}}
|
}}
|
||||||
@@ -128,4 +159,11 @@ impl Drop for Cli { fn drop(&mut self) { let _=self.child.kill(); let _=self.chi
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#[test] fn source_size_is_read_from_the_ffmpeg_stream_line(){
|
||||||
|
assert_eq!(super::parse_video_size(" Stream #0:0: Video: h264 (High), yuv420p(progressive), 3024x1964, 25 fps"),Some((3024,1964)));
|
||||||
|
assert_eq!(super::parse_video_size("Stream #0:0: Video: hevc, yuv420p, 1920x1080 [SAR 1:1 DAR 16:9]"),Some((1920,1080)));
|
||||||
|
assert_eq!(super::parse_video_size("Stream #0:0: Audio: opus, 48000 Hz, stereo"),None);
|
||||||
|
assert_eq!(super::parse_video_size("frame= 1 fps=0.0 q=0.0"),None);
|
||||||
|
assert_eq!(super::parse_video_size("Stream #0:0: Video: h264, 1920xsynth"),None);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -5,7 +5,8 @@ pub struct Desktop { pub units:Latest<super::media::AccessUnit>, pub pli:Arc<Ato
|
|||||||
impl Default for Desktop {
|
impl Default for Desktop {
|
||||||
fn default()->Self {Self{units:Latest::new(3),pli:Arc::new(AtomicBool::new(false)),reset:Arc::new(AtomicBool::new(false)),ssrc:Arc::new(AtomicU32::new(0))}}
|
fn default()->Self {Self{units:Latest::new(3),pli:Arc::new(AtomicBool::new(false)),reset:Arc::new(AtomicBool::new(false)),ssrc:Arc::new(AtomicU32::new(0))}}
|
||||||
}
|
}
|
||||||
pub struct Frame { pub width:u32, pub height:u32, pub rgb:Vec<u8> }
|
/// `content` is the source picture size inside the (possibly padded) RGB canvas; None = full frame.
|
||||||
|
pub struct Frame { pub width:u32, pub height:u32, pub rgb:Vec<u8>, pub content:Option<(u32,u32)> }
|
||||||
pub trait Decoder { fn set_codec(&mut self,codec:super::media::Codec)->Result<(),String>; fn decode(&mut self, au:&[u8])->Result<Vec<Frame>,String>; fn reset(&mut self); }
|
pub trait Decoder { fn set_codec(&mut self,codec:super::media::Codec)->Result<(),String>; fn decode(&mut self, au:&[u8])->Result<Vec<Frame>,String>; fn reset(&mut self); }
|
||||||
pub trait FrameSink { fn present(&mut self,frame:&Frame)->Result<(),String>; }
|
pub trait FrameSink { fn present(&mut self,frame:&Frame)->Result<(),String>; }
|
||||||
/// Counts only (access units, presented frames, decode errors) for the periodic stats line.
|
/// Counts only (access units, presented frames, decode errors) for the periodic stats line.
|
||||||
@@ -29,7 +30,7 @@ pub fn display(decoder:&mut dyn Decoder,sink:&mut dyn FrameSink,au:&[u8],codec:s
|
|||||||
}
|
}
|
||||||
#[cfg(test)] mod tests {
|
#[cfg(test)] mod tests {
|
||||||
use super::*;
|
use super::*;
|
||||||
struct Mock(bool);impl Decoder for Mock {fn set_codec(&mut self,_:crate::viewer::media::Codec)->Result<(),String>{Ok(())} fn decode(&mut self,_:&[u8])->Result<Vec<Frame>,String>{if self.0{Err("synthetic".into())}else{Ok(vec![Frame{width:1,height:1,rgb:vec![0;3]}])}} fn reset(&mut self){self.0=false;}}
|
struct Mock(bool);impl Decoder for Mock {fn set_codec(&mut self,_:crate::viewer::media::Codec)->Result<(),String>{Ok(())} fn decode(&mut self,_:&[u8])->Result<Vec<Frame>,String>{if self.0{Err("synthetic".into())}else{Ok(vec![Frame{width:1,height:1,rgb:vec![0;3],content:None}])}} fn reset(&mut self){self.0=false;}}
|
||||||
struct Sink(usize);impl FrameSink for Sink{fn present(&mut self,f:&Frame)->Result<(),String>{assert_eq!(f.rgb.len(),3);self.0+=1;Ok(())}}
|
struct Sink(usize);impl FrameSink for Sink{fn present(&mut self,f:&Frame)->Result<(),String>{assert_eq!(f.rgb.len(),3);self.0+=1;Ok(())}}
|
||||||
#[test] fn decode_error_requests_pli_and_recovers(){let mut d=Mock(true);let mut s=Sink(0);let p=AtomicBool::new(false);display(&mut d,&mut s,&[],crate::viewer::media::Codec::H264,&p).unwrap();assert!(p.load(Ordering::Acquire));display(&mut d,&mut s,&[],crate::viewer::media::Codec::H264,&p).unwrap();assert_eq!(s.0,1);}
|
#[test] fn decode_error_requests_pli_and_recovers(){let mut d=Mock(true);let mut s=Sink(0);let p=AtomicBool::new(false);display(&mut d,&mut s,&[],crate::viewer::media::Codec::H264,&p).unwrap();assert!(p.load(Ordering::Acquire));display(&mut d,&mut s,&[],crate::viewer::media::Codec::H264,&p).unwrap();assert_eq!(s.0,1);}
|
||||||
}
|
}
|
||||||
@@ -35,6 +35,15 @@ pub fn mac_keycode(scan:i32)->Option<i32>{
|
|||||||
_=>return None,
|
_=>return None,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
/// The content rectangle inside a decoder canvas padded to a fixed size (ffmpeg's scale+pad).
|
||||||
|
/// Mirrors `force_original_aspect_ratio=decrease,pad=…:(ow-iw)/2:(oh-ih)/2` so pointer input
|
||||||
|
/// ignores the padding instead of compressing the valid area.
|
||||||
|
pub fn content_rect(canvas:(u32,u32),content:(u32,u32))->Option<(f64,f64,f64,f64)> {
|
||||||
|
if canvas.0==0||canvas.1==0||content.0==0||content.1==0 {return None}
|
||||||
|
let scale=(canvas.0 as f64/content.0 as f64).min(canvas.1 as f64/content.1 as f64);
|
||||||
|
let(w,h)=(content.0 as f64*scale,content.1 as f64*scale);
|
||||||
|
Some(((canvas.0 as f64-w)/2.,(canvas.1 as f64-h)/2.,w,h))
|
||||||
|
}
|
||||||
#[derive(Clone,Copy,Debug,PartialEq)]
|
#[derive(Clone,Copy,Debug,PartialEq)]
|
||||||
pub struct Viewport { pub x:f64, pub y:f64, pub width:f64, pub height:f64 }
|
pub struct Viewport { pub x:f64, pub y:f64, pub width:f64, pub height:f64 }
|
||||||
impl Viewport {
|
impl Viewport {
|
||||||
@@ -75,6 +84,14 @@ impl Input {
|
|||||||
let changed=if down{self.buttons.insert(button)}else{self.buttons.remove(&button)};
|
let changed=if down{self.buttons.insert(button)}else{self.buttons.remove(&button)};
|
||||||
changed.then(||json!({"action":if down{"mouse_press"}else{"mouse_release"},"button":button}))
|
changed.then(||json!({"action":if down{"mouse_press"}else{"mouse_release"},"button":button}))
|
||||||
}
|
}
|
||||||
|
/// SDL wheel units are notches; the wire uses the Mac convention (one notch = 120).
|
||||||
|
/// Positive y is wheel-up, matching the host's `mouse_scroll` (button 4).
|
||||||
|
pub fn scroll(&mut self,x:f64,y:f64)->Option<Value> {
|
||||||
|
if self.view_only {return None}
|
||||||
|
let(dx,dy)=((x*120.).round() as i32,(y*120.).round() as i32);
|
||||||
|
if dx==0&&dy==0 {return None}
|
||||||
|
Some(json!({"action":"mouse_scroll","delta_x":dx,"delta_y":dy}))
|
||||||
|
}
|
||||||
pub fn release_all(&mut self)->Vec<Value> {
|
pub fn release_all(&mut self)->Vec<Value> {
|
||||||
let mut out=Vec::new();
|
let mut out=Vec::new();
|
||||||
for key in std::mem::take(&mut self.keys).into_values().collect::<BTreeSet<_>>() {out.push(json!({"action":"kbd_release","key":key}));}
|
for key in std::mem::take(&mut self.keys).into_values().collect::<BTreeSet<_>>() {out.push(json!({"action":"kbd_release","key":key}));}
|
||||||
@@ -117,6 +134,15 @@ impl Input {
|
|||||||
assert!(view_only(None,Some("1")).unwrap());assert!(view_only(Some("--view-only"),Some("0")).unwrap());
|
assert!(view_only(None,Some("1")).unwrap());assert!(view_only(Some("--view-only"),Some("0")).unwrap());
|
||||||
assert!(view_only(Some("invalid"),None).is_err());
|
assert!(view_only(Some("invalid"),None).is_err());
|
||||||
}
|
}
|
||||||
|
#[test] fn wheel_notches_use_mac_wire_units(){
|
||||||
|
let mut i=Input::default();
|
||||||
|
assert_eq!(i.scroll(0.,1.).unwrap(),json!({"action":"mouse_scroll","delta_x":0,"delta_y":120}));
|
||||||
|
assert_eq!(i.scroll(0.,-1.).unwrap()["delta_y"],-120);
|
||||||
|
assert_eq!(i.scroll(1.,-2.).unwrap(),json!({"action":"mouse_scroll","delta_x":120,"delta_y":-240}));
|
||||||
|
assert_eq!(i.scroll(0.,0.1).unwrap()["delta_y"],12); // precise trackpad deltas
|
||||||
|
assert!(i.scroll(0.,0.).is_none());
|
||||||
|
assert!(Input::new(true).scroll(0.,1.).is_none());
|
||||||
|
}
|
||||||
#[test] fn mappings_encoding_and_focus() {
|
#[test] fn mappings_encoding_and_focus() {
|
||||||
for (scan,vk) in [(4,65),(29,90),(39,48),(58,112),(80,37),(224,162),(230,165),(52,222)] {assert_eq!(windows_vk(scan),Some(vk));}
|
for (scan,vk) in [(4,65),(29,90),(39,48),(58,112),(80,37),(224,162),(230,165),(52,222)] {assert_eq!(windows_vk(scan),Some(vk));}
|
||||||
assert_eq!(windows_vk(100),None);
|
assert_eq!(windows_vk(100),None);
|
||||||
@@ -138,4 +164,21 @@ assert!(i.release_all().is_empty());
|
|||||||
assert_eq!(v.motion(1010.,1000.).unwrap()["abs_x"],1.0);
|
assert_eq!(v.motion(1010.,1000.).unwrap()["abs_x"],1.0);
|
||||||
assert!(v.motion(f64::NAN,0.).is_none());
|
assert!(v.motion(f64::NAN,0.).is_none());
|
||||||
}
|
}
|
||||||
|
#[test] fn padded_canvas_maps_only_its_content_rectangle(){
|
||||||
|
// 16:10 picture inside the default 16:9 canvas: 1728x1080 centred, 96 px pillarbox each side.
|
||||||
|
assert_eq!(content_rect((1920,1080),(1280,800)),Some((96.,0.,1728.,1080.)));
|
||||||
|
assert_eq!(content_rect((1920,1080),(1920,1080)),Some((0.,0.,1920.,1080.)));
|
||||||
|
// 4:3 picture: 1440x1080 centred, 240 px each side.
|
||||||
|
assert_eq!(content_rect((1920,1080),(640,480)),Some((240.,0.,1440.,1080.)));
|
||||||
|
assert_eq!(content_rect((0,1080),(640,480)),None);
|
||||||
|
// The content rectangle's edges are the screen edges, not the canvas edges.
|
||||||
|
let (x,y,w,h)=content_rect((1920,1080),(1280,800)).unwrap();
|
||||||
|
let v=Viewport::fit((1920,1080),(1280,800));
|
||||||
|
assert_eq!((x,y,w,h),(v.x,v.y,v.width,v.height));
|
||||||
|
let abs=|px:f64|v.motion(px,540.).unwrap();
|
||||||
|
assert_eq!(abs(96.)["abs_x"],0.0);
|
||||||
|
assert_eq!(abs(960.)["abs_x"],0.5);
|
||||||
|
assert_eq!(abs(1824.)["abs_x"],1.0);
|
||||||
|
assert_eq!(abs(0.)["abs_x"],0.0); // padding is clamped to the screen edge
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+60
-9
@@ -8,7 +8,10 @@ impl Window {
|
|||||||
pub fn new()->Result<Self,String>{
|
pub fn new()->Result<Self,String>{
|
||||||
let sdl=sdl2::init()?;let video=sdl.video()?;
|
let sdl=sdl2::init()?;let video=sdl.video()?;
|
||||||
let window=video.window("Native viewer (experimental)",1280,720).position_centered().resizable().build().map_err(|_|"Window creation failed")?;
|
let window=video.window("Native viewer (experimental)",1280,720).position_centered().resizable().build().map_err(|_|"Window creation failed")?;
|
||||||
let canvas=window.into_canvas().build().map_err(|_|"Renderer creation failed")?;
|
let mut canvas=window.into_canvas().build().map_err(|_|"Renderer creation failed")?;
|
||||||
|
// Wayland maps a toplevel only after its first buffer; without this the window stays
|
||||||
|
// invisible until the first decoded frame, which a stalled stream never delivers.
|
||||||
|
canvas.set_draw_color(sdl2::pixels::Color::BLACK);canvas.clear();canvas.present();
|
||||||
let events=sdl.event_pump()?;let clipboard=video.clipboard();
|
let events=sdl.event_pump()?;let clipboard=video.clipboard();
|
||||||
let(clipboard_tx,clipboard_requests)=tokio::sync::mpsc::channel(16);
|
let(clipboard_tx,clipboard_requests)=tokio::sync::mpsc::channel(16);
|
||||||
Ok(Self{canvas,events,_sdl:sdl,frame:(1920,1080),focused:true,files:false,mac:false,clipboard,clipboard_dirty:true,clipboard_tx,clipboard_requests,last_frame:None})
|
Ok(Self{canvas,events,_sdl:sdl,frame:(1920,1080),focused:true,files:false,mac:false,clipboard,clipboard_dirty:true,clipboard_tx,clipboard_requests,last_frame:None})
|
||||||
@@ -38,11 +41,32 @@ impl Window {
|
|||||||
}
|
}
|
||||||
pub fn poll(&mut self,input:&mut Input)->(bool,Vec<serde_json::Value>){
|
pub fn poll(&mut self,input:&mut Input)->(bool,Vec<serde_json::Value>){
|
||||||
let viewport=self.viewport();
|
let viewport=self.viewport();
|
||||||
let dirty=&mut self.clipboard_dirty;
|
let dirty=&mut self.clipboard_dirty;let mut redraw=false;
|
||||||
let events=self.events.poll_iter().inspect(|event|{
|
let events=self.events.poll_iter().inspect(|event|{
|
||||||
if matches!(event,Event::ClipboardUpdate{..}|Event::Window{win_event:WindowEvent::FocusGained,..}){*dirty=true;}
|
if matches!(event,Event::ClipboardUpdate{..}|Event::Window{win_event:WindowEvent::FocusGained,..}){*dirty=true;}
|
||||||
|
redraw|=needs_redraw(event);
|
||||||
});
|
});
|
||||||
translate_actions(events,input,viewport,&mut self.focused,&mut self.files)
|
let result=translate_actions(events,input,viewport,&mut self.focused,&mut self.files);
|
||||||
|
// A compositor resize (tiling, maximize) leaves the surface without a buffer of the new size
|
||||||
|
// until the next frame; a static remote desktop sends none, so repaint the last frame now.
|
||||||
|
if redraw {if let Some(frame)=self.last_frame.take(){
|
||||||
|
log::debug!("Viewer window resized: {:?}",self.canvas.window().size());
|
||||||
|
if let Err(e)=self.draw(&frame){log::warn!("Viewer redraw failed: {e}");}
|
||||||
|
self.last_frame=Some(frame);
|
||||||
|
}else{self.canvas.set_draw_color(sdl2::pixels::Color::BLACK);self.canvas.clear();self.canvas.present();}}
|
||||||
|
result
|
||||||
|
}
|
||||||
|
fn draw(&mut self,frame:&Frame)->Result<(),String>{
|
||||||
|
// Pad bars belong to the decoded canvas, not the remote picture: viewport and input use the
|
||||||
|
// content aspect, and only the content sub-rectangle of the texture is drawn.
|
||||||
|
let content=frame.content.unwrap_or((frame.width,frame.height));
|
||||||
|
self.frame=content;let v=self.viewport();let creator=self.canvas.texture_creator();
|
||||||
|
let mut texture=creator.create_texture_streaming(PixelFormatEnum::RGB24,frame.width,frame.height).map_err(|_|"Texture creation failed")?;
|
||||||
|
texture.update(None,&frame.rgb,frame.width as usize*3).map_err(|_|"Texture update failed")?;
|
||||||
|
self.canvas.set_draw_color(sdl2::pixels::Color::BLACK);self.canvas.clear();
|
||||||
|
let src=super::input::content_rect((frame.width,frame.height),content)
|
||||||
|
.map(|(x,y,w,h)|Rect::new(x.round() as i32,y.round() as i32,w.round().max(1.) as u32,h.round().max(1.) as u32));
|
||||||
|
self.canvas.copy(&texture,src,Some(Rect::new(v.x.round() as i32,v.y.round() as i32,v.width.round().max(1.) as u32,v.height.round().max(1.) as u32)))?;self.canvas.present();Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fn clipboard_text(bytes:&[u8])->Option<String>{
|
fn clipboard_text(bytes:&[u8])->Option<String>{
|
||||||
@@ -81,20 +105,24 @@ fn translate_actions(events:impl IntoIterator<Item=Event>,input:&mut Input,viewp
|
|||||||
Event::MouseMotion{x,y,..}=>viewport.motion(x as f64,y as f64),
|
Event::MouseMotion{x,y,..}=>viewport.motion(x as f64,y as f64),
|
||||||
Event::MouseButtonDown{mouse_btn,..}=>button(mouse_btn).and_then(|b|input.button(b,true)),
|
Event::MouseButtonDown{mouse_btn,..}=>button(mouse_btn).and_then(|b|input.button(b,true)),
|
||||||
Event::MouseButtonUp{mouse_btn,..}=>button(mouse_btn).and_then(|b|input.button(b,false)),
|
Event::MouseButtonUp{mouse_btn,..}=>button(mouse_btn).and_then(|b|input.button(b,false)),
|
||||||
|
Event::MouseWheel{x,y,precise_x,precise_y,direction,..}=>{
|
||||||
|
let(dx,dy)=if precise_x!=0.||precise_y!=0.{(f64::from(precise_x),f64::from(precise_y))}else{(f64::from(x),f64::from(y))};
|
||||||
|
let(dx,dy)=match direction{sdl2::mouse::MouseWheelDirection::Flipped=>(-dx,-dy),_=>(dx,dy)};
|
||||||
|
input.scroll(dx,dy)
|
||||||
|
},
|
||||||
_=>None,
|
_=>None,
|
||||||
};if let Some(m)=message{messages.push(m);}
|
};if let Some(m)=message{messages.push(m);}
|
||||||
} (quit,messages)
|
} (quit,messages)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn needs_redraw(event:&Event)->bool{
|
||||||
|
matches!(event,Event::Window{win_event:WindowEvent::SizeChanged(..)|WindowEvent::Resized(..)|WindowEvent::Exposed|WindowEvent::Maximized|WindowEvent::Restored,..})
|
||||||
|
}
|
||||||
fn button(b:MouseButton)->Option<i32>{match b{MouseButton::Left=>Some(1),MouseButton::Right=>Some(2),MouseButton::Middle=>Some(4),_=>None}}
|
fn button(b:MouseButton)->Option<i32>{match b{MouseButton::Left=>Some(1),MouseButton::Right=>Some(2),MouseButton::Middle=>Some(4),_=>None}}
|
||||||
impl FrameSink for Window {
|
impl FrameSink for Window {
|
||||||
fn present(&mut self,frame:&Frame)->Result<(),String>{
|
fn present(&mut self,frame:&Frame)->Result<(),String>{
|
||||||
self.last_frame=Some(Frame{width:frame.width,height:frame.height,rgb:frame.rgb.clone()});
|
self.last_frame=Some(Frame{width:frame.width,height:frame.height,rgb:frame.rgb.clone(),content:frame.content});
|
||||||
self.frame=(frame.width,frame.height);let v=self.viewport();let creator=self.canvas.texture_creator();
|
self.draw(frame)
|
||||||
let mut texture=creator.create_texture_streaming(PixelFormatEnum::RGB24,frame.width,frame.height).map_err(|_|"Texture creation failed")?;
|
|
||||||
texture.update(None,&frame.rgb,frame.width as usize*3).map_err(|_|"Texture update failed")?;
|
|
||||||
self.canvas.set_draw_color(sdl2::pixels::Color::BLACK);self.canvas.clear();
|
|
||||||
self.canvas.copy(&texture,None,Some(Rect::new(v.x as i32,v.y as i32,v.width as u32,v.height as u32)))?;self.canvas.present();Ok(())
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pub async fn run(session:&mut Session,window:&mut Window,decoder:&mut dyn super::desktop::Decoder,view_only:bool,device:&str)->Result<(),String>{
|
pub async fn run(session:&mut Session,window:&mut Window,decoder:&mut dyn super::desktop::Decoder,view_only:bool,device:&str)->Result<(),String>{
|
||||||
@@ -432,6 +460,29 @@ async fn pump_type_job(job: &mut TypeJob, session: &mut Session, window: &mut Wi
|
|||||||
assert!(input.release_all().is_empty());
|
assert!(input.release_all().is_empty());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#[test] fn compositor_resize_and_expose_repaint_the_last_frame(){
|
||||||
|
let w=|win_event|Event::Window{timestamp:0,window_id:1,win_event};
|
||||||
|
for e in [WindowEvent::SizeChanged(1280,800),WindowEvent::Resized(1280,800),WindowEvent::Exposed,WindowEvent::Maximized,WindowEvent::Restored]{assert!(needs_redraw(&w(e)));}
|
||||||
|
for e in [WindowEvent::FocusGained,WindowEvent::Moved(0,0)]{assert!(!needs_redraw(&w(e)));}
|
||||||
|
}
|
||||||
|
#[test] fn wheel_events_become_scroll_messages(){
|
||||||
|
use sdl2::mouse::MouseWheelDirection;
|
||||||
|
let mut input=Input::default();let mut focused=true;
|
||||||
|
let v=Viewport::fit((800,600),(1920,1080));
|
||||||
|
let wheel=|direction,x,y|Event::MouseWheel{timestamp:0,window_id:1,which:0,mouse_x:0,mouse_y:0,x,y,precise_x:0.,precise_y:0.,direction};
|
||||||
|
let(_,out)=translate([wheel(MouseWheelDirection::Normal,0,1),wheel(MouseWheelDirection::Flipped,0,1),wheel(MouseWheelDirection::Normal,0,0)],&mut input,v,&mut focused);
|
||||||
|
assert_eq!(out.len(),2);
|
||||||
|
assert_eq!(out[0]["action"],"mouse_scroll");
|
||||||
|
assert_eq!(out[0]["delta_y"],120);
|
||||||
|
assert_eq!(out[1]["delta_y"],-120);
|
||||||
|
// Trackpads report fractional precise deltas; a quarter notch is 30 wire units.
|
||||||
|
let precise=Event::MouseWheel{timestamp:0,window_id:1,which:0,mouse_x:0,mouse_y:0,x:0,y:0,precise_x:0.,precise_y:-0.25,direction:MouseWheelDirection::Normal};
|
||||||
|
let(_,out)=translate([precise],&mut input,v,&mut focused);
|
||||||
|
assert_eq!(out[0]["delta_y"],-30);
|
||||||
|
let mut watch=Input::new(true);let mut watching=true;
|
||||||
|
let(_,out)=translate([wheel(MouseWheelDirection::Normal,0,1)],&mut watch,v,&mut watching);
|
||||||
|
assert!(out.is_empty());
|
||||||
|
}
|
||||||
#[test] fn watch_events_never_emit_input_and_still_close(){
|
#[test] fn watch_events_never_emit_input_and_still_close(){
|
||||||
let mut input=Input::new(true);let mut focused=true;
|
let mut input=Input::new(true);let mut focused=true;
|
||||||
assert!(input.key(4,true).is_none());assert!(input.button(1,true).is_none());assert!(!input.enabled());
|
assert!(input.key(4,true).is_none());assert!(input.button(1,true).is_none());assert!(!input.enabled());
|
||||||
|
|||||||
+21
-11
@@ -64,6 +64,9 @@ impl DesktopRole {
|
|||||||
stream: Default::default(), stream_task: Default::default(), screen: Default::default(), tracking: Default::default(), request: Default::default() }
|
stream: Default::default(), stream_task: Default::default(), screen: Default::default(), tracking: Default::default(), request: Default::default() }
|
||||||
}
|
}
|
||||||
pub fn is_desktop(&self) -> bool { *self.active.borrow() }
|
pub fn is_desktop(&self) -> bool { *self.active.borrow() }
|
||||||
|
/// A promoted peer whose video ended on its own (capture failed while locked or off, #114);
|
||||||
|
/// capture_desktop on it starts the video again.
|
||||||
|
fn stream_ended(&self) -> bool { self.stream_task.lock().unwrap().as_ref().is_some_and(|task| task.is_finished()) }
|
||||||
fn input(&self) -> Option<Arc<crate::input::DesktopInputSession>> { self.input.lock().unwrap().clone() }
|
fn input(&self) -> Option<Arc<crate::input::DesktopInputSession>> { self.input.lock().unwrap().clone() }
|
||||||
fn screen_or(&self, screen: &Arc<ScreenCapture>) -> Arc<ScreenCapture> {
|
fn screen_or(&self, screen: &Arc<ScreenCapture>) -> Arc<ScreenCapture> {
|
||||||
self.screen.lock().unwrap().clone().unwrap_or_else(|| screen.clone())
|
self.screen.lock().unwrap().clone().unwrap_or_else(|| screen.clone())
|
||||||
@@ -1316,10 +1319,14 @@ impl WebRtcSession {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else if action == sa::CAPTURE_DESKTOP && channel_name == "CONTROL_DATA_CHANNEL" {
|
} else if action == sa::CAPTURE_DESKTOP && channel_name == "CONTROL_DATA_CHANNEL" {
|
||||||
if message_role.is_desktop() {
|
if message_role.is_desktop() && !message_role.stream_ended() {
|
||||||
log::info!("SimpleAction 4 (capture_desktop) received on a desktop connection");
|
log::info!("SimpleAction 4 (capture_desktop) received on a desktop connection");
|
||||||
} else if let Some(request) = message_role.request.get() {
|
} else if let Some(request) = message_role.request.get() {
|
||||||
log::info!("SimpleAction 4 (capture_desktop) received on a tool connection; starting the desktop");
|
if message_role.is_desktop() {
|
||||||
|
log::info!("SimpleAction 4 (capture_desktop) received on a tool connection whose desktop video ended; restarting it");
|
||||||
|
} else {
|
||||||
|
log::info!("SimpleAction 4 (capture_desktop) received on a tool connection; starting the desktop");
|
||||||
|
}
|
||||||
request();
|
request();
|
||||||
} else {
|
} else {
|
||||||
log::info!("SimpleAction 4 (capture_desktop) not handled: tool connection without a desktop route");
|
log::info!("SimpleAction 4 (capture_desktop) not handled: tool connection without a desktop route");
|
||||||
@@ -1461,18 +1468,21 @@ impl WebRtcSession {
|
|||||||
/// Makes this tool peer the desktop: it takes the input lease, starts the video it negotiated
|
/// Makes this tool peer the desktop: it takes the input lease, starts the video it negotiated
|
||||||
/// (H.264; audio was never negotiated) and repeats the desktop CONTROL initialization.
|
/// (H.264; audio was never negotiated) and repeats the desktop CONTROL initialization.
|
||||||
/// `screen` replaces a capture that was unavailable when the peer was offered.
|
/// `screen` replaces a capture that was unavailable when the peer was offered.
|
||||||
|
/// A promoted peer whose video ended keeps its input lease and only restarts the video.
|
||||||
pub fn promote(&self, screen: Option<Arc<ScreenCapture>>) {
|
pub fn promote(&self, screen: Option<Arc<ScreenCapture>>) {
|
||||||
if self.role.is_desktop() { return; }
|
let restart = self.role.is_desktop();
|
||||||
|
if restart && !self.role.stream_ended() { return; }
|
||||||
if let Some(screen) = screen { *self.role.screen.lock().unwrap() = Some(screen); }
|
if let Some(screen) = screen { *self.role.screen.lock().unwrap() = Some(screen); }
|
||||||
let session = self.input.desktop_session();
|
if !restart {
|
||||||
if self.pc.connection_state() == RTCPeerConnectionState::Connected { session.connected(); }
|
let session = self.input.desktop_session();
|
||||||
*self.role.input.lock().unwrap() = Some(session);
|
if self.pc.connection_state() == RTCPeerConnectionState::Connected { session.connected(); }
|
||||||
self.role.active.send_replace(true);
|
*self.role.input.lock().unwrap() = Some(session);
|
||||||
let stream = self.role.stream.lock().unwrap().clone();
|
self.role.active.send_replace(true);
|
||||||
if let Some(stream) = stream {
|
|
||||||
let task = stream.spawn(self.role.screen.lock().unwrap().clone(), self.role.active.subscribe());
|
|
||||||
if let Some(old) = std::mem::replace(&mut *self.role.stream_task.lock().unwrap(), task) { old.abort(); }
|
|
||||||
}
|
}
|
||||||
|
let stream = self.role.stream.lock().unwrap().clone();
|
||||||
|
let task = stream.and_then(|stream| stream.spawn(self.role.screen.lock().unwrap().clone(), self.role.active.subscribe()));
|
||||||
|
if let Some(old) = std::mem::replace(&mut *self.role.stream_task.lock().unwrap(), task) { old.abort(); }
|
||||||
|
if restart { log::info!("Desktop video restarted on a tool connection after its stream ended"); return; }
|
||||||
if !cfg!(test) { track_session(self.pc.clone(), self.actions.clone(), &self.role); }
|
if !cfg!(test) { track_session(self.pc.clone(), self.actions.clone(), &self.role); }
|
||||||
log::info!("Desktop started on an existing tool connection");
|
log::info!("Desktop started on an existing tool connection");
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -121,13 +121,17 @@ impl PeerConnectionInternal {
|
|||||||
ice_gather_policy: configuration.ice_transport_policy,
|
ice_gather_policy: configuration.ice_transport_policy,
|
||||||
})?);
|
})?);
|
||||||
|
|
||||||
// Create the ice transport
|
// Create the ice transport. Its state callback must read the real DTLS
|
||||||
pc.ice_transport = pc.create_ice_transport(api).await;
|
// transport, which only exists after the ICE transport, so it is wired
|
||||||
|
// in through a weak slot (the placeholder would always report New).
|
||||||
|
let dtls_slot = Arc::new(std::sync::OnceLock::new());
|
||||||
|
pc.ice_transport = pc.create_ice_transport(api, Arc::clone(&dtls_slot)).await;
|
||||||
|
|
||||||
// Create the DTLS transport
|
// Create the DTLS transport
|
||||||
let certificates = configuration.certificates.drain(..).collect();
|
let certificates = configuration.certificates.drain(..).collect();
|
||||||
pc.dtls_transport =
|
pc.dtls_transport =
|
||||||
Arc::new(api.new_dtls_transport(Arc::clone(&pc.ice_transport), certificates)?);
|
Arc::new(api.new_dtls_transport(Arc::clone(&pc.ice_transport), certificates)?);
|
||||||
|
let _ = dtls_slot.set(Arc::downgrade(&pc.dtls_transport));
|
||||||
|
|
||||||
// Create the SCTP transport
|
// Create the SCTP transport
|
||||||
pc.sctp_transport = Arc::new(api.new_sctp_transport(Arc::clone(&pc.dtls_transport))?);
|
pc.sctp_transport = Arc::new(api.new_sctp_transport(Arc::clone(&pc.dtls_transport))?);
|
||||||
@@ -1106,13 +1110,16 @@ impl PeerConnectionInternal {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(super) async fn create_ice_transport(&self, api: &API) -> Arc<RTCIceTransport> {
|
pub(super) async fn create_ice_transport(
|
||||||
|
&self,
|
||||||
|
api: &API,
|
||||||
|
dtls_slot: Arc<std::sync::OnceLock<Weak<RTCDtlsTransport>>>,
|
||||||
|
) -> Arc<RTCIceTransport> {
|
||||||
let ice_transport = Arc::new(api.new_ice_transport(Arc::clone(&self.ice_gatherer)));
|
let ice_transport = Arc::new(api.new_ice_transport(Arc::clone(&self.ice_gatherer)));
|
||||||
|
|
||||||
let ice_connection_state = Arc::clone(&self.ice_connection_state);
|
let ice_connection_state = Arc::clone(&self.ice_connection_state);
|
||||||
let peer_connection_state = Arc::clone(&self.peer_connection_state);
|
let peer_connection_state = Arc::clone(&self.peer_connection_state);
|
||||||
let is_closed = Arc::clone(&self.is_closed);
|
let is_closed = Arc::clone(&self.is_closed);
|
||||||
let dtls_transport = Arc::clone(&self.dtls_transport);
|
|
||||||
let on_ice_connection_state_change_handler =
|
let on_ice_connection_state_change_handler =
|
||||||
Arc::clone(&self.on_ice_connection_state_change_handler);
|
Arc::clone(&self.on_ice_connection_state_change_handler);
|
||||||
let on_peer_connection_state_change_handler =
|
let on_peer_connection_state_change_handler =
|
||||||
@@ -1139,7 +1146,11 @@ impl PeerConnectionInternal {
|
|||||||
let on_peer_connection_state_change_handler2 =
|
let on_peer_connection_state_change_handler2 =
|
||||||
Arc::clone(&on_peer_connection_state_change_handler);
|
Arc::clone(&on_peer_connection_state_change_handler);
|
||||||
let is_closed2 = Arc::clone(&is_closed);
|
let is_closed2 = Arc::clone(&is_closed);
|
||||||
let dtls_transport_state = dtls_transport.state();
|
let dtls_transport_state = dtls_slot
|
||||||
|
.get()
|
||||||
|
.and_then(Weak::upgrade)
|
||||||
|
.map(|dtls| dtls.state())
|
||||||
|
.unwrap_or(RTCDtlsTransportState::New);
|
||||||
let peer_connection_state2 = Arc::clone(&peer_connection_state);
|
let peer_connection_state2 = Arc::clone(&peer_connection_state);
|
||||||
Box::pin(async move {
|
Box::pin(async move {
|
||||||
RTCPeerConnection::do_ice_connection_state_change(
|
RTCPeerConnection::do_ice_connection_state_change(
|
||||||
|
|||||||
Reference in new issue
Block a user