mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-16 16:50:41 +01:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
22fb6783a0 | ||
|
|
10166c66e0 |
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.11"
|
version = "0.2.12"
|
||||||
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.11"
|
version = "0.2.12"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
default-run = "uuremote-server"
|
default-run = "uuremote-server"
|
||||||
authors = ["uu-remote-linux contributors"]
|
authors = ["uu-remote-linux contributors"]
|
||||||
|
|||||||
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
# Unofficial UU Remote Linux host in a container, for NAS boxes (Synology DSM, etc.) without a desktop.
|
# Unofficial UU Remote Linux host in a container, for NAS boxes (Synology DSM, etc.) without a desktop.
|
||||||
# Headless mode: file transfer, terminal and port mapping; no remote desktop. Uses the published release binary.
|
# Headless mode: file transfer, terminal and port mapping; no remote desktop. Uses the published release binary.
|
||||||
FROM ubuntu:24.04
|
FROM ubuntu:24.04
|
||||||
ARG VERSION=v0.2.11
|
ARG VERSION=v0.2.12
|
||||||
LABEL org.opencontainers.image.source="https://github.com/VallierDev/uu-remote-linux" \
|
LABEL org.opencontainers.image.source="https://github.com/VallierDev/uu-remote-linux" \
|
||||||
org.opencontainers.image.description="Unofficial UU Remote Linux host, headless (file transfer, terminal, port mapping)" \
|
org.opencontainers.image.description="Unofficial UU Remote Linux host, headless (file transfer, terminal, port mapping)" \
|
||||||
org.opencontainers.image.licenses="GPL-3.0"
|
org.opencontainers.image.licenses="GPL-3.0"
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
修复缩放桌面尺寸为奇数时画面一直「正在传输」。/ Fix the stream never starting when the captured desktop has an odd size.
|
||||||
|
|
||||||
|
### 修复 / Fixed
|
||||||
|
- **奇数尺寸桌面无法出画面**(#53,感谢 @wen0531):KDE Plasma(Wayland,门户后端)150% 缩放、两块屏上下排列时,
|
||||||
|
逻辑桌面为 2560x2507,H.264/HEVC 编码器要求偶数宽高,全部启动失败,客户端一直停在「正在传输画面」。
|
||||||
|
现在原生分辨率采集遇到奇数宽高时,在右/下补齐 1 像素黑边再编码;偶数尺寸、「其他分辨率」缩放不受影响。
|
||||||
|
贡献者已在 KDE Plasma 6.7 / Wayland / NVENC + 官方安卓客户端上实测。进程内编码(`inproc-av`)路径未覆盖。
|
||||||
|
- When the native capture size is odd (e.g. scaled stacked monitors), the encoder input is padded by one black
|
||||||
|
row/column so every H.264/HEVC encoder can open. Verified by the contributor on KDE Plasma 6.7 (Wayland, NVENC).
|
||||||
|
The optional `inproc-av` path is not covered.
|
||||||
|
|
||||||
|
### 下载 / Download
|
||||||
|
`uu-remote-linux-v0.2.12-x86_64-linux.tar.gz`(主机 `uuremote-server` + 控制端 `uuremote-viewer`,附带 `contrib/`),或 `docker pull ghcr.io/vallierdev/uu-remote-linux:v0.2.12`。
|
||||||
|
|
||||||
|
**非官方项目,与网易无关。** / **Unofficial, not affiliated with NetEase.**
|
||||||
+42
-5
@@ -286,8 +286,22 @@ fn encoder_options(settings: &VideoSettings, encoder: Encoder, gop: &str, rgb: O
|
|||||||
options.into_iter().map(str::to_owned).collect()
|
options.into_iter().map(str::to_owned).collect()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn scale_options(settings: &VideoSettings, encoder: Encoder) -> Vec<String> {
|
/// Filter chain for a capture of `source` size (None when the input size is not known yet, e.g.
|
||||||
if encoder == Encoder::Vaapi { return vec!["-vf".into(), vaapi_filter(settings.output)]; }
|
/// the fixed-input probe). H.264/HEVC 4:2:0 encoders — and NVENC's surface allocation — require
|
||||||
|
/// even frame dimensions, but the captured size is not always even: the portal backend reports the
|
||||||
|
/// compositor's logical desktop size, so two stacked monitors at 150% scale capture 2560x2507 and
|
||||||
|
/// every encoder failed to open ("height not divisible by 2 (2560x2507)" from libx264,
|
||||||
|
/// "InitializeEncoder failed: out of memory (10)" from h264_nvenc), leaving the viewer stuck on the
|
||||||
|
/// 正在传输画面 spinner. When the native capture size is odd, pad the odd row/column; the host
|
||||||
|
/// display mode and every reported capture setting stay untouched.
|
||||||
|
fn scale_options(settings: &VideoSettings, encoder: Encoder, source: Option<(u32,u32)>) -> Vec<String> {
|
||||||
|
const EVEN_PAD: &str = "pad=ceil(iw/2)*2:ceil(ih/2)*2:0:0:black";
|
||||||
|
let odd_capture = settings.output.is_none() && source.is_some_and(|(w,h)| w % 2 != 0 || h % 2 != 0);
|
||||||
|
if encoder == Encoder::Vaapi {
|
||||||
|
let filtered = if odd_capture { format!("{EVEN_PAD},{}", vaapi_filter(None)) } else { vaapi_filter(settings.output) };
|
||||||
|
return vec!["-vf".into(), filtered];
|
||||||
|
}
|
||||||
|
if odd_capture { return vec!["-vf".into(), EVEN_PAD.into()]; }
|
||||||
settings.output.map_or_else(Vec::new, |(w,h)| vec!["-vf".into(), format!("scale={w}:{h}:flags=bilinear")])
|
settings.output.map_or_else(Vec::new, |(w,h)| vec!["-vf".into(), format!("scale={w}:{h}:flags=bilinear")])
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -582,6 +596,7 @@ async fn read_encoder_with(
|
|||||||
display,size.0,size.1,settings.output,settings.fps,config.cq,max_kbps,encoder.name_for(settings.codec));
|
display,size.0,size.1,settings.output,settings.fps,config.cq,max_kbps,encoder.name_for(settings.codec));
|
||||||
return read_inprocess(config, latest, sequence, idr, budget).await;
|
return read_inprocess(config, latest, sequence, idr, budget).await;
|
||||||
}
|
}
|
||||||
|
let source_size = size;
|
||||||
let size = format!("{}x{}", size.0, size.1);
|
let size = format!("{}x{}", size.0, size.1);
|
||||||
let fps = settings.fps.to_string();
|
let fps = settings.fps.to_string();
|
||||||
// Keep the IDR interval at 2 s whatever the frame rate.
|
// Keep the IDR interval at 2 s whatever the frame rate.
|
||||||
@@ -605,7 +620,7 @@ async fn read_encoder_with(
|
|||||||
"-video_size",&size,"-i",&display,"-an"]);
|
"-video_size",&size,"-i",&display,"-an"]);
|
||||||
}
|
}
|
||||||
// 其他分辨率: scale the captured desktop (the host display mode is left untouched).
|
// 其他分辨率: scale the captured desktop (the host display mode is left untouched).
|
||||||
command.args(scale_options(&settings, encoder));
|
command.args(scale_options(&settings, encoder, Some(source_size)));
|
||||||
command.args(encoder_options(&settings, encoder, &gop, rgb));
|
command.args(encoder_options(&settings, encoder, &gop, rgb));
|
||||||
// x11grab paces against an absolute schedule; after a capture stall it grabs
|
// x11grab paces against an absolute schedule; after a capture stall it grabs
|
||||||
// back-to-back to "catch up" (measured 69 frames in 200ms). vfr on a 1/FPS
|
// back-to-back to "catch up" (measured 69 frames in 200ms). vfr on a 1/FPS
|
||||||
@@ -768,7 +783,7 @@ fn probe_input_command(spec:&FfmpegSpec,input:&std::ffi::OsStr,loop_input:bool,s
|
|||||||
if loop_input { command.args(["-stream_loop","-1"]); }
|
if loop_input { command.args(["-stream_loop","-1"]); }
|
||||||
// Override source timestamps so clips and image sequences use the same nominal probe rate.
|
// Override source timestamps so clips and image sequences use the same nominal probe rate.
|
||||||
command.args(["-r",&settings.fps.to_string(),"-i"]).arg(input).args(["-map","0:v:0","-an"]);
|
command.args(["-r",&settings.fps.to_string(),"-i"]).arg(input).args(["-map","0:v:0","-an"]);
|
||||||
command.args(scale_options(settings,encoder));
|
command.args(scale_options(settings,encoder,None));
|
||||||
command.args(encoder_options(settings,encoder,&gop_frames(settings.fps,false).to_string(),None));
|
command.args(encoder_options(settings,encoder,&gop_frames(settings.fps,false).to_string(),None));
|
||||||
command.args(timing_args(timing,settings.fps));
|
command.args(timing_args(timing,settings.fps));
|
||||||
command.args(["-frames:v",&wanted.to_string(),"-f",if settings.codec==VideoCodec::H265 {"hevc"} else {"h264"},"pipe:1"]);
|
command.args(["-frames:v",&wanted.to_string(),"-f",if settings.codec==VideoCodec::H265 {"hevc"} else {"h264"},"pipe:1"]);
|
||||||
@@ -981,6 +996,28 @@ pub async fn stream_desktop(pc: Arc<RTCPeerConnection>, track: Arc<crate::video_
|
|||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
|
#[test]
|
||||||
|
fn native_frame_dimensions_are_padded_to_even() {
|
||||||
|
// A scaled compositor can report an odd logical desktop (e.g. two stacked 150% monitors →
|
||||||
|
// 2560x2507); H.264/HEVC 4:2:0 encoders reject odd dimensions, so a native-size capture
|
||||||
|
// with a known odd size gets a pad filter. Even sizes, explicit output scaling and the
|
||||||
|
// fixed-input probe (size unknown) keep their existing filter chains.
|
||||||
|
let native = VideoSettings { output: None, ..Default::default() };
|
||||||
|
let pad = "pad=ceil(iw/2)*2:ceil(ih/2)*2:0:0:black";
|
||||||
|
for encoder in [Encoder::Cpu, Encoder::Nvenc] {
|
||||||
|
assert_eq!(scale_options(&native, encoder, Some((2560, 2507))), vec!["-vf".to_string(), pad.to_string()]);
|
||||||
|
assert!(scale_options(&native, encoder, Some((2560, 2508))).is_empty());
|
||||||
|
assert!(scale_options(&native, encoder, None).is_empty());
|
||||||
|
}
|
||||||
|
assert_eq!(scale_options(&native, Encoder::Vaapi, Some((2560, 2507))),
|
||||||
|
vec!["-vf".to_string(), format!("{pad},format=nv12,hwupload")]);
|
||||||
|
assert_eq!(scale_options(&native, Encoder::Vaapi, Some((2560, 2508))),
|
||||||
|
vec!["-vf".to_string(), "format=nv12,hwupload".to_string()]);
|
||||||
|
let scaled = VideoSettings { output: Some((1280, 720)), ..Default::default() };
|
||||||
|
assert_eq!(scale_options(&scaled, Encoder::Cpu, Some((2560, 2507))),
|
||||||
|
vec!["-vf".to_string(), "scale=1280:720:flags=bilinear".to_string()]);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn fixed_input_arguments_share_production_encoding_options() {
|
fn fixed_input_arguments_share_production_encoding_options() {
|
||||||
let spec=FfmpegSpec {program:"ffmpeg".into(),ld_library_path:None,path:None};
|
let spec=FfmpegSpec {program:"ffmpeg".into(),ld_library_path:None,path:None};
|
||||||
@@ -993,7 +1030,7 @@ mod tests {
|
|||||||
let args:Vec<_>=command.as_std().get_args().map(|a|a.to_str().unwrap().to_owned()).collect();
|
let args:Vec<_>=command.as_std().get_args().map(|a|a.to_str().unwrap().to_owned()).collect();
|
||||||
let expected=encoder_options(&settings,encoder,&gop_frames(30,false).to_string(),None);
|
let expected=encoder_options(&settings,encoder,&gop_frames(30,false).to_string(),None);
|
||||||
assert!(args.windows(expected.len()).any(|w|w==expected));
|
assert!(args.windows(expected.len()).any(|w|w==expected));
|
||||||
let scale=scale_options(&settings,encoder);
|
let scale=scale_options(&settings,encoder,None);
|
||||||
assert!(args.windows(scale.len()).any(|w|w==scale));
|
assert!(args.windows(scale.len()).any(|w|w==scale));
|
||||||
assert!(args.windows(4).any(|w|w==["-r","30","-i","frames/%05d.png"]));
|
assert!(args.windows(4).any(|w|w==["-r","30","-i","frames/%05d.png"]));
|
||||||
assert!(args.windows(2).any(|w|w==["-frames:v","17"]));
|
assert!(args.windows(2).any(|w|w==["-frames:v","17"]));
|
||||||
|
|||||||
Reference in new issue
Block a user