Do target live calculation for abstract buffer

This commit is contained in:
QuantumEntangledAndy committed 2023-05-15 18:32:25 +07:00
1 parent f5ba6e244f
commit 279c1c5bf1
1 file changed
+17 -14
+17 -14
View File
@@ -479,22 +479,21 @@ impl NeoMediaSender {
self.command_sender.clone()
}
fn target_live(&self) -> Option<FrameTime> {
fn target_live_for(buffer: &NeoBuffer) -> Option<FrameTime> {
let target_idx = BUFFER_SIZE / 3;
let unique_stamps =
self.buffer
.buf
.iter()
.fold(Vec::<FrameTime>::new(), |mut acc, item| {
if let Some(last) = acc.last() {
if *last < item.time {
acc.push(item.time);
}
} else {
let unique_stamps = buffer
.buf
.iter()
.fold(Vec::<FrameTime>::new(), |mut acc, item| {
if let Some(last) = acc.last() {
if *last < item.time {
acc.push(item.time);
}
acc
});
} else {
acc.push(item.time);
}
acc
});
if unique_stamps.len() >= target_idx {
let target_frame = unique_stamps.len().saturating_sub(target_idx);
@@ -510,6 +509,10 @@ impl NeoMediaSender {
}
}
fn target_live(&self) -> Option<FrameTime> {
Self::target_live_for(&self.buffer)
}
async fn jump_to_live(&mut self) -> AnyResult<()> {
let target_time = self.target_live();
@@ -595,7 +598,7 @@ impl NeoMediaSender {
async fn initialise(&mut self, buffer: &NeoBuffer) -> AnyResult<()> {
if !self.inited && buffer.ready() {
if let Some(target_time) = self.target_live() {
if let Some(target_time) = Self::target_live_for(buffer) {
// Minimum buffer
self.inited = true;