github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2024-12-18 17:11:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #905 from roderickvd/fix-exit-on-decoder-error

Browse source 
Skip track on decoding error
This commit is contained in:
Roderick van Domburg 2021-12-15 19:01:15 +01:00 committed by GitHub
commit 1736e7c52b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
playback/src/player.rs
View file

@ -737,7 +737,14 @@ impl PlayerTrackLoader {
} }
}; };
assert!(audio.duration >= 0); if audio.duration < 0 {
error!(
"Track duration for <{}> cannot be {}",
spotify_id.to_uri(),
audio.duration
);
return None;
}
let duration_ms = audio.duration as u32; let duration_ms = audio.duration as u32;
// (Most) podcasts seem to support only 96 bit Vorbis, so fall back to it // (Most) podcasts seem to support only 96 bit Vorbis, so fall back to it
@ -943,9 +950,12 @@ impl Future for PlayerInternal {
exit(1); exit(1);
} }
} }
Poll::Ready(Err(_)) => { Poll::Ready(Err(e)) => {
warn!("Unable to load <{:?}>\nSkipping to next track", track_id); warn!(
assert!(self.state.is_loading()); "Skipping to next track, unable to load track <{:?}>: {:?}",
track_id, e
);
debug_assert!(self.state.is_loading());
self.send_event(PlayerEvent::EndOfTrack { self.send_event(PlayerEvent::EndOfTrack {
track_id, track_id,
play_request_id, play_request_id,
@ -1045,8 +1055,11 @@ impl Future for PlayerInternal {
} }
} }
Err(e) => { Err(e) => {
error!("PlayerInternal poll: {}", e); warn!("Skipping to next track, unable to decode samples for track <{:?}>: {:?}", track_id, e);
exit(1); self.send_event(PlayerEvent::EndOfTrack {
track_id,
play_request_id,
})
} }
} }
} }
@ -1058,8 +1071,11 @@ impl Future for PlayerInternal {
self.handle_packet(packet, normalisation_factor); self.handle_packet(packet, normalisation_factor);
} }
Err(e) => { Err(e) => {
error!("PlayerInternal poll: {}", e); warn!("Skipping to next track, unable to get next packet for track <{:?}>: {:?}", track_id, e);
exit(1); self.send_event(PlayerEvent::EndOfTrack {
track_id,
play_request_id,
})
} }
} }
} else { } else {