From b45dc606f161f04a835056a5f0f33cb6483958e3 Mon Sep 17 00:00:00 2001 From: 21pages Date: Wed, 29 Jun 2022 09:38:01 +0800 Subject: [PATCH] Update example based on api changes Signed-off-by: 21pages --- libs/scrap/examples/capture_mag.rs | 6 ++++-- libs/scrap/examples/ffplay.rs | 4 +++- libs/scrap/examples/record-screen.rs | 5 +---- libs/scrap/examples/screenshot.rs | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/libs/scrap/examples/capture_mag.rs b/libs/scrap/examples/capture_mag.rs index 3e15b4e69..c0505141e 100644 --- a/libs/scrap/examples/capture_mag.rs +++ b/libs/scrap/examples/capture_mag.rs @@ -21,6 +21,8 @@ fn get_display(i: usize) -> Display { #[cfg(windows)] fn record(i: usize) { + use std::time::Duration; + for d in Display::all().unwrap() { println!("{:?} {} {}", d.origin(), d.width(), d.height()); } @@ -40,7 +42,7 @@ fn record(i: usize) { println!("Filter window for cls {} name {}", wnd_cls, wnd_name); } - let frame = capture_mag.frame(0).unwrap(); + let frame = capture_mag.frame(Duration::from_millis(0)).unwrap(); println!("Capture data len: {}, Saving...", frame.len()); let mut bitflipped = Vec::with_capacity(w * h * 4); @@ -76,7 +78,7 @@ fn record(i: usize) { println!("Filter window for cls {} title {}", wnd_cls, wnd_title); } - let buffer = capture_mag.frame(0).unwrap(); + let buffer = capture_mag.frame(Duration::from_millis(0)).unwrap(); println!("Capture data len: {}, Saving...", buffer.len()); let mut frame = Default::default(); diff --git a/libs/scrap/examples/ffplay.rs b/libs/scrap/examples/ffplay.rs index a4ca1b35b..2c685b931 100644 --- a/libs/scrap/examples/ffplay.rs +++ b/libs/scrap/examples/ffplay.rs @@ -1,3 +1,5 @@ +use std::time::Duration; + extern crate scrap; fn main() { @@ -29,7 +31,7 @@ fn main() { let mut out = child.stdin.unwrap(); loop { - match capturer.frame(0) { + match capturer.frame(Duration::from_millis(0)) { Ok(frame) => { // Write the frame, removing end-of-row padding. let stride = frame.len() / h; diff --git a/libs/scrap/examples/record-screen.rs b/libs/scrap/examples/record-screen.rs index ac9dc3ff9..e099a8d1e 100644 --- a/libs/scrap/examples/record-screen.rs +++ b/libs/scrap/examples/record-screen.rs @@ -104,9 +104,6 @@ fn main() -> io::Result<()> { timebase: [1, 1000], bitrate: args.flag_bv, codec: vpx_codec, - rc_min_quantizer: 0, - rc_max_quantizer: 0, - speed: 6, num_threads: 0, })) .unwrap(); @@ -137,7 +134,7 @@ fn main() -> io::Result<()> { break; } - if let Ok(frame) = c.frame(0) { + if let Ok(frame) = c.frame(Duration::from_millis(0)) { let ms = time.as_secs() * 1000 + time.subsec_millis() as u64; for frame in vpx.encode(ms as i64, &frame, STRIDE_ALIGN).unwrap() { diff --git a/libs/scrap/examples/screenshot.rs b/libs/scrap/examples/screenshot.rs index b52ea11f7..b6bf8a1d9 100644 --- a/libs/scrap/examples/screenshot.rs +++ b/libs/scrap/examples/screenshot.rs @@ -34,7 +34,7 @@ fn record(i: usize) { loop { // Wait until there's a frame. - let buffer = match capturer.frame(0) { + let buffer = match capturer.frame(Duration::from_millis(0)) { Ok(buffer) => buffer, Err(error) => { if error.kind() == WouldBlock { @@ -83,7 +83,7 @@ fn record(i: usize) { loop { // Wait until there's a frame. - let buffer = match capturer.frame(0) { + let buffer = match capturer.frame(Duration::from_millis(0)) { Ok(buffer) => buffer, Err(error) => { if error.kind() == WouldBlock {