github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-11-08 16:45:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Only notify when we are >= 1 second ahead

Browse source
This commit is contained in:
Roderick van Domburg 2022-01-09 23:04:14 +01:00
parent a62c1fea8f
commit c067c1524f
No known key found for this signature in database
GPG key ID: FE2585E713F9F30A
1 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
playback/src/player.rs
View file

@ -1107,23 +1107,41 @@ impl Future for PlayerInternal {
Ok(result) => { Ok(result) => {
if let Some((ref packet_position, ref packet)) = result { if let Some((ref packet_position, ref packet)) = result {
let new_stream_position_ms = packet_position.position_ms; let new_stream_position_ms = packet_position.position_ms;
*stream_position_ms = new_stream_position_ms; let expected_position_ms = std::mem::replace(
&mut *stream_position_ms,
new_stream_position_ms,
);
if !passthrough { if !passthrough {
match packet.samples() { match packet.samples() {
Ok(_) => { Ok(_) => {
// Only notify if we're skipped some packets *or* we are behind.
// If we're ahead it's probably due to a buffer of the backend
// and we're actually in time.
let new_stream_position = Duration::from_millis( let new_stream_position = Duration::from_millis(
new_stream_position_ms as u64, new_stream_position_ms as u64,
); );
let notify_about_position = packet_position.skipped
|| match *reported_nominal_start_time { let now = Instant::now();
// Only notify if we're skipped some packets *or* we are behind.
// If we're ahead it's probably due to a buffer of the backend
// and we're actually in time.
let notify_about_position =
match *reported_nominal_start_time {
None => true, None => true,
Some(reported_nominal_start_time) => { Some(reported_nominal_start_time) => {
let mut notify = false; let mut notify = false;
if let Some(lag) = Instant::now()
if packet_position.skipped {
if let Some(ahead) = new_stream_position
.checked_sub(Duration::from_millis(
expected_position_ms as u64,
))
{
notify |=
ahead >= Duration::from_secs(1)
}
}
if let Some(lag) = now
.checked_duration_since( .checked_duration_since(
reported_nominal_start_time, reported_nominal_start_time,
) )
@ -1131,16 +1149,18 @@ impl Future for PlayerInternal {
if let Some(lag) = if let Some(lag) =
lag.checked_sub(new_stream_position) lag.checked_sub(new_stream_position)
{ {
notify = notify |=
lag > Duration::from_secs(1) lag >= Duration::from_secs(1)
} }
} }
notify notify
} }
}; };
if notify_about_position { if notify_about_position {
*reported_nominal_start_time = *reported_nominal_start_time =
Instant::now().checked_sub(new_stream_position); now.checked_sub(new_stream_position);
self.send_event(PlayerEvent::Playing { self.send_event(PlayerEvent::Playing {
track_id, track_id,
play_request_id, play_request_id,