Set missed tick to skip

This commit is contained in:
QuantumEntangledAndy committed 2023-10-30 12:08:50 +07:00
1 parent 18a69b9d1e
commit 76e804ea6a
5 files changed
+12 -11

No files matched your search

Generated
+2 -2
View File
@@ -1663,7 +1663,7 @@ dependencies = [
[[package]]
name = "neolink"
version = "0.6.3-rc.1"
version = "0.6.3-rc.2"
dependencies = [
"anyhow",
"async-stream",
@@ -1701,7 +1701,7 @@ dependencies = [
[[package]]
name = "neolink_core"
version = "0.6.3-rc.1"
version = "0.6.3-rc.2"
dependencies = [
"aes",
"assert_matches",
+2 -2
View File
@@ -1,7 +1,7 @@
[package]
name = "neolink"
description = "A standards-compliant bridge to Reolink IP cameras"
version = "0.6.3-rc.1"
version = "0.6.3-rc.2"
authors = ["George Hilliard <thirtythreeforty@gmail.com>", "Andrew King <sheepchaan@gmail.com>"]
edition = "2018"
license = "AGPL-3.0-or-later"
@@ -31,7 +31,7 @@ heck = "0.4.1"
lazy_static = "1.4.0"
log = { version = "0.4.17", features = [ "release_max_level_debug" ] }
md5 = "0.7.0"
neolink_core = { path = "crates/core", version = "0.6.3-rc.1" }
neolink_core = { path = "crates/core", version = "0.6.3-rc.2" }
regex = "1.7.3"
rumqttc = "0.22.0"
serde = { version = "1.0.160", features = ["derive"] }
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "neolink_core"
description = "Core services and structure for Reolink IP cameras"
version = "0.6.3-rc.1"
version = "0.6.3-rc.2"
authors = ["George Hilliard <thirtythreeforty@gmail.com>", "Andrew King <sheepchaan@gmail.com>"]
edition = "2018"
license = "AGPL-3.0-or-later"
+1 -1
View File
@@ -12,7 +12,7 @@ env_logger = "0.10.0"
fcm-push-listener = "2.0.1"
lazy_static = "1.4.0"
log = { version = "0.4.17", features = [ "release_max_level_debug" ] }
neolink_core = { path = "../core", version = "0.6.3-rc.1" }
neolink_core = { path = "../core", version = "0.6.3-rc.2" }
regex = "1.8.1"
serde = "1.0.163"
tokio = { version = "1.28.1", features = ["full"] }
+6 -5
View File
@@ -7,7 +7,7 @@ use std::sync::Arc;
use tokio::{
sync::{broadcast::channel as broadcast, watch::channel as watch},
task::JoinSet,
time::{sleep, sleep_until, Duration, Instant},
time::{interval, sleep, Duration},
};
use tokio_stream::{wrappers::BroadcastStream, Stream, StreamExt};
use tokio_util::sync::CancellationToken;
@@ -584,11 +584,11 @@ fn ensure_order<E, T: Stream<Item = Result<StampedData, E>> + Unpin>(
let mut frame_buffer: Vec<StampedData> = vec![];
while let Some(frame) = stream.next().await {
if let Ok(frame) = frame {
if ! frame.keyframe {
// Buffer until keyframe and reorder
let mut reorder_buffer = vec![];
while frame_buffer.last().is_some_and(|v| v.ts > frame.ts) {
log::debug!("Reorder: {:?}", frame.ts);
reorder_buffer.push(frame_buffer.pop().unwrap());
}
frame_buffer.push(frame);
@@ -600,6 +600,7 @@ fn ensure_order<E, T: Stream<Item = Result<StampedData, E>> + Unpin>(
for frame in frame_buffer.drain(..) {
yield Ok(frame);
}
yield(Ok(frame));
}
}
}
@@ -613,11 +614,11 @@ fn frametime_stream<E, T: Stream<Item = Result<StampedData, E>> + Unpin>(
expected_frame_rate: Duration,
) -> impl Stream<Item = AnyResult<StampedData>> + Unpin {
Box::pin(async_stream::stream! {
let mut last_release = Instant::now();
let mut waiter = interval(expected_frame_rate);
waiter.set_missed_tick_behavior( tokio::time::MissedTickBehavior::Skip);
while let Some(frame) = stream.next().await {
if let Ok(frame) = frame {
sleep_until(last_release + expected_frame_rate).await;
last_release += expected_frame_rate;
waiter.tick().await;
yield Ok(frame);
}
}