From c0c04a2c981f029e298a4d0cd5d2f20c2eb4878f Mon Sep 17 00:00:00 2001 From: VallierDev <24893073+VallierDev@users.noreply.github.com> Date: Wed, 28 Oct 2026 20:37:43 +0800 Subject: [PATCH] viewer: request the desktop video track like the official viewer (#124) The official iPhone viewer sends RpcRequest case 15 SendVideoTrackReq (no fields) right after CONTROL opens. Without it a second session only joins the stream already encoded for another viewer: no SPS/PPS/IDR, so it stays black. Co-Authored-By: Claude Opus 5.5 --- src/viewer/rtc.rs | 2 ++ src/viewer/wire.rs | 17 +++++++++++++++++ src/viewer_main.rs | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/viewer/rtc.rs b/src/viewer/rtc.rs index 83698c9..adf9a96 100644 --- a/src/viewer/rtc.rs +++ b/src/viewer/rtc.rs @@ -172,10 +172,12 @@ impl Peer { if index==0 { let weak=Arc::downgrade(&channel);let state=observed.clone(); let chroma444=shape.capture_type==1 && std::env::var("UU_VIEWER_CHROMA").is_ok_and(|v|v=="444"); + let desktop_track=shape.capture_type==1; channel.on_open(Box::new(move ||Box::pin(async move { state.control_open.store(true,Ordering::Release); if let Some(channel)=weak.upgrade(){ let _=channel.send(&bytes::Bytes::from(wire::echo_request_with_clipboard(1,clipboard_enabled))).await; + if desktop_track {let _=channel.send(&bytes::Bytes::from(wire::request_video_track())).await;} if chroma444 {let _=channel.send(&bytes::Bytes::from(wire::request_chroma444())).await;} } }))); diff --git a/src/viewer/wire.rs b/src/viewer/wire.rs index ccac0fd..6b5c92a 100644 --- a/src/viewer/wire.rs +++ b/src/viewer/wire.rs @@ -198,6 +198,14 @@ mod tests { } } +/// RpcRequest case 15 SendVideoTrackReq with no fields (track 0), sent by the official iPhone +/// viewer right after CONTROL opens (host logs: response_field=11 value=None). Without it a +/// second session only joins the stream already encoded for another viewer: no SPS/PPS/IDR (#124). +pub fn request_video_track()->Vec{ + let mut header=Vec::new();int(1,2_000_001,&mut header); + let mut rpc=Vec::new();bytes(1,&header,&mut rpc);bytes(15,&[],&mut rpc); + envelope(2_000_001,21,&rpc) +} /// CaptureSettingRequest field 7 = ChromaFormat 3, wrapped in RPC 21/case 2. pub fn request_chroma444()->Vec{ let mut header=Vec::new();int(1,2_000_000,&mut header); @@ -237,6 +245,15 @@ pub fn media_control(data:&[u8])->(Option,Option){ assert!(s.video_preferences(force).connect_options("synthetic-device",false).unwrap()==options); } } + #[test] fn video_track_request_is_an_empty_rpc_15(){ + let message=request_video_track(); + let fields=decode_wire(&message).unwrap(); + assert!(fields.iter().any(|f|f.number==1)); + let rpc=fields.iter().find_map(|f|match (f.number,&f.value){(21,WireValue::Bytes(b))=>Some(*b),_=>None}).unwrap(); + let rpc=decode_wire(rpc).unwrap(); + assert!(rpc.iter().any(|f|f.number==1)); + assert!(rpc.iter().any(|f|matches!((f.number,&f.value),(15,WireValue::Bytes(b)) if b.is_empty()))); + } #[test] fn chroma_request_and_actual_sync_are_independent_of_encoder_list(){ let request=request_chroma444();let rpc=super::super::tools::blob(&request,21).unwrap(); let setting=super::super::tools::blob(rpc,2).unwrap();assert_eq!(super::super::tools::uint(setting,7),3); diff --git a/src/viewer_main.rs b/src/viewer_main.rs index 2e53da1..ced3618 100644 --- a/src/viewer_main.rs +++ b/src/viewer_main.rs @@ -14,7 +14,7 @@ use viewer::clipboard; #[cfg(test)] #[path="initialization.rs"] mod initialization; use viewer::{api::Api,rtc::ReadyPolicy,session::{Options,Session},wire::Shape}; use std::time::Duration; -const HELP:&str="Experimental native viewer.\n uuremote-viewer ui (GTK window: sign-in, devices, sessions) Desktop UI requires viewer-sdl (decodes with the ffmpeg CLI, or FFmpeg 6.x libraries with viewer-ffmpeg).\n uuremote-viewer power DEVICE reboot|shutdown\n uuremote-viewer type DEVICE [options] (secret from UU_INPUT_ENV or stdin; reuses running viewer)\n options: --delay-ms MS --omit-last N --snapshot PATH --dry-run --new-session\n uuremote-viewer unbind DEVICE [--shared] (从账号删除设备 / remove a device from the account)\n uuremote-viewer terminal DEVICE [SESSION]\n uuremote-viewer files DEVICE ls PATH | get REMOTE LOCAL | put LOCAL REMOTE\n uuremote-viewer portmap DEVICE LOCAL_PORT HOST PORT\n uuremote-viewer files-ui|portmap-ui|terminal-ui DEVICE NAME (GTK tool windows)\n uuremote-viewer login [--no-gui]\n uuremote-viewer devices METHOD ARRAY_POINTER ID_POINTER NAME_POINTER\n uuremote-viewer assist CONNECT_ID (验证码从 stdin 读取一行)\n uuremote-viewer connect DEVICE true|false SHAPE_JSON echo|manual raw|legacy [--view-only]\nVideo: UU_VIEWER_CODEC=h264 forces H.264; UU_VIEWER_CHROMA=444 requests true color (default 4:2:0).\nAudio: UU_VIEWER_AUDIO=0 disables playback. UU_VIEWER_VIEW_ONLY=1 disables desktop input.\nDevice-list method/JSON pointers and compatibility shape require verified operator configuration.\nQR login reuses the sibling uuremote-server login command. Never run login in a captured log.\nEcho readiness is transport observation only; no sendVideoTrack RPC is emitted."; +const HELP:&str="Experimental native viewer.\n uuremote-viewer ui (GTK window: sign-in, devices, sessions) Desktop UI requires viewer-sdl (decodes with the ffmpeg CLI, or FFmpeg 6.x libraries with viewer-ffmpeg).\n uuremote-viewer power DEVICE reboot|shutdown\n uuremote-viewer type DEVICE [options] (secret from UU_INPUT_ENV or stdin; reuses running viewer)\n options: --delay-ms MS --omit-last N --snapshot PATH --dry-run --new-session\n uuremote-viewer unbind DEVICE [--shared] (从账号删除设备 / remove a device from the account)\n uuremote-viewer terminal DEVICE [SESSION]\n uuremote-viewer files DEVICE ls PATH | get REMOTE LOCAL | put LOCAL REMOTE\n uuremote-viewer portmap DEVICE LOCAL_PORT HOST PORT\n uuremote-viewer files-ui|portmap-ui|terminal-ui DEVICE NAME (GTK tool windows)\n uuremote-viewer login [--no-gui]\n uuremote-viewer devices METHOD ARRAY_POINTER ID_POINTER NAME_POINTER\n uuremote-viewer assist CONNECT_ID (验证码从 stdin 读取一行)\n uuremote-viewer connect DEVICE true|false SHAPE_JSON echo|manual raw|legacy [--view-only]\nVideo: UU_VIEWER_CODEC=h264 forces H.264; UU_VIEWER_CHROMA=444 requests true color (default 4:2:0).\nAudio: UU_VIEWER_AUDIO=0 disables playback. UU_VIEWER_VIEW_ONLY=1 disables desktop input.\nDevice-list method/JSON pointers and compatibility shape require verified operator configuration.\nQR login reuses the sibling uuremote-server login command. Never run login in a captured log.\nEcho readiness is transport observation only; desktop sessions send one sendVideoTrack RPC (like the official iPhone viewer)."; const DEFAULT_SHAPE:&str=r#"{"capture_type":1,"platform":3,"client_version":"4.42.0","width":1920,"height":1080,"fps":60,"chroma":1, "decoders":[{"fps":60,"codec":1,"width":3840,"height":2160,"chroma":1}],"display_modes":[[1920,1080,60]], "displays":[{"id":1,"fps":60,"type":0,"hdr":0}],