Notify Gstreamer of end-of-stream on hangup from camera

This may help resolve #13 on GitHub.
This commit is contained in:
George Hilliard committed 2020-06-18 13:46:23 -05:00
1 parent bfb84807e8
commit 3d94f30145
2 files changed
+11 -3

No files matched your search

+7
View File
@@ -121,6 +121,13 @@ mod maybe_app_src {
(MaybeAppSrc { rx, app_src: None }, tx)
}
/// Flushes data to Gstreamer on a problem communicating with the underlying video source.
pub fn on_stream_error(&mut self) {
if let Some(src) = self.try_get_src() {
src.end_of_stream().unwrap();
}
}
/// Attempts to retrieve the AppSrc that should be passed in by the caller of new_with_tx
/// at some point after this struct has been created. At that point, we swap over to
/// owning the AppSrc directly. This function handles either case and returns the AppSrc,
+4 -3
View File
@@ -2,7 +2,7 @@ use env_logger::Env;
use err_derive::Error;
use log::*;
use neolink::bc_protocol::BcCamera;
use neolink::gst::RtspServer;
use neolink::gst::{MaybeAppSrc, RtspServer};
use neolink::Never;
use std::fs;
use std::io::Write;
@@ -43,7 +43,7 @@ fn main() -> Result<(), Error> {
for camera in config.cameras {
s.spawn(move |_| {
// TODO handle these errors
let mut output = rtsp.add_stream(&camera.name).unwrap(); // TODO
let mut output = rtsp.add_stream(&camera.name).unwrap();
camera_loop(&camera, &mut output)
});
}
@@ -55,13 +55,14 @@ fn main() -> Result<(), Error> {
Ok(())
}
fn camera_loop(camera_config: &CameraConfig, output: &mut dyn Write) -> Result<Never, Error> {
fn camera_loop(camera_config: &CameraConfig, output: &mut MaybeAppSrc) -> Result<Never, Error> {
let min_backoff = Duration::from_secs(1);
let max_backoff = Duration::from_secs(15);
let mut current_backoff = min_backoff;
loop {
let cam_err = camera_main(camera_config, output).unwrap_err();
output.on_stream_error();
// Authentication failures are permanent; we retry everything else
if cam_err.connected {
current_backoff = min_backoff;