diff --git a/Cargo.lock b/Cargo.lock index 5da17c7..f6933da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -459,9 +459,9 @@ dependencies = [ [[package]] name = "delegate" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d358e0ec5c59a5e1603b933def447096886121660fc680dc1e64a0753981fe3c" +checksum = "0ee5df75c70b95bd3aacc8e2fd098797692fb1d54121019c4de481e42f04c8a1" dependencies = [ "proc-macro2", "quote", @@ -1251,6 +1251,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.6" @@ -1424,7 +1433,7 @@ dependencies = [ "gstreamer-rtsp-server", "heck", "is_sorted", - "itertools", + "itertools 0.11.0", "lazy_static", "log", "neolink_core", @@ -1641,12 +1650,6 @@ version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" -[[package]] -name = "pollster" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5da3b0203fd7ee5720aa0b5e790b591aa5d3f41c3ed2c34a3a393382198af2f7" - [[package]] name = "ppv-lite86" version = "0.2.17" @@ -1719,7 +1722,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.5", "proc-macro2", "quote", "syn 1.0.109", @@ -1860,17 +1863,17 @@ dependencies = [ [[package]] name = "rumqttc" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b616bf8b706c2a6235604f5d93f9578c37d0c6161e13898b68a1da4af2d812c" +checksum = "f2433b134712bc17a6f85a35e06b901e6e8d0bb20b5367e1121e6fedc140c0ac" dependencies = [ "bytes", "flume", "futures", "log", - "pollster", "rustls-native-certs", "rustls-pemfile", + "rustls-webpki 0.100.1", "thiserror", "tokio", "tokio-rustls", @@ -1892,14 +1895,14 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36" dependencies = [ "log", "ring", + "rustls-webpki 0.101.1", "sct", - "webpki", ] [[package]] @@ -1923,6 +1926,26 @@ dependencies = [ "base64 0.21.2", ] +[[package]] +name = "rustls-webpki" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15f36a6828982f422756984e47912a7a51dcbc2a197aa791158f8ca61cd8204e" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.12" @@ -2322,13 +2345,12 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.23.4" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ "rustls", "tokio", - "webpki", ] [[package]] @@ -2740,16 +2762,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - [[package]] name = "winapi" version = "0.2.8" diff --git a/Cargo.toml b/Cargo.toml index 8d80a9e..c366e5f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,12 +26,12 @@ gstreamer-rtsp = "0.20.0" gstreamer-rtsp-server = { version = "0.20.3", features = ["v1_16"] } heck = "0.4.1" is_sorted = "0.1.1" -itertools = "0.10.5" +itertools = "0.11.0" lazy_static = "1.4.0" log = { version = "0.4.17", features = [ "release_max_level_debug" ] } neolink_core = { path = "crates/core", version = "0.5.13" } regex = "1.7.3" -rumqttc = "0.20.0" +rumqttc = "0.22.0" serde = { version = "1.0.160", features = ["derive"] } serde_json = "1.0.96" time = "0.3.20" diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 1a9af75..1ce93ff 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -13,7 +13,7 @@ cfb-mode = "0.8.2" cookie-factory = "0.3.2" crc32fast = "1.3.2" crossbeam-channel = "0.5.8" -delegate = "0.9.0" +delegate = "0.10.0" err-derive = "0.3.1" futures = "0.3.28" get_if_addrs = "0.5.3" diff --git a/crates/core/src/bcudp/ser.rs b/crates/core/src/bcudp/ser.rs index b566d8a..e055e2e 100644 --- a/crates/core/src/bcudp/ser.rs +++ b/crates/core/src/bcudp/ser.rs @@ -52,7 +52,7 @@ fn bcudp_ack<'a, W: 'a + Write>( le_u32(0), le_u32(payload.group_id), le_u32(payload.packet_id), - le_u32(0), + le_u32(0xd7160000), le_u32(binary_payload.len() as u32), slice(binary_payload), )) diff --git a/src/image/mod.rs b/src/image/mod.rs index 50cf29e..d90fac0 100644 --- a/src/image/mod.rs +++ b/src/image/mod.rs @@ -42,7 +42,7 @@ pub(crate) async fn main(opt: Opt, config: Config) -> Result<()> { .await .context("Failed to connect to the camera, check credentials and network")?; - if (opt.use_stream) { + if opt.use_stream { let mut stream_data = camera .start_video(StreamKind::Main, 0, camera_config.strict) .await diff --git a/src/mqtt/event_cam.rs b/src/mqtt/event_cam.rs index 197db83..072bd04 100644 --- a/src/mqtt/event_cam.rs +++ b/src/mqtt/event_cam.rs @@ -1,5 +1,5 @@ use crate::config::CameraConfig; -use crate::utils::AddressOrUid; +use crate::utils::{timeout, AddressOrUid}; use anyhow::{anyhow, Context, Result}; use futures::stream::StreamExt; use log::*; @@ -193,10 +193,9 @@ impl EventCamThread { "aes" => MaxEncryption::Aes, _ => MaxEncryption::Aes, }; - camera - .login_with_maxenc(max_encryption) + timeout(camera.login_with_maxenc(max_encryption)) .await - .context("Failed to login to the camera")?; + .context("Failed to login to the camera")??; info!("{}: Connected and logged in", camera_config.name); self.tx.send(Messages::Login).await?; diff --git a/src/rtsp/gst/factory.rs b/src/rtsp/gst/factory.rs index 6c4426a..36b8aae 100644 --- a/src/rtsp/gst/factory.rs +++ b/src/rtsp/gst/factory.rs @@ -51,7 +51,6 @@ impl NeoMediaFactory { factory.set_shared(false); factory.imp().shared.set_buffer_size(buffer_size); factory.imp().shared.set_use_smoothing(use_smoothing); - // factory.set_do_retransmission(false); // Can't use as the method is missing on the 32bit docker gst dll factory.set_launch("videotestsrc pattern=\"snow\" ! video/x-raw,width=896,height=512,framerate=25/1 ! textoverlay name=\"inittextoverlay\" text=\"Stream not Ready\" valignment=top halignment=left font-desc=\"Sans, 32\" ! jpegenc ! rtpjpegpay name=pay0"); factory.set_suspend_mode(RTSPSuspendMode::None); factory.set_transport_mode(RTSPTransportMode::PLAY); @@ -239,18 +238,18 @@ fn make_queue(name: &str) -> AnyResult { Ok(queue) } -fn make_queue2(name: &str) -> AnyResult { - let queue = make_element("queue2", name)?; - queue.set_property("use-buffering", true); - queue.set_property("max-size-bytes", 0u32); - queue.set_property("max-size-buffers", 0u32); - queue.set_property( - "max-size-time", - std::convert::TryInto::::try_into(tokio::time::Duration::from_secs(5).as_nanos()) - .unwrap_or(0), - ); - Ok(queue) -} +// fn make_queue2(name: &str) -> AnyResult { +// let queue = make_element("queue2", name)?; +// queue.set_property("use-buffering", true); +// queue.set_property("max-size-bytes", 0u32); +// queue.set_property("max-size-buffers", 0u32); +// queue.set_property( +// "max-size-time", +// std::convert::TryInto::::try_into(tokio::time::Duration::from_secs(5).as_nanos()) +// .unwrap_or(0), +// ); +// Ok(queue) +// } impl NeoMediaFactoryImpl { pub(crate) fn buffer_ready(&self) -> bool { @@ -266,9 +265,11 @@ impl NeoMediaFactoryImpl { .dynamic_cast::() .map_err(|_| anyhow!("Media source's element should be a bin"))?; // Clear the autogenerated ones + log::debug!("Clearing old elements"); for element in bin.iterate_elements().into_iter().flatten() { bin.remove(&element)?; } + log::debug!("Cleared"); let mut client_data = NeoMediaSender::new( self.shared.get_buffer_size(), @@ -286,7 +287,7 @@ impl NeoMediaFactoryImpl { source.set_property_from_str("pattern", "snow"); source.set_property("num-buffers", 500i32); // Send buffers then EOS let queue = make_queue("queue0")?; - let queue2 = make_queue2("queue2")?; + // let queue2 = make_queue2("queue2")?; let overlay = make_element("textoverlay", "overlay")?; overlay.set_property("text", "Stream not Ready"); overlay.set_property_from_str("valignment", "top"); @@ -295,7 +296,7 @@ impl NeoMediaFactoryImpl { let encoder = make_element("jpegenc", "encoder")?; let payload = make_element("rtpjpegpay", "pay0")?; - bin.add_many(&[&source, &queue, &queue2, &overlay, &encoder, &payload])?; + bin.add_many(&[&source, &queue, &overlay, &encoder, &payload])?; source.link_filtered( &queue, &Caps::builder("video/x-raw") @@ -306,7 +307,7 @@ impl NeoMediaFactoryImpl { .build(), )?; // source.link(&queue)?; - Element::link_many(&[&queue, &queue2, &overlay, &encoder, &payload])?; + Element::link_many(&[&queue, &overlay, &encoder, &payload])?; } (VidFormats::H265, true) => { debug!("Building H265 Pipeline"); @@ -355,12 +356,12 @@ impl NeoMediaFactoryImpl { .dynamic_cast::() .map_err(|_| anyhow!("Cannot cast back"))?; let queue = make_queue("source_queue")?; - let queue2 = make_queue2("queue2")?; + // let queue2 = make_queue2("queue2")?; let parser = make_element("h265parse", "parser")?; // parser.set_property("config-interval", 5i32); let payload = make_element("rtph265pay", "pay0")?; - bin.add_many(&[&source, &queue, &queue2, &parser, &payload])?; - Element::link_many(&[&source, &queue, &queue2, &parser, &payload])?; + bin.add_many(&[&source, &queue, &parser, &payload])?; + Element::link_many(&[&source, &queue, &parser, &payload])?; let source = source .dynamic_cast::() @@ -417,7 +418,7 @@ impl NeoMediaFactoryImpl { .dynamic_cast::() .map_err(|_| anyhow!("Cannot cast back"))?; let queue = make_queue("source_queue")?; - let queue2 = make_queue2("queue2")?; + // let queue2 = make_queue2("queue2")?; let parser = make_element("h264parse", "parser")?; // parser.set_property("update-timecode", true); let payload = make_element("rtph264pay", "pay0")?; @@ -429,13 +430,13 @@ impl NeoMediaFactoryImpl { // payload.set_property("config-interval", 5i32); bin.add_many(&[ - &source, &queue, &queue2, &parser, + &source, &queue, &parser, &payload, // &storage, // &jitter, ])?; Element::link_many(&[ - &source, &queue, &queue2, &parser, + &source, &queue, &parser, &payload, // &storage, // &jitter, @@ -488,25 +489,26 @@ impl NeoMediaFactoryImpl { .map_err(|_| anyhow!("Cannot cast back"))?; let queue = make_queue("audqueue")?; - let queue2 = make_queue2("audqueue2")?; + // let queue2 = make_queue2("audqueue2")?; let parser = make_element("aacparse", "audparser")?; - let decoder = make_element("decodebin", "auddecoder")?; + let decoder = match make_element("faad", "auddecoder_faad") { + Ok(ele) => Ok(ele), + Err(_) => make_element("avdec_aac", "auddecoder_avdec_aac"), + }?; let encoder = make_element("audioconvert", "audencoder")?; let payload = make_element("rtpL16pay", "pay1")?; - bin.add_many(&[ - &source, &queue, &queue2, &parser, &decoder, &encoder, &payload, - ])?; - Element::link_many(&[&source, &queue, &queue2, &parser, &decoder])?; - Element::link_many(&[&encoder, &payload])?; - decoder.connect_pad_added(move |_element, pad| { - debug!("Linking encoder to decoder: {:?}", pad.caps()); - let sink_pad = encoder - .static_pad("sink") - .expect("Encoder is missing its pad"); - pad.link(&sink_pad) - .expect("Failed to link AAC decoder to encoder"); - }); + bin.add_many(&[&source, &queue, &parser, &decoder, &encoder, &payload])?; + Element::link_many(&[&source, &queue, &parser, &decoder, &encoder, &payload])?; + // Element::link_many(&[])?; + // decoder.connect_pad_added(move |_element, pad| { + // debug!("Linking encoder to decoder: {:?}", pad.caps()); + // let sink_pad = encoder + // .static_pad("sink") + // .expect("Encoder is missing its pad"); + // pad.link(&sink_pad) + // .expect("Failed to link AAC decoder to encoder"); + // }); let source = source .dynamic_cast::() @@ -560,13 +562,13 @@ impl NeoMediaFactoryImpl { .map_err(|_| anyhow!("Cannot cast back"))?; let queue = make_queue("audqueue")?; - let queue2 = make_queue2("audqueue2")?; + // let queue2 = make_queue2("audqueue2")?; let decoder = make_element("decodebin", "auddecoder")?; let encoder = make_element("audioconvert", "audencoder")?; let payload = make_element("rtpL16pay", "pay1")?; - bin.add_many(&[&source, &queue, &queue2, &decoder, &encoder, &payload])?; - Element::link_many(&[&source, &queue, &queue2, &decoder])?; + bin.add_many(&[&source, &queue, &decoder, &encoder, &payload])?; + Element::link_many(&[&source, &queue, &decoder])?; Element::link_many(&[&encoder, &payload])?; decoder.connect_pad_added(move |_element, pad| { debug!("Linking encoder to decoder: {:?}", pad.caps()); diff --git a/src/rtsp/gst/sender.rs b/src/rtsp/gst/sender.rs index 58af684..7bfae24 100644 --- a/src/rtsp/gst/sender.rs +++ b/src/rtsp/gst/sender.rs @@ -444,8 +444,8 @@ pub(super) struct NeoMediaSender { start_time: Spring, live_offset: FrameTime, buffer: NeoBuffer, - vid: Option, - aud: Option, + vid: Option>, + aud: Option>, command_reciever: Receiver, command_sender: Sender, inited: bool, @@ -453,6 +453,11 @@ pub(super) struct NeoMediaSender { use_smoothing: bool, } +enum Buffer { + Video(gstreamer::Buffer), + Audio(gstreamer::Buffer), +} + impl NeoMediaSender { pub(super) fn new(buffer_size: usize, use_smoothing: bool) -> Self { let (tx, rx) = channel(30); @@ -476,11 +481,11 @@ impl NeoMediaSender { } pub(super) fn update_vid(&mut self, source: AppSrc) { - self.vid.replace(source); + self.vid.replace(Arc::new(source)); } pub(super) fn update_aud(&mut self, source: AppSrc) { - self.aud.replace(source); + self.aud.replace(Arc::new(source)); } pub(super) fn get_commader(&self) -> Sender { @@ -615,15 +620,22 @@ impl NeoMediaSender { self.buffer.buf.clear(); let mut buffer_iter = buffer.buf.iter().cloned(); + // The prebuffer should starts from an Iframe let preprocess = buffer_iter - .take_while_ref(|item| item.time < target_time) + .take_while_ref(|item| { + item.time < target_time + || !matches!( + item.data.first().map(|arc| arc.as_ref()), + Some(BcMedia::Iframe(_)) + ) + }) .collect::>(); let mut buffer = buffer_iter.collect::>(); self.start_time.reset_to(target_time as f64); // Send preprocess now self.send_buffers(preprocess.as_slice(), true).await?; - trace!("Preprocessed: {}", preprocess.len()); + debug!("Preprocessed: {}", preprocess.len()); // Send these later for frame in buffer.drain(..) { self.buffer.buf.push_back(frame); @@ -717,17 +729,11 @@ impl NeoMediaSender { if medias.is_empty() { return Ok(()); } - tokio::task::yield_now().await; - let mut vid_buffers: Vec<(FrameTime, Vec)> = vec![]; - let mut aud_buffers: Vec<(FrameTime, Vec)> = vec![]; + let mut buffers: Vec = vec![]; + for media_sets in medias.iter() { tokio::task::yield_now().await; for media in media_sets.data.iter() { - let buffer = match media.as_ref() { - BcMedia::Iframe(_) | BcMedia::Pframe(_) => Some(&mut vid_buffers), - BcMedia::Aac(_) | BcMedia::Adpcm(_) => Some(&mut aud_buffers), - _ => None, - }; let data = match media.as_ref() { BcMedia::Iframe(data) => Some(&data.data), BcMedia::Pframe(data) => Some(&data.data), @@ -735,148 +741,71 @@ impl NeoMediaSender { BcMedia::Adpcm(data) => Some(&data.data), _ => None, }; - if let (Some(data), Some(buffer)) = (data, buffer) { - let next_time = media_sets.time; - if let Some(last) = buffer.last_mut() { - let last_time = last.0; - if next_time == last_time { - last.1.extend(data.iter().copied()); - } else { - buffer.push((next_time, data.clone())) + if let Some(buf) = data { + let time = media_sets.time; + let runtime = match (self.get_runtime(), ignore_stamps) { + (None, _) | (_, false) => self.buftime_to_runtime(time), + (Some(runtime), true) => runtime, + }; + trace!( + " - Sending vid frame at time {} ({:?} Expect: {:?})", + time, + Duration::from_micros(runtime as u64), + self.get_runtime().map(|i| Duration::from_micros(i as u64)) + ); + + let gst_buf = { + let mut gst_buf = gstreamer::Buffer::with_size(buf.len()).unwrap(); + { + let gst_buf_mut = gst_buf.get_mut().unwrap(); + + let time = ClockTime::from_useconds(runtime.try_into().unwrap()); + gst_buf_mut.set_dts(time); + gst_buf_mut.set_pts(time); + let mut gst_buf_data = gst_buf_mut.map_writable().unwrap(); + gst_buf_data.copy_from_slice(buf.as_slice()); } - } else { - buffer.push((next_time, data.clone())) + gst_buf + }; + match media.as_ref() { + BcMedia::Iframe(_) | BcMedia::Pframe(_) => { + buffers.push(Buffer::Video(gst_buf)); + } + BcMedia::Aac(_) | BcMedia::Adpcm(_) => { + buffers.push(Buffer::Audio(gst_buf)); + } + _ => {} } } } } tokio::task::yield_now().await; - tokio::try_join!( - async { - if !vid_buffers.is_empty() { - // debug!("Sending video buffers: {}", vid_buffers.len()); - if let Some(appsrc) = self.vid.clone() { - let buffers = { - let mut buffers = gstreamer::BufferList::new_sized(vid_buffers.len()); - { - let buffers_ref = buffers.get_mut().unwrap(); - for (time, buf) in vid_buffers.drain(..) { - tokio::task::yield_now().await; - let runtime = match (self.get_runtime(), ignore_stamps) { - (None, _) | (_, false) => self.buftime_to_runtime(time), - (Some(runtime), true) => runtime, - }; - trace!( - " - Sending vid frame at time {} ({:?} Expect: {:?})", - time, - Duration::from_micros(runtime as u64), - self.get_runtime().map(|i| Duration::from_micros(i as u64)) - ); - - let gst_buf = { - let mut gst_buf = - gstreamer::Buffer::with_size(buf.len()).unwrap(); - { - let gst_buf_mut = gst_buf.get_mut().unwrap(); - - let time = ClockTime::from_useconds( - runtime.try_into().unwrap(), - ); - gst_buf_mut.set_dts(time); - gst_buf_mut.set_pts(time); - let mut gst_buf_data = - gst_buf_mut.map_writable().unwrap(); - gst_buf_data.copy_from_slice(buf.as_slice()); - } - gst_buf - }; - buffers_ref.add(gst_buf); - } - } - buffers - }; - - let res = tokio::task::spawn_blocking(move || { - // debug!(" - Pushing buffer: {}", buffers.len()); - appsrc - .push_buffer_list(buffers.copy()) - .map(|_| ()) - .map_err(|_| anyhow!("Could not push buffer to appsrc")) - }) - .await; - match &res { - Err(e) => { - debug!("Paniced on send buffer list: {:?}", e); - } - Ok(Err(e)) => { - debug!("Failed to send buffer list: {:?}", e); - } - Ok(Ok(_)) => {} - }; - res??; + for buf in buffers.drain(..) { + let buf_app = match (buf, self.vid.as_ref(), self.aud.as_ref()) { + (Buffer::Video(buf), Some(app), _) => Some((buf, app.clone())), + (Buffer::Audio(buf), _, Some(app)) => Some((buf, app.clone())), + _ => None, + }; + if let Some((buf, appsrc)) = buf_app { + let res = tokio::task::spawn_blocking(move || { + appsrc + .push_buffer(buf.copy()) + .map(|_| ()) + .map_err(|_| anyhow!("Could not push buffer to appsrc")) + }) + .await; + match &res { + Err(e) => { + debug!("Paniced on send buffer list: {:?}", e); } - } - AnyResult::Ok(()) - }, - async { - if !aud_buffers.is_empty() { - if let Some(appsrc) = self.aud.clone() { - let buffers = { - let mut buffers = gstreamer::BufferList::new_sized(aud_buffers.len()); - { - let buffers_ref = buffers.get_mut().unwrap(); - for (time, buf) in aud_buffers.drain(..) { - tokio::task::yield_now().await; - let runtime = match (self.get_runtime(), ignore_stamps) { - (None, _) | (_, false) => self.buftime_to_runtime(time), - (Some(runtime), true) => runtime, - }; - - let gst_buf = { - let mut gst_buf = - gstreamer::Buffer::with_size(buf.len()).unwrap(); - { - let gst_buf_mut = gst_buf.get_mut().unwrap(); - - let time = ClockTime::from_useconds( - runtime.try_into().unwrap(), - ); - gst_buf_mut.set_dts(time); - gst_buf_mut.set_pts(time); - let mut gst_buf_data = - gst_buf_mut.map_writable().unwrap(); - gst_buf_data.copy_from_slice(buf.as_slice()); - } - gst_buf - }; - buffers_ref.add(gst_buf); - } - } - buffers - }; - - let res = tokio::task::spawn_blocking(move || { - appsrc - .push_buffer_list(buffers.copy()) - .map(|_| ()) - .map_err(|_| anyhow!("Could not push buffer to appsrc")) - }) - .await; - match &res { - Err(e) => { - debug!("Paniced on send buffer list: {:?}", e); - } - Ok(Err(e)) => { - debug!("Failed to send buffer list: {:?}", e); - } - Ok(Ok(_)) => {} - }; - res??; + Ok(Err(e)) => { + debug!("Failed to send buffer list: {:?}", e); } - } - AnyResult::Ok(()) + Ok(Ok(_)) => {} + }; + res??; } - )?; + } Ok(()) } } diff --git a/src/rtsp/mod.rs b/src/rtsp/mod.rs index 43f7af0..3e46350 100644 --- a/src/rtsp/mod.rs +++ b/src/rtsp/mod.rs @@ -174,10 +174,14 @@ async fn camera_main(camera: Camera) -> Result<(), CameraFailureKi .await .with_context(|| format!("{}: Could not login to camera", name)) .map_err(|e| { - let e_inner = e.downcast_ref::().unwrap(); + let e_inner = e.downcast_ref::(); match e_inner { - neolink_core::Error::CameraLoginFail => CameraFailureKind::Fatal(e), - _ => CameraFailureKind::Retry(e), + Some(neolink_core::Error::CameraLoginFail) => CameraFailureKind::Fatal(e), + Some(_) => CameraFailureKind::Retry(e), + None => { + // Timout error usually + CameraFailureKind::Retry(e) + } } })?; diff --git a/src/rtsp/states/connected.rs b/src/rtsp/states/connected.rs index e7e0336..e20493c 100644 --- a/src/rtsp/states/connected.rs +++ b/src/rtsp/states/connected.rs @@ -3,6 +3,7 @@ // This state has formed the TCP/UDP tunnel // but has not logged in use super::{camera::Camera, disconnected::Disconnected, loggedin::LoggedIn}; +use crate::utils::timeout; use anyhow::Result; use neolink_core::bc_protocol::{BcCamera, MaxEncryption}; @@ -28,7 +29,7 @@ impl Camera { _ => MaxEncryption::Aes, }; - self.state.camera.login_with_maxenc(max_encryption).await?; + timeout(self.state.camera.login_with_maxenc(max_encryption)).await??; Ok(Camera { shared: self.shared, state: LoggedIn { diff --git a/src/utils.rs b/src/utils.rs index 7ff6c05..91a15f2 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -13,6 +13,13 @@ use std::{ str::FromStr, }; +pub(crate) fn timeout(future: F) -> tokio::time::Timeout +where + F: std::future::Future, +{ + tokio::time::timeout(tokio::time::Duration::from_secs(5), future) +} + pub(crate) enum AddressOrUid { Address(String), Uid(String, DiscoveryMethods), @@ -133,10 +140,9 @@ pub(crate) async fn connect_and_login(camera_config: &CameraConfig) -> Result MaxEncryption::Aes, }; info!("{}: Logging in", camera_config.name); - camera - .login_with_maxenc(max_encryption) + timeout(camera.login_with_maxenc(max_encryption)) .await - .with_context(|| format!("Failed to login to {}", camera_config.name))?; + .with_context(|| format!("Failed to login to {}", camera_config.name))??; info!("{}: Connected and logged in", camera_config.name);