diff --git a/src/rtsp/gst/sender.rs b/src/rtsp/gst/sender.rs index a70bba6..8d9b16f 100644 --- a/src/rtsp/gst/sender.rs +++ b/src/rtsp/gst/sender.rs @@ -259,7 +259,10 @@ impl NeoMediaSenders { // Ocassionally the camera will make a jump in timestamps of about 15s (on sub 9s on main) // This could mean that it runs on some fixed sized buffer if let Some(end_time) = end_time { - let delta_time = frame_time - end_time - -1; + let delta_frame = (self.buffer.buf.back().unwrap().time + - self.buffer.buf.front().unwrap().time) + / self.buffer.buf.len() as i64; + let delta_time = frame_time - end_time + delta_frame; let delta_duration = Duration::from_micros(delta_time.unsigned_abs()); if delta_duration > Duration::from_secs(1) { debug!( @@ -280,6 +283,7 @@ impl NeoMediaSenders { for frame in client.buffer.buf.iter_mut() { frame.time = frame.time.saturating_add(delta_time); } + client.start_time.mod_value(delta_time as f64); } } } @@ -682,6 +686,10 @@ impl NeoMediaSender { } async fn update(&mut self) -> AnyResult<()> { + if self.buffer.buf.len() > BUFFER_SIZE - 5 { + debug!("Buffer overfull"); + self.jump_to_live().await?; + } if self.refilling && self.buffer.ready() { self.refilling = false; self.jump_to_live().await?; diff --git a/src/rtsp/spring.rs b/src/rtsp/spring.rs index 4eaf09e..5cf4de8 100644 --- a/src/rtsp/spring.rs +++ b/src/rtsp/spring.rs @@ -64,6 +64,12 @@ impl Spring { self.target } + #[allow(dead_code)] + pub(crate) fn mod_value(&mut self, delta: f64) { + self.target += delta; + self.value += delta; + } + pub(crate) fn reset_to(&mut self, target: f64) { self.target = target; self.value = target;