Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/host/pipewire/stream.rs
Original file line number Diff line number Diff line change
Expand Up @@ -304,10 +304,12 @@ where

let (callback, capture) = match pw_stream_time(stream) {
Some(t) => {
let delay_ns = t.delay() * 1_000_000_000i64 / t.rate().denom as i64;
// `pw_stream_time` guarantees `now > 0` and `denom != 0`.
let now = t.now() as u64;
let delay_ns = (t.delay() * 1_000_000_000i64 / t.rate().denom as i64).max(0) as u64;
(
StreamInstant::from_nanos(t.now() as u64),
StreamInstant::from_nanos((t.now() - delay_ns.max(0)) as u64),
StreamInstant::from_nanos(now),
StreamInstant::from_nanos(now.saturating_sub(delay_ns)),
)
Comment thread
roderickvd marked this conversation as resolved.
}
None => {
Expand Down Expand Up @@ -343,10 +345,12 @@ where

let (callback, playback) = match pw_stream_time(stream) {
Some(t) => {
let delay_ns = t.delay() * 1_000_000_000i64 / t.rate().denom as i64;
// `pw_stream_time` guarantees `now > 0` and `denom != 0`.
let now = t.now() as u64;
let delay_ns = (t.delay() * 1_000_000_000i64 / t.rate().denom as i64).max(0) as u64;
(
StreamInstant::from_nanos(t.now() as u64),
StreamInstant::from_nanos((t.now() + delay_ns.max(0)) as u64),
StreamInstant::from_nanos(now),
StreamInstant::from_nanos(now.saturating_add(delay_ns)),
)
Comment thread
roderickvd marked this conversation as resolved.
}
None => {
Expand Down
Loading