Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test stream #155

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 17 additions & 23 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,30 +62,24 @@ camera.load_context().unwrap();
// Start streaming. Channel capacity is set to 3.
let payload_rx = camera.start_streaming(3).unwrap();

let mut payload_count = 0;
while payload_count < 10 {
match payload_rx.try_recv() {
Ok(payload) => {
println!(
"payload received! block_id: {:?}, timestamp: {:?}",
payload.id(),
payload.timestamp()
);
if let Some(image_info) = payload.image_info() {
println!("{:?}\n", image_info);
let image = payload.image();
// do something with the image.
// ...
}
payload_count += 1;

// Send back payload to streaming loop to reuse the buffer. This is optional.
payload_rx.send_back(payload);
}
Err(_err) => {
continue;
}
for _ in 0..10 {
let payload = payload_rx
.recv_blocking()
.expect("should receive a payload");
println!(
"payload received! block_id: {:?}, timestamp: {:?}",
payload.id(),
payload.timestamp()
);
if let Some(image_info) = payload.image_info() {
println!("{:?}\n", image_info);
let image = payload.image();
// do something with the image.
// ...
}

// Send back payload to streaming loop to reuse the buffer. This is optional.
payload_rx.send_back(payload);
}

// Closes the camera.
Expand Down
4 changes: 2 additions & 2 deletions cameleon/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repository = "https://github.com/cameleon-rs/cameleon"
description = """
cameleon is a safe, fast, and flexible library for GenICam compatible cameras.
"""
categories = ["computer-vision"]
categories = ["computer-vision"]
keywords = ["genicam", "camera", "usb3", "gige", "uvc"]

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand All @@ -20,7 +20,7 @@ thiserror = "1.0.24"
semver = "1.0.0"
zip = "0.6.0"
sha-1 = "0.10.0"
async-std = { version = "1.9.0", features = ["unstable"] }
async-std = { version = "1.12.0", features = ["unstable"] }
futures = "0.3.14"
tracing = "0.1.26"
auto_impl = "1.0.1"
Expand Down
41 changes: 17 additions & 24 deletions cameleon/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,30 +62,24 @@ camera.load_context().unwrap();
// Start streaming. Channel capacity is set to 3.
let payload_rx = camera.start_streaming(3).unwrap();

let mut payload_count = 0;
while payload_count < 10 {
match payload_rx.try_recv() {
Ok(payload) => {
println!(
"payload received! block_id: {:?}, timestamp: {:?}",
payload.id(),
payload.timestamp()
);
if let Some(image_info) = payload.image_info() {
println!("{:?}\n", image_info);
let image = payload.image();
// do something with the image.
// ...
}
payload_count += 1;

// Send back payload to streaming loop to reuse the buffer. This is optional.
payload_rx.send_back(payload);
}
Err(_err) => {
continue;
}
for _ in 0..10 {
let payload = payload_rx
.recv_blocking()
.expect("should receive a payload");
println!(
"payload received! block_id: {:?}, timestamp: {:?}",
payload.id(),
payload.timestamp()
);
if let Some(image_info) = payload.image_info() {
println!("{:?}\n", image_info);
let image = payload.image();
// do something with the image.
// ...
}

// Send back payload to streaming loop to reuse the buffer. This is optional.
payload_rx.send_back(payload);
}

// Closes the camera.
Expand Down Expand Up @@ -188,4 +182,3 @@ To start developing, please refer to [CONTRIBUTING.md][contributing].
This project is licenced under [MPL 2.0][license].

[license]: https://github.com/cameleon-rs/cameleon/blob/main/LICENSE

34 changes: 14 additions & 20 deletions cameleon/examples/stream.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,27 +25,21 @@ fn main() {
// Start streaming. Channel capacity is set to 3.
let payload_rx = camera.start_streaming(3).unwrap();

let mut payload_count = 0_usize;
while payload_count < 10 {
match payload_rx.try_recv() {
Ok(payload) => {
println!(
"payload received! block_id: {:?}, timestamp: {:?}",
payload.id(),
payload.timestamp()
);
if let Some(image_info) = payload.image_info() {
println!("{:?}\n", image_info);
}
payload_count += 1;

// Send back payload to streaming loop to reuse the buffer.
payload_rx.send_back(payload);
}
Err(_err) => {
continue;
}
for _ in 0..10 {
let payload = payload_rx
.recv_blocking()
.expect("should receive a payload");
println!(
"payload received! block_id: {:?}, timestamp: {:?}",
payload.id(),
payload.timestamp()
);
if let Some(image_info) = payload.image_info() {
println!("{:?}\n", image_info);
}

// Send back payload to streaming loop to reuse the buffer.
payload_rx.send_back(payload);
}

camera.close().ok();
Expand Down
13 changes: 8 additions & 5 deletions cameleon/src/camera.rs
Original file line number Diff line number Diff line change
Expand Up @@ -303,16 +303,20 @@ impl<Ctrl, Strm, Ctxt> Camera<Ctrl, Strm, Ctxt> {
return Err(StreamError::InStreaming.into());
}

// Enable streaimng.
// Lock TLParams to prevent changing parameters while streaming.
// Some camera models require this to obtain parameters for streaming.
self.ctrl.enable_streaming()?;
let mut ctxt = self.params_ctxt()?;
expect_node!(&ctxt, "TLParamsLocked", as_integer).set_value(&mut ctxt, 1)?;
expect_node!(&ctxt, "AcquisitionStart", as_command).execute(&mut ctxt)?;

// Start streaming loop.
let (sender, receiver) = channel(cap, DEFAULT_BUFFER_CAP);
self.strm.start_streaming_loop(sender, &mut self.ctrl)?;

// Enable streaming.
let mut ctxt = self.params_ctxt()?;
expect_node!(&ctxt, "AcquisitionStart", as_command).execute(&mut ctxt)?;

info!("start streaming successfully");
Ok(receiver)
}
Expand Down Expand Up @@ -358,14 +362,13 @@ impl<Ctrl, Strm, Ctxt> Camera<Ctrl, Strm, Ctxt> {
return Ok(());
}

// Stop streaming loop.
self.strm.stop_streaming_loop()?;

// Disable streaming.
let mut ctxt = self.params_ctxt()?;
expect_node!(&ctxt, "AcquisitionStop", as_command).execute(&mut ctxt)?;
expect_node!(&ctxt, "TLParamsLocked", as_integer).set_value(&mut ctxt, 0)?;
self.ctrl.disable_streaming()?;
// Stop streaming loop.
self.strm.stop_streaming_loop()?;

info!("stop streaming successfully");
Ok(())
Expand Down
6 changes: 6 additions & 0 deletions cameleon/src/payload.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,12 @@ impl PayloadReceiver {
self.rx.try_recv()?
}

/// Receives [`Payload`] sent from the device.
/// If the channel is empty, this method blocks until the device produces the payload.
pub fn recv_blocking(&self) -> StreamResult<Payload> {
self.rx.recv_blocking()?
}

/// Sends back [`Payload`] to the device to reuse already allocated `payload`.
///
/// Sending back `payload` may improve performance of streaming, but not required to call this
Expand Down
5 changes: 2 additions & 3 deletions device/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ repository = "https://github.com/cameleon-rs/cameleon"
description = """
cameleon-device provides device specific protocol decoders and basic I/O operations for GenICam compatible devices.
"""
categories = ["computer-vision"]
categories = ["computer-vision"]
keywords = ["genicam", "camera", "usb3", "gige", "uvc"]

[dependencies]
thiserror = "1.0.24"
log = "0.4.14"
semver = "1.0.0"
async-std = { version = "1.9.0", features = ["unstable"] }
async-std = { version = "1.12.0", features = ["unstable"] }
const_format = "0.2.14"
futures = "0.3.14"
lazy_static = "1.4.0"
Expand All @@ -29,7 +29,6 @@ rusb = { version = "0.9.0", optional = true }
libusb1-sys = { version = "0.6.0", optional = true }
libc = { version = "0.2", optional = true }


[dev-dependencies]
trybuild = "1.0.42"

Expand Down