Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
15880d1b84 | ||
|
|
0aee461156 | ||
|
|
b9969ce9ad |
No files matched your search
Generated
+1
-1
@@ -1408,7 +1408,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "neolink"
|
name = "neolink"
|
||||||
version = "0.5.12"
|
version = "0.5.13"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"base64 0.21.2",
|
"base64 0.21.2",
|
||||||
|
|||||||
+2
-1
@@ -54,7 +54,8 @@ RUN apt-get update && \
|
|||||||
gstreamer1.0-x \
|
gstreamer1.0-x \
|
||||||
gstreamer1.0-plugins-base \
|
gstreamer1.0-plugins-base \
|
||||||
gstreamer1.0-plugins-good \
|
gstreamer1.0-plugins-good \
|
||||||
gstreamer1.0-plugins-bad && \
|
gstreamer1.0-plugins-bad \
|
||||||
|
gstreamer1.0-libav && \
|
||||||
apt-get clean -y && rm -rf /var/lib/apt/lists/*
|
apt-get clean -y && rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
COPY --from=build \
|
COPY --from=build \
|
||||||
|
|||||||
@@ -10,4 +10,9 @@ pub struct Opt {
|
|||||||
/// The path of the output.
|
/// The path of the output.
|
||||||
#[structopt(short, long, value_parser = PathBuf::from_str)]
|
#[structopt(short, long, value_parser = PathBuf::from_str)]
|
||||||
pub file_path: PathBuf,
|
pub file_path: PathBuf,
|
||||||
|
/// If set then the image will pull from the live stream, if not it will be pulled from the cameras snap feature
|
||||||
|
///
|
||||||
|
/// Using the snap feature, is preffered unless your camera does not support it
|
||||||
|
#[structopt(short, long)]
|
||||||
|
pub use_stream: bool,
|
||||||
}
|
}
|
||||||
+52
-33
@@ -9,9 +9,18 @@
|
|||||||
/// neolink image --config=config.toml --file-path=filepath CameraName
|
/// neolink image --config=config.toml --file-path=filepath CameraName
|
||||||
/// ```
|
/// ```
|
||||||
///
|
///
|
||||||
|
/// Cameras that do not support the SNAP command need to use `--use_stream`
|
||||||
|
/// which will make the camera play the stream and transcode the video into a jpeg
|
||||||
|
/// e.g.:
|
||||||
|
///
|
||||||
|
/// ```bash
|
||||||
|
/// neolink image --config=config.toml --use_stream --file-path=filepath CameraName
|
||||||
|
/// ```
|
||||||
|
///
|
||||||
use anyhow::{Context, Result};
|
use anyhow::{Context, Result};
|
||||||
use log::*;
|
use log::*;
|
||||||
use neolink_core::{bc_protocol::*, bcmedia::model::*};
|
use neolink_core::{bc_protocol::*, bcmedia::model::*};
|
||||||
|
use tokio::{fs::File, io::AsyncWriteExt};
|
||||||
|
|
||||||
mod cmdline;
|
mod cmdline;
|
||||||
mod gst;
|
mod gst;
|
||||||
@@ -32,44 +41,54 @@ pub(crate) async fn main(opt: Opt, config: Config) -> Result<()> {
|
|||||||
let camera = connect_and_login(camera_config)
|
let camera = connect_and_login(camera_config)
|
||||||
.await
|
.await
|
||||||
.context("Failed to connect to the camera, check credentials and network")?;
|
.context("Failed to connect to the camera, check credentials and network")?;
|
||||||
let mut stream_data = camera
|
|
||||||
.start_video(StreamKind::Main, 0, camera_config.strict)
|
|
||||||
.await
|
|
||||||
.context("Failed to start video")?;
|
|
||||||
|
|
||||||
// Get one iframe at the start while also getting the the video type
|
if (opt.use_stream) {
|
||||||
let buf;
|
let mut stream_data = camera
|
||||||
let vid_type;
|
.start_video(StreamKind::Main, 0, camera_config.strict)
|
||||||
loop {
|
.await
|
||||||
if let BcMedia::Iframe(frame) = stream_data.get_data().await?? {
|
.context("Failed to start video")?;
|
||||||
vid_type = frame.video_type;
|
|
||||||
buf = frame.data;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut sender = gst::from_input(vid_type, &opt.file_path).await?;
|
// Get one iframe at the start while also getting the the video type
|
||||||
sender.send(buf).await?; // Send first iframe
|
let buf;
|
||||||
|
let vid_type;
|
||||||
// Keep sending both IFrame or PFrame until finished
|
loop {
|
||||||
while sender.is_finished().await.is_none() {
|
if let BcMedia::Iframe(frame) = stream_data.get_data().await?? {
|
||||||
let buf = match stream_data.get_data().await?? {
|
vid_type = frame.video_type;
|
||||||
BcMedia::Iframe(frame) => frame.data,
|
buf = frame.data;
|
||||||
BcMedia::Pframe(frame) => frame.data,
|
break;
|
||||||
_ => {
|
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
};
|
|
||||||
|
|
||||||
debug!("Sending frame data to gstreamer");
|
|
||||||
if sender.send(buf).await.is_err() {
|
|
||||||
// Assume that the sender is closed
|
|
||||||
// because the pipeline is finished
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let mut sender = gst::from_input(vid_type, &opt.file_path).await?;
|
||||||
|
sender.send(buf).await?; // Send first iframe
|
||||||
|
|
||||||
|
// Keep sending both IFrame or PFrame until finished
|
||||||
|
while sender.is_finished().await.is_none() {
|
||||||
|
let buf = match stream_data.get_data().await?? {
|
||||||
|
BcMedia::Iframe(frame) => frame.data,
|
||||||
|
BcMedia::Pframe(frame) => frame.data,
|
||||||
|
_ => {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
debug!("Sending frame data to gstreamer");
|
||||||
|
if sender.send(buf).await.is_err() {
|
||||||
|
// Assume that the sender is closed
|
||||||
|
// because the pipeline is finished
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
debug!("Sending EOS");
|
||||||
|
let _ = sender.eos().await; // Ignore return because if pipeline is finished this will error
|
||||||
|
} else {
|
||||||
|
// Simply use the snap command
|
||||||
|
debug!("Using the snap command");
|
||||||
|
let file_path = opt.file_path.with_extension("jpeg");
|
||||||
|
let mut buffer = File::create(file_path).await?;
|
||||||
|
let jpeg_data = camera.get_snapshot().await?;
|
||||||
|
buffer.write_all(jpeg_data.as_slice()).await?;
|
||||||
}
|
}
|
||||||
debug!("Sending EOS");
|
|
||||||
let _ = sender.eos().await; // Ignore return because if pipeline is finished this will error
|
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user