diff --git a/Cargo.lock b/Cargo.lock index 029191a..4d83ab4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1733,7 +1733,7 @@ dependencies = [ [[package]] name = "neolink_decoder" -version = "0.0.1" +version = "0.6.3-rc.2" dependencies = [ "aes", "anyhow", @@ -2120,7 +2120,7 @@ dependencies = [ [[package]] name = "pushnoti" -version = "0.1.0" +version = "0.6.3-rc.2" dependencies = [ "anyhow", "clap", diff --git a/crates/decoder/Cargo.toml b/crates/decoder/Cargo.toml index 03f39ec..1b8e58e 100644 --- a/crates/decoder/Cargo.toml +++ b/crates/decoder/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "neolink_decoder" description = "A cli decoder for the AES encrypted packets" -version = "0.0.1" +version = "0.6.3-rc.2" authors = ["Andrew King "] edition = "2018" license = "AGPL-3.0-or-later" diff --git a/crates/pushnoti/Cargo.toml b/crates/pushnoti/Cargo.toml index 6ef1199..3b60d26 100644 --- a/crates/pushnoti/Cargo.toml +++ b/crates/pushnoti/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pushnoti" -version = "0.1.0" +version = "0.6.3-rc.2" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/src/mqtt/mod.rs b/src/mqtt/mod.rs index fe57d4f..1bed2c4 100644 --- a/src/mqtt/mod.rs +++ b/src/mqtt/mod.rs @@ -123,7 +123,7 @@ pub(crate) async fn main(_: Opt, reactor: NeoReactor) -> Result<()> { config_names = thread_config.borrow().clone().cameras.iter().filter(|a| a.enabled).map(|cam_config| cam_config.name.clone()).collect::>(); for name in config_names.iter() { - log::info!("{name}: MQTT Staring"); + log::info!("{name}: MQTT Starting"); if ! cameras.contains_key(name) { let local_cancel = CancellationToken::new(); cameras.insert(name.clone(),local_cancel.clone()); diff --git a/src/rtsp/factory.rs b/src/rtsp/factory.rs index e4d2fb3..3a9ae99 100644 --- a/src/rtsp/factory.rs +++ b/src/rtsp/factory.rs @@ -173,7 +173,7 @@ fn build_h264(bin: &Element, stream_config: &StreamConfig) -> Result { source.set_block(false); source.set_min_latency(0); source.set_property("emit-signals", false); - source.set_max_bytes(buffer_size as u64); + source.set_max_bytes(buffer_size as u64 * 3); source.set_do_timestamp(true); source.set_stream_type(AppStreamType::Seekable); @@ -208,7 +208,7 @@ fn build_h265(bin: &Element, stream_config: &StreamConfig) -> Result { source.set_block(false); source.set_min_latency(0); source.set_property("emit-signals", false); - source.set_max_bytes(buffer_size as u64); + source.set_max_bytes(buffer_size as u64 * 3); source.set_do_timestamp(true); source.set_stream_type(AppStreamType::Seekable); @@ -244,7 +244,7 @@ fn build_aac(bin: &Element, stream_config: &StreamConfig) -> Result { source.set_block(false); source.set_min_latency(0); source.set_property("emit-signals", false); - source.set_max_bytes(buffer_size as u64); + source.set_max_bytes(buffer_size as u64 * 3); source.set_do_timestamp(true); source.set_stream_type(AppStreamType::Seekable); @@ -316,7 +316,7 @@ fn build_adpcm(bin: &Element, block_size: u32, stream_config: &StreamConfig) -> source.set_block(false); source.set_min_latency(0); source.set_property("emit-signals", false); - source.set_max_bytes(buffer_size as u64); + source.set_max_bytes(buffer_size as u64 * 3); source.set_do_timestamp(true); source.set_stream_type(AppStreamType::Seekable); @@ -387,6 +387,7 @@ fn make_element(kind: &str, name: &str) -> AnyResult { ) }) } + fn make_queue(name: &str, buffer_size: u32) -> AnyResult { let queue = make_element("queue", &format!("queue1_{}", name))?; queue.set_property("max-size-bytes", buffer_size); diff --git a/src/rtsp/mod.rs b/src/rtsp/mod.rs index 4fc231e..9f45725 100644 --- a/src/rtsp/mod.rs +++ b/src/rtsp/mod.rs @@ -162,7 +162,7 @@ pub(crate) async fn main(_opt: Opt, reactor: NeoReactor) -> Result<()> { for name in config_names.iter() { if ! cameras.contains_key(name) { - log::info!("{name}: Rtsp Staring"); + log::info!("{name}: Rtsp Starting"); let local_cancel = CancellationToken::new(); cameras.insert(name.clone(),local_cancel.clone() ); let thread_global_cancel = thread_cancel2.clone();