From f5ba6e244f0281252d990aebfbe6356ea8e222e3 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Mon, 15 May 2023 10:05:31 +0700 Subject: [PATCH] Imporve handoff between preprocess and live --- Cargo.lock | 1 + Cargo.toml | 1 + src/rtsp/gst/sender.rs | 43 +++++++++++++++++++++--------------------- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b3839ba..fea8e19 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1415,6 +1415,7 @@ dependencies = [ "gstreamer-app", "gstreamer-rtsp", "gstreamer-rtsp-server", + "itertools", "lazy_static", "log", "neolink_core", diff --git a/Cargo.toml b/Cargo.toml index c00d20e..a51c927 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,6 +23,7 @@ gstreamer = "0.20.3" gstreamer-app = "0.20.0" gstreamer-rtsp = "0.20.0" gstreamer-rtsp-server = { version = "0.20.3", features = ["v1_16"] } +itertools = "0.10.5" lazy_static = "1.4.0" log = { version = "0.4.17", features = [ "release_max_level_debug" ] } neolink_core = { path = "crates/core", version = "0.5.10" } diff --git a/src/rtsp/gst/sender.rs b/src/rtsp/gst/sender.rs index 9416894..3fa9adb 100644 --- a/src/rtsp/gst/sender.rs +++ b/src/rtsp/gst/sender.rs @@ -8,6 +8,7 @@ use futures::{ use gstreamer::{prelude::*, ClockTime}; use gstreamer_app::AppSrc; pub use gstreamer_rtsp_server::gio::{TlsAuthenticationMode, TlsCertificate}; +use itertools::Itertools; use log::*; use neolink_core::bcmedia::model::*; use std::{ @@ -594,30 +595,30 @@ impl NeoMediaSender { async fn initialise(&mut self, buffer: &NeoBuffer) -> AnyResult<()> { if !self.inited && buffer.ready() { - // Minimum buffer - self.inited = true; + if let Some(target_time) = self.target_live() { + // Minimum buffer + self.inited = true; - // Split buffer into 2/3 of preprocess - // and one third for the future buffer - let split_idx = buffer.buf.len() * 2 / 3; - let rebuf = buffer.buf.iter().cloned().collect::>(); - let (preprocess, buffer) = rebuf.split_at(split_idx); - let start_ms = buffer - .first() - .map(|data| data.time as f64) - .expect("Buffer should have a start time"); - self.start_time.reset_to(start_ms); + let mut buffer_iter = buffer.buf.iter().cloned(); + let preprocess = buffer_iter + .take_while_ref(|item| item.time < target_time) + .collect::>(); + let mut buffer = buffer_iter.collect::>(); + self.start_time.reset_to(target_time as f64); - // Send preprocess now - self.send_buffers(preprocess).await?; - debug!("Preprocessed"); - // Send these later - for frame in buffer.iter() { - self.buffer.push(frame.clone()); + // Send preprocess now + self.send_buffers(preprocess.as_slice()).await?; + debug!("Preprocessed"); + // Send these later + for frame in buffer.drain(..) { + self.buffer.push(frame); + } + debug!("Buffer filled"); + + self.jump_to_live().await?; + } else { + debug!("Buffer not ready to init: {}", buffer.buf.len()); } - debug!("Buffer filled"); - - self.jump_to_live().await?; } else if !self.inited { debug!("Buffer not ready to init: {}", buffer.buf.len()); }