Mark/restream
1
0
Fork 0
Code Actions Releases Activity

Fix some minor issues with restream binary

Browse Source
This commit is contained in:
Rien Maertens 2020-12-13 22:10:22 +01:00
parent 9352090965
commit 4c27256fef
No known key found for this signature in database
GPG Key ID: AE66CE42F1AF9DEF
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main.rs
View File

@ -23,7 +23,7 @@ fn main() -> Result<()> {
let bytes_per_pixel = 1; let bytes_per_pixel = 1;
let pid = xochitl_pid()?; let pid = xochitl_pid()?;
let offset = fb_start(pid)?; let offset = rm2_fb_offset(pid)?;
let mem = format!("/proc/{}/mem", pid); let mem = format!("/proc/{}/mem", pid);
ReStreamer::init(&mem, offset, width, height, bytes_per_pixel)? ReStreamer::init(&mem, offset, width, height, bytes_per_pixel)?
} else { } else {
@ -51,9 +51,10 @@ fn xochitl_pid() -> Result<usize> {
.context("Failed to run `/bin/pidof xochitl`")?; .context("Failed to run `/bin/pidof xochitl`")?;
if output.status.success() { if output.status.success() {
let pid = &output.stdout; let pid = &output.stdout;
std::str::from_utf8(pid)? let pid_str = std::str::from_utf8(pid)?.trim();
pid_str
.parse() .parse()
.with_context(|| format!("Failed to parse xochitl's pid: {:?}", pid)) .with_context(|| format!("Failed to parse xochitl's pid: {}", pid_str))
} else { } else {
Err(anyhow!( Err(anyhow!(
"Could not find pid of xochitl, is xochitl running?" "Could not find pid of xochitl, is xochitl running?"
@ -61,12 +62,12 @@ fn xochitl_pid() -> Result<usize> {
} }
} }
fn fb_start(pid: usize) -> Result<usize> { fn rm2_fb_offset(pid: usize) -> Result<usize> {
let file = File::open(format!("/proc/{}/maps", &pid))?; let file = File::open(format!("/proc/{}/maps", &pid))?;
let line = BufReader::new(file) let line = BufReader::new(file)
.lines() .lines()
.skip_while(|line| matches!(line, Ok(l) if l.ends_with("/dev/fb0"))) .skip_while(|line| matches!(line, Ok(l) if !l.ends_with("/dev/fb0")))
//.skip(1) .skip(1)
.next() .next()
.with_context(|| format!("No line containing /dev/fb0 in /proc/{}/maps file", pid))? .with_context(|| format!("No line containing /dev/fb0 in /proc/{}/maps file", pid))?
.with_context(|| format!("Error reading file /proc/{}/maps", pid))?; .with_context(|| format!("Error reading file /proc/{}/maps", pid))?;
@ -76,7 +77,8 @@ fn fb_start(pid: usize) -> Result<usize> {
.next() .next()
.with_context(|| format!("Error parsing line in /proc/{}/maps", pid))?; .with_context(|| format!("Error parsing line in /proc/{}/maps", pid))?;
usize::from_str_radix(addr, 16).context("Error parsing framebuffer address") let address = usize::from_str_radix(addr, 16).context("Error parsing framebuffer address")?;
Ok(address + 8)
} }
pub struct ReStreamer { pub struct ReStreamer {