mirror of
https://github.com/VallierDev/uu-remote-linux.git
synced 2026-11-16 16:50:41 +01:00
Make in-process capture and encoding an opt-in feature
Address PR review: - The FFmpeg 6 bindings (AVChannelLayout, ffmpeg-next 6.1) do not build on the 22.04 runners, which ship FFmpeg 4.4. The default build no longer depends on libav at all, so `cargo test --locked` and the release job on 22.04 no longer compile that code. - The release tarball no longer links the build machine's libav SONAMEs. Default builds use the FFmpeg child process for video and audio again. - `UU_FFMPEG_ROOT` / config `ffmpeg_root` now selects the child-process path even in an inproc-av build, so a bundled FFmpeg with working NVENC is not silently bypassed. Build with `--features inproc-av` (FFmpeg 6 dev packages, Ubuntu 24.04) to get in-process capture, encoding and Opus. CI has a test-inproc job for it. `UU_VIDEO_PIPELINE=process` still forces the child path for video. Probes on ros2go-gpu (440 Hz tone, 5 s): default (ffmpeg child): 44.0 packets/s, 132 kbps, max gap 43 ms inproc-av: 49.7 packets/s, 133.5 kbps, max gap 22 ms desktop-video-probe under inproc-av with UU_FFMPEG_ROOT=/usr uses the child path (no `pipeline=in-process` in the log); without it, in-process.
This commit is contained in:
1 parent
dd5d6a6c13
commit
2355790e17
10 files changed
+106
-25
No files matched your search
@@ -30,6 +30,12 @@ pub fn disabled() -> bool {
|
||||
std::env::var("UU_VIDEO_PIPELINE").is_ok_and(|v| v == "process")
|
||||
}
|
||||
|
||||
/// In-process capture is used unless the process path is requested, or a bundled FFmpeg prefix
|
||||
/// (`UU_FFMPEG_ROOT` / config `ffmpeg_root`) is set: that build was chosen on purpose, so keep using it.
|
||||
pub fn selected() -> bool {
|
||||
!disabled() && crate::config::ffmpeg_root().is_none()
|
||||
}
|
||||
|
||||
fn text(error: ff::Error) -> String { error.to_string() }
|
||||
|
||||
fn ensure_init() -> Result<(), String> {
|
||||
|
||||
Reference in new issue
Block a user