mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-17 01:00:41 +01:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b5b5120ef7 | ||
|
|
5028ba1663 | ||
|
|
6058185d1f | ||
|
|
6882b76801 |
No files matched your search
@@ -144,7 +144,7 @@ every 60 s.
|
|||||||
| `src/assist.rs`, `c_engine/assist_window.c` | remote assistance (guest + account) and the unified GTK main window (assist + account/QR card) |
|
| `src/assist.rs`, `c_engine/assist_window.c` | remote assistance (guest + account) and the unified GTK main window (assist + account/QR card) |
|
||||||
|
|
||||||
Diagnostic subcommands: `login [--no-gui]`, `unlock-check` (password on stdin, prints only accepted/rejected),
|
Diagnostic subcommands: `login [--no-gui]`, `unlock-check` (password on stdin, prints only accepted/rejected),
|
||||||
`desktop-probe [new.png]`, `desktop-video-probe`, `wayland-input-probe`, `clipboard-acceptance`,
|
`desktop-probe [new.png]`, `desktop-video-probe` (`UU_PROBE_FPS`, `UU_PROBE_FRAMES`, `UU_PROBE_QUALITY` 1-5 = viewer bitrate preset, 5 auto), `wayland-input-probe`, `clipboard-acceptance`,
|
||||||
`portal-acceptance`, `help`. Unknown arguments exit with code 2. Builds up to v0.1.0 did **not** reject them and
|
`portal-acceptance`, `help`. Unknown arguments exit with code 2. Builds up to v0.1.0 did **not** reject them and
|
||||||
started a second full host server instead, so check that a subcommand exists in the binary you run.
|
started a second full host server instead, so check that a subcommand exists in the binary you run.
|
||||||
|
|
||||||
|
|||||||
Generated
+1
-1
@@ -2717,7 +2717,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "uu-remote-linux"
|
name = "uu-remote-linux"
|
||||||
version = "0.1.21"
|
version = "0.1.23"
|
||||||
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.1.21"
|
version = "0.1.23"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
authors = ["uu-remote-linux contributors"]
|
authors = ["uu-remote-linux contributors"]
|
||||||
description = "Unofficial Linux host for NetEase UU Remote: control a Linux desktop from the official clients"
|
description = "Unofficial Linux host for NetEase UU Remote: control a Linux desktop from the official clients"
|
||||||
|
|||||||
@@ -425,7 +425,8 @@ retry:;
|
|||||||
if(frame->failed && frame->dmabuf_used && !retried) {
|
if(frame->failed && frame->dmabuf_used && !retried) {
|
||||||
/* Mapping/copy failure retries once on SHM; connection errors do not. */
|
/* Mapping/copy failure retries once on SHM; connection errors do not. */
|
||||||
dma_disable("copy"); retried=1;
|
dma_disable("copy"); retried=1;
|
||||||
for(unsigned i=0;i<2;i++) frame_clear(&frames[i]);
|
/* dma-buf stays disabled, so its cached buffers are never reused. */
|
||||||
|
for(unsigned i=0;i<2;i++) { frame_clear(&frames[i]); dma_clear(&frames[i]); }
|
||||||
pending=0; goto retry;
|
pending=0; goto retry;
|
||||||
}
|
}
|
||||||
if(frame->failed || !frame->pixels || frame->width!=width || frame->height!=height) goto end;
|
if(frame->failed || !frame->pixels || frame->width!=width || frame->height!=height) goto end;
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
v0.1.21 视频管线改动的两处修正。/ Two follow-up fixes to the v0.1.21 video pipeline changes.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- 原生 Wayland 的 dma-buf 映射失败、回退到 SHM 时,已缓存的 dma-buf 缓冲没有释放(最多两个槽位,到会话结束才回收)。
|
||||||
|
Release cached dma-buf buffers when capture falls back to SHM.
|
||||||
|
- 原生 Wayland 在发送受阻(背压)解除后的第一帧可能是受阻前预取的旧画面;现在等待超过两个帧间隔时会重新采集。
|
||||||
|
After a backpressure stall the first native Wayland frame is captured fresh instead of reusing the stale prefetch.
|
||||||
|
|
||||||
|
两处均由代码审查发现,只做了编译和单元测试,未在真机复现。
|
||||||
|
Both found in review; compile- and unit-tested only.
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux-v0.1.22-x86_64-linux.tar.gz`:X11 版可执行文件(x86_64,glibc ≥ 2.35),附带 `contrib/`。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
测量工具:`desktop-video-probe` 可选码率档。/ Probe bitrate presets.
|
||||||
|
|
||||||
|
### 新增 / Added
|
||||||
|
- `desktop-video-probe` 支持 `UU_PROBE_QUALITY=1..5`,对应控制端画质档(1 极速 1M、2 流畅 2M、3 高清 8M、4 蓝光 20M、5 自动)。
|
||||||
|
码率档走平均码率(ABR)路径,便于不用控制端复测 #15 的灰屏修复(#9 的建议)。
|
||||||
|
`desktop-video-probe` accepts `UU_PROBE_QUALITY=1..5` (viewer bitrate presets; 5 = Auto/CRF).
|
||||||
|
|
||||||
|
### 其他 / Other
|
||||||
|
- 修复一个在多网卡机器上偶发超时的编码协商单元测试。
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux-v0.1.23-x86_64-linux.tar.gz`:X11 版可执行文件(x86_64,glibc ≥ 2.35),附带 `contrib/`。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
+7
-1
@@ -523,7 +523,13 @@ pub async fn probe(size:(u32,u32),display:String,portal:Option<Arc<crate::portal
|
|||||||
let (tx,mut rx)=mpsc::channel(4);
|
let (tx,mut rx)=mpsc::channel(4);
|
||||||
let sequence=Arc::new(std::sync::atomic::AtomicU64::new(0));
|
let sequence=Arc::new(std::sync::atomic::AtomicU64::new(0));
|
||||||
let fps=crate::wayland::capture_fps(std::env::var("UU_PROBE_FPS").ok().as_deref())?;
|
let fps=crate::wayland::capture_fps(std::env::var("UU_PROBE_FPS").ok().as_deref())?;
|
||||||
let settings=VideoSettings {fps,..VideoSettings::default()};
|
// UU_PROBE_QUALITY selects a viewer preset (1 fast 1M, 2 general 2M, 3 HD 8M, 4 bluray 20M,
|
||||||
|
// 5 auto); bitrate presets exercise the capped/ABR encoder path instead of CRF.
|
||||||
|
let quality=match std::env::var("UU_PROBE_QUALITY").ok().as_deref() {
|
||||||
|
None=>crate::capture_setting::QUALITY_AUTO,
|
||||||
|
Some(v)=>v.parse::<u64>().ok().filter(|q|(1..=5).contains(q)).ok_or("UU_PROBE_QUALITY must be 1-5")?,
|
||||||
|
};
|
||||||
|
let settings=VideoSettings {fps,quality,..VideoSettings::default()};
|
||||||
let _reader=EncoderTask(tokio::spawn(read_encoder(size,display,portal,tx,settings,sequence,Arc::new(AtomicBool::new(false)),Arc::new(Semaphore::new(4)))));
|
let _reader=EncoderTask(tokio::spawn(read_encoder(size,display,portal,tx,settings,sequence,Arc::new(AtomicBool::new(false)),Arc::new(Semaphore::new(4)))));
|
||||||
let mut count=0;
|
let mut count=0;
|
||||||
let mut bytes=0;
|
let mut bytes=0;
|
||||||
|
|||||||
+4
-1
@@ -107,6 +107,9 @@ mod tests {
|
|||||||
if hevc { register_hevc(&mut remote_media).unwrap(); }
|
if hevc { register_hevc(&mut remote_media).unwrap(); }
|
||||||
let mut setting = webrtc::api::setting_engine::SettingEngine::default();
|
let mut setting = webrtc::api::setting_engine::SettingEngine::default();
|
||||||
setting.set_ice_multicast_dns_mode(webrtc::ice::mdns::MulticastDnsMode::Disabled);
|
setting.set_ice_multicast_dns_mode(webrtc::ice::mdns::MulticastDnsMode::Disabled);
|
||||||
|
// UDP over IPv4 only: pairing every host interface (VPNs, IPv6) made ICE exceed the
|
||||||
|
// connect timeout when the whole suite runs in parallel.
|
||||||
|
setting.set_network_types(vec![webrtc::ice::network_type::NetworkType::Udp4]);
|
||||||
let remote = APIBuilder::new().with_setting_engine(setting.clone()).with_media_engine(remote_media).build().new_peer_connection(RTCConfiguration::default()).await.unwrap();
|
let remote = APIBuilder::new().with_setting_engine(setting.clone()).with_media_engine(remote_media).build().new_peer_connection(RTCConfiguration::default()).await.unwrap();
|
||||||
remote.add_transceiver_from_kind(RTPCodecType::Video, None).await.unwrap();
|
remote.add_transceiver_from_kind(RTPCodecType::Video, None).await.unwrap();
|
||||||
let mut media = MediaEngine::default(); media.register_default_codecs().unwrap(); register_hevc(&mut media).unwrap();
|
let mut media = MediaEngine::default(); media.register_default_codecs().unwrap(); register_hevc(&mut media).unwrap();
|
||||||
@@ -141,7 +144,7 @@ mod tests {
|
|||||||
}).await.unwrap();
|
}).await.unwrap();
|
||||||
assert_eq!(track.supports(VideoCodec::H264), h264);
|
assert_eq!(track.supports(VideoCodec::H264), h264);
|
||||||
assert_eq!(track.supports(VideoCodec::H265), hevc);
|
assert_eq!(track.supports(VideoCodec::H265), hevc);
|
||||||
tokio::time::timeout(std::time::Duration::from_secs(10), async {
|
tokio::time::timeout(std::time::Duration::from_secs(30), async {
|
||||||
while host.connection_state() != webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Connected {
|
while host.connection_state() != webrtc::peer_connection::peer_connection_state::RTCPeerConnectionState::Connected {
|
||||||
tokio::time::sleep(std::time::Duration::from_millis(10)).await;
|
tokio::time::sleep(std::time::Duration::from_millis(10)).await;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -85,12 +85,17 @@ pub fn capture_stdout() -> Result<(),String> {
|
|||||||
}).map_err(|e|format!("Capture writer: {e}"))?;
|
}).map_err(|e|format!("Capture writer: {e}"))?;
|
||||||
let demand=std::env::var("UU_WAYLAND_DEMAND").is_ok_and(|v|v=="1");
|
let demand=std::env::var("UU_WAYLAND_DEMAND").is_ok_and(|v|v=="1");
|
||||||
let mut stdin=std::io::stdin().lock();
|
let mut stdin=std::io::stdin().lock();
|
||||||
|
let mut delivered=std::time::Instant::now();
|
||||||
loop {
|
loop {
|
||||||
if demand { stdin.read_exact(&mut [0]).map_err(|_|"Capture demand pipe closed")?; }
|
if demand { stdin.read_exact(&mut [0]).map_err(|_|"Capture demand pipe closed")?; }
|
||||||
// Time from buffer availability: a slow encoder read must not shorten the next interval.
|
// Time from buffer availability: a slow encoder read must not shorten the next interval.
|
||||||
let Ok(mut frame)=free_rx.recv() else { break };
|
let Ok(mut frame)=free_rx.recv() else { break };
|
||||||
let start=std::time::Instant::now();
|
let start=std::time::Instant::now();
|
||||||
|
// The engine prefetches the next frame on delivery; after a backpressure stall that
|
||||||
|
// prefetch is as old as the stall, so drop it and capture the current screen.
|
||||||
|
if demand && start.duration_since(delivered)>interval*2 { capture(&mut frame)?; }
|
||||||
capture(&mut frame)?;
|
capture(&mut frame)?;
|
||||||
|
delivered=std::time::Instant::now();
|
||||||
if full_tx.send(frame).is_err() { break; }
|
if full_tx.send(frame).is_err() { break; }
|
||||||
if !demand {
|
if !demand {
|
||||||
if let Some(left)=interval.checked_sub(start.elapsed()) { std::thread::sleep(left); }
|
if let Some(left)=interval.checked_sub(start.elapsed()) { std::thread::sleep(left); }
|
||||||
|
|||||||
Reference in new issue
Block a user