mirrors/gst-plugins-rs
mirrors/gst-plugins-rs
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs.git synced 2025-06-07 16:08:55 +00:00
Code Issues Projects Releases Wiki Activity

threadshare: Fix queue time level calculation

Browse source
This commit is contained in:
Sebastian Dröge 2018-03-28 12:31:31 +03:00
parent 6ebc8988b2
commit 13e706f678
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gst-plugin-threadshare/src/dataqueue.rs
View file

@ -251,7 +251,8 @@ impl DataQueue {
gst_debug!(DATA_QUEUE_CAT, obj: &inner.element, "Pushing item {:?}", item); gst_debug!(DATA_QUEUE_CAT, obj: &inner.element, "Pushing item {:?}", item);
let (count, bytes) = item.size(); let (count, bytes) = item.size();
let ts = inner.queue.iter().filter_map(|i| i.timestamp()).next(); let queue_ts = inner.queue.iter().filter_map(|i| i.timestamp()).next();
let ts = item.timestamp();
if let Some(max) = inner.max_size_buffers { if let Some(max) = inner.max_size_buffers {
if max <= inner.cur_size_buffers { if max <= inner.cur_size_buffers {
@ -268,9 +269,15 @@ impl DataQueue {
} }
// FIXME: Use running time // FIXME: Use running time
if let (Some(max), Some(ts)) = (inner.max_size_time, ts) { if let (Some(max), Some(queue_ts), Some(ts)) = (inner.max_size_time, queue_ts, ts) {
if max <= ts { let level = if queue_ts > ts {
gst_debug!(DATA_QUEUE_CAT, obj: &inner.element, "Queue is full (time): {} <= {}", max, ts); queue_ts - ts
} else {
ts - queue_ts
};
if max <= level {
gst_debug!(DATA_QUEUE_CAT, obj: &inner.element, "Queue is full (time): {} <= {}", max, level);
return Err(item); return Err(item);
} }
} }