2020-01-17 18:09:10 +00:00
|
|
|
use crate::audio::{AudioDecrypt, AudioFile, StreamLoaderController};
|
|
|
|
use crate::audio::{VorbisDecoder, VorbisPacket};
|
|
|
|
use crate::audio::{
|
2019-11-11 07:22:41 +00:00
|
|
|
READ_AHEAD_BEFORE_PLAYBACK_ROUNDTRIPS, READ_AHEAD_BEFORE_PLAYBACK_SECONDS,
|
|
|
|
READ_AHEAD_DURING_PLAYBACK_ROUNDTRIPS, READ_AHEAD_DURING_PLAYBACK_SECONDS,
|
|
|
|
};
|
2020-01-17 18:09:10 +00:00
|
|
|
use crate::audio_backend::Sink;
|
2021-01-21 21:22:32 +00:00
|
|
|
use crate::config::{Bitrate, PlayerConfig};
|
2020-01-17 18:09:10 +00:00
|
|
|
use crate::metadata::{AudioItem, FileFormat};
|
|
|
|
use crate::mixer::AudioFilter;
|
2021-01-21 21:22:32 +00:00
|
|
|
use librespot_core::session::Session;
|
|
|
|
use librespot_core::spotify_id::SpotifyId;
|
|
|
|
use librespot_core::util::SeqGenerator;
|
|
|
|
|
|
|
|
use byteorder::{LittleEndian, ReadBytesExt};
|
|
|
|
use futures::{
|
|
|
|
channel::{mpsc, oneshot},
|
|
|
|
future, Future, Stream, StreamExt,
|
|
|
|
};
|
|
|
|
use std::io::{Read, Seek, SeekFrom};
|
|
|
|
use std::mem;
|
|
|
|
use std::thread;
|
|
|
|
use std::time::{Duration, Instant};
|
|
|
|
use std::{borrow::Cow, io};
|
|
|
|
use std::{
|
|
|
|
cmp::max,
|
|
|
|
pin::Pin,
|
|
|
|
task::{Context, Poll},
|
|
|
|
};
|
2016-03-13 15:15:15 +00:00
|
|
|
|
2020-01-31 21:41:11 +00:00
|
|
|
const PRELOAD_NEXT_TRACK_BEFORE_END_DURATION_MS: u32 = 30000;
|
|
|
|
|
2015-09-01 11:20:37 +00:00
|
|
|
pub struct Player {
|
2021-01-21 21:22:32 +00:00
|
|
|
commands: Option<mpsc::UnboundedSender<PlayerCommand>>,
|
2017-11-27 23:35:04 +00:00
|
|
|
thread_handle: Option<thread::JoinHandle<()>>,
|
2020-01-31 21:41:11 +00:00
|
|
|
play_request_id_generator: SeqGenerator<u64>,
|
2015-07-02 19:42:49 +00:00
|
|
|
}
|
2015-06-23 14:38:29 +00:00
|
|
|
|
2020-03-10 12:26:01 +00:00
|
|
|
#[derive(PartialEq, Debug, Clone, Copy)]
|
|
|
|
pub enum SinkStatus {
|
|
|
|
Running,
|
|
|
|
Closed,
|
|
|
|
TemporarilyClosed,
|
|
|
|
}
|
|
|
|
|
|
|
|
pub type SinkEventCallback = Box<dyn Fn(SinkStatus) + Send>;
|
|
|
|
|
2015-09-01 11:20:37 +00:00
|
|
|
struct PlayerInternal {
|
|
|
|
session: Session,
|
2017-08-03 18:31:15 +00:00
|
|
|
config: PlayerConfig,
|
2021-01-21 21:22:32 +00:00
|
|
|
commands: mpsc::UnboundedReceiver<PlayerCommand>,
|
2017-01-29 14:11:20 +00:00
|
|
|
|
|
|
|
state: PlayerState,
|
2020-01-31 21:41:11 +00:00
|
|
|
preload: PlayerPreload,
|
2019-10-08 09:31:18 +00:00
|
|
|
sink: Box<dyn Sink>,
|
2020-03-10 12:26:01 +00:00
|
|
|
sink_status: SinkStatus,
|
|
|
|
sink_event_callback: Option<SinkEventCallback>,
|
2019-10-08 09:31:18 +00:00
|
|
|
audio_filter: Option<Box<dyn AudioFilter + Send>>,
|
2021-01-21 21:22:32 +00:00
|
|
|
event_senders: Vec<mpsc::UnboundedSender<PlayerEvent>>,
|
2015-07-02 19:42:49 +00:00
|
|
|
}
|
|
|
|
|
2015-07-09 20:08:14 +00:00
|
|
|
enum PlayerCommand {
|
2020-01-31 21:41:11 +00:00
|
|
|
Load {
|
|
|
|
track_id: SpotifyId,
|
|
|
|
play_request_id: u64,
|
|
|
|
play: bool,
|
|
|
|
position_ms: u32,
|
|
|
|
},
|
|
|
|
Preload {
|
|
|
|
track_id: SpotifyId,
|
|
|
|
},
|
2015-07-09 20:08:14 +00:00
|
|
|
Play,
|
|
|
|
Pause,
|
|
|
|
Stop,
|
2016-01-02 15:19:39 +00:00
|
|
|
Seek(u32),
|
2021-01-21 21:22:32 +00:00
|
|
|
AddEventSender(mpsc::UnboundedSender<PlayerEvent>),
|
2020-03-10 12:26:01 +00:00
|
|
|
SetSinkEventCallback(Option<SinkEventCallback>),
|
2020-01-31 21:41:11 +00:00
|
|
|
EmitVolumeSetEvent(u16),
|
2015-07-02 19:42:49 +00:00
|
|
|
}
|
|
|
|
|
2018-02-20 20:57:42 +00:00
|
|
|
#[derive(Debug, Clone)]
|
|
|
|
pub enum PlayerEvent {
|
2020-03-12 12:01:45 +00:00
|
|
|
// Fired when the player is stopped (e.g. by issuing a "stop" command to the player).
|
2020-02-03 07:58:44 +00:00
|
|
|
Stopped {
|
2020-01-31 21:41:11 +00:00
|
|
|
play_request_id: u64,
|
|
|
|
track_id: SpotifyId,
|
|
|
|
},
|
2020-03-12 12:01:45 +00:00
|
|
|
// The player started working on playback of a track while it was in a stopped state.
|
|
|
|
// This is always immediately followed up by a "Loading" or "Playing" event.
|
2020-02-03 07:58:44 +00:00
|
|
|
Started {
|
2020-01-31 21:41:11 +00:00
|
|
|
play_request_id: u64,
|
|
|
|
track_id: SpotifyId,
|
|
|
|
position_ms: u32,
|
2018-02-20 20:57:42 +00:00
|
|
|
},
|
2020-03-12 12:01:45 +00:00
|
|
|
// Same as started but in the case that the player already had a track loaded.
|
|
|
|
// The player was either playing the loaded track or it was paused.
|
2018-02-20 20:57:42 +00:00
|
|
|
Changed {
|
|
|
|
old_track_id: SpotifyId,
|
|
|
|
new_track_id: SpotifyId,
|
|
|
|
},
|
2020-03-12 12:01:45 +00:00
|
|
|
// The player is delayed by loading a track.
|
|
|
|
Loading {
|
2020-01-31 21:41:11 +00:00
|
|
|
play_request_id: u64,
|
|
|
|
track_id: SpotifyId,
|
2020-02-03 07:58:44 +00:00
|
|
|
position_ms: u32,
|
2020-01-31 21:41:11 +00:00
|
|
|
},
|
2020-12-10 21:17:41 +00:00
|
|
|
// The player is preloading a track.
|
|
|
|
Preloading {
|
|
|
|
track_id: SpotifyId,
|
|
|
|
},
|
2020-03-12 12:01:45 +00:00
|
|
|
// The player is playing a track.
|
|
|
|
// This event is issued at the start of playback of whenever the position must be communicated
|
|
|
|
// because it is out of sync. This includes:
|
|
|
|
// start of a track
|
|
|
|
// un-pausing
|
|
|
|
// after a seek
|
|
|
|
// after a buffer-underrun
|
2020-02-03 07:58:44 +00:00
|
|
|
Playing {
|
2020-01-31 21:41:11 +00:00
|
|
|
play_request_id: u64,
|
|
|
|
track_id: SpotifyId,
|
2020-02-03 07:58:44 +00:00
|
|
|
position_ms: u32,
|
|
|
|
duration_ms: u32,
|
2020-01-31 21:41:11 +00:00
|
|
|
},
|
2020-03-12 12:01:45 +00:00
|
|
|
// The player entered a paused state.
|
2020-01-31 21:41:11 +00:00
|
|
|
Paused {
|
|
|
|
play_request_id: u64,
|
|
|
|
track_id: SpotifyId,
|
|
|
|
position_ms: u32,
|
|
|
|
duration_ms: u32,
|
|
|
|
},
|
2020-03-12 12:01:45 +00:00
|
|
|
// The player thinks it's a good idea to issue a preload command for the next track now.
|
|
|
|
// This event is intended for use within spirc.
|
2020-02-03 07:58:44 +00:00
|
|
|
TimeToPreloadNextTrack {
|
|
|
|
play_request_id: u64,
|
|
|
|
track_id: SpotifyId,
|
2020-05-13 09:49:26 +00:00
|
|
|
},
|
2020-03-12 12:01:45 +00:00
|
|
|
// The player reached the end of a track.
|
|
|
|
// This event is intended for use within spirc. Spirc will respond by issuing another command
|
|
|
|
// which will trigger another event (e.g. Changed or Stopped)
|
2020-02-03 07:58:44 +00:00
|
|
|
EndOfTrack {
|
2020-05-13 09:49:26 +00:00
|
|
|
play_request_id: u64,
|
|
|
|
track_id: SpotifyId,
|
2020-02-03 07:58:44 +00:00
|
|
|
},
|
2020-05-13 10:19:33 +00:00
|
|
|
// The player was unable to load the requested track.
|
|
|
|
Unavailable {
|
2020-01-31 21:41:11 +00:00
|
|
|
play_request_id: u64,
|
2018-02-20 20:57:42 +00:00
|
|
|
track_id: SpotifyId,
|
2018-02-26 01:50:41 +00:00
|
|
|
},
|
2020-03-12 12:01:45 +00:00
|
|
|
// The mixer volume was set to a new level.
|
2020-01-31 21:41:11 +00:00
|
|
|
VolumeSet {
|
|
|
|
volume: u16,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
impl PlayerEvent {
|
|
|
|
pub fn get_play_request_id(&self) -> Option<u64> {
|
|
|
|
use PlayerEvent::*;
|
|
|
|
match self {
|
|
|
|
Loading {
|
|
|
|
play_request_id, ..
|
|
|
|
}
|
2020-05-13 09:49:26 +00:00
|
|
|
| Unavailable {
|
|
|
|
play_request_id, ..
|
|
|
|
}
|
2020-01-31 21:41:11 +00:00
|
|
|
| Started {
|
|
|
|
play_request_id, ..
|
|
|
|
}
|
|
|
|
| Playing {
|
|
|
|
play_request_id, ..
|
|
|
|
}
|
|
|
|
| TimeToPreloadNextTrack {
|
|
|
|
play_request_id, ..
|
|
|
|
}
|
|
|
|
| EndOfTrack {
|
|
|
|
play_request_id, ..
|
|
|
|
}
|
|
|
|
| Paused {
|
|
|
|
play_request_id, ..
|
|
|
|
}
|
|
|
|
| Stopped {
|
|
|
|
play_request_id, ..
|
|
|
|
} => Some(*play_request_id),
|
2020-12-10 21:17:41 +00:00
|
|
|
Changed { .. } | Preloading { .. } | VolumeSet { .. } => None,
|
2020-01-31 21:41:11 +00:00
|
|
|
}
|
|
|
|
}
|
2018-02-20 20:57:42 +00:00
|
|
|
}
|
|
|
|
|
2021-01-21 21:22:32 +00:00
|
|
|
pub type PlayerEventChannel = mpsc::UnboundedReceiver<PlayerEvent>;
|
2018-02-24 19:16:28 +00:00
|
|
|
|
2018-02-23 19:08:20 +00:00
|
|
|
#[derive(Clone, Copy, Debug)]
|
|
|
|
struct NormalisationData {
|
|
|
|
track_gain_db: f32,
|
|
|
|
track_peak: f32,
|
|
|
|
album_gain_db: f32,
|
|
|
|
album_peak: f32,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl NormalisationData {
|
2021-01-21 21:22:32 +00:00
|
|
|
fn parse_from_file<T: Read + Seek>(mut file: T) -> io::Result<NormalisationData> {
|
2018-02-24 15:30:24 +00:00
|
|
|
const SPOTIFY_NORMALIZATION_HEADER_START_OFFSET: u64 = 144;
|
2018-02-26 01:50:41 +00:00
|
|
|
file.seek(SeekFrom::Start(SPOTIFY_NORMALIZATION_HEADER_START_OFFSET))
|
|
|
|
.unwrap();
|
2018-02-23 19:08:20 +00:00
|
|
|
|
2018-02-24 15:30:24 +00:00
|
|
|
let track_gain_db = file.read_f32::<LittleEndian>().unwrap();
|
|
|
|
let track_peak = file.read_f32::<LittleEndian>().unwrap();
|
|
|
|
let album_gain_db = file.read_f32::<LittleEndian>().unwrap();
|
|
|
|
let album_peak = file.read_f32::<LittleEndian>().unwrap();
|
2018-02-23 19:08:20 +00:00
|
|
|
|
2018-02-24 15:30:24 +00:00
|
|
|
let r = NormalisationData {
|
2018-02-23 19:08:20 +00:00
|
|
|
track_gain_db: track_gain_db,
|
|
|
|
track_peak: track_peak,
|
|
|
|
album_gain_db: album_gain_db,
|
|
|
|
album_peak: album_peak,
|
2018-02-24 15:30:24 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
Ok(r)
|
2018-02-23 19:08:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fn get_factor(config: &PlayerConfig, data: NormalisationData) -> f32 {
|
2019-10-08 09:31:18 +00:00
|
|
|
let mut normalisation_factor = f32::powf(
|
|
|
|
10.0,
|
|
|
|
(data.track_gain_db + config.normalisation_pregain) / 20.0,
|
|
|
|
);
|
2018-02-23 19:08:20 +00:00
|
|
|
|
2018-02-24 15:30:24 +00:00
|
|
|
if normalisation_factor * data.track_peak > 1.0 {
|
|
|
|
warn!("Reducing normalisation factor to prevent clipping. Please add negative pregain to avoid.");
|
|
|
|
normalisation_factor = 1.0 / data.track_peak;
|
2018-02-23 19:08:20 +00:00
|
|
|
}
|
|
|
|
|
2018-02-24 15:30:24 +00:00
|
|
|
debug!("Normalisation Data: {:?}", data);
|
|
|
|
debug!("Applied normalisation factor: {}", normalisation_factor);
|
|
|
|
|
2018-02-23 19:08:20 +00:00
|
|
|
normalisation_factor
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-09-01 11:20:37 +00:00
|
|
|
impl Player {
|
2018-02-26 01:50:41 +00:00
|
|
|
pub fn new<F>(
|
|
|
|
config: PlayerConfig,
|
|
|
|
session: Session,
|
2019-10-08 09:31:18 +00:00
|
|
|
audio_filter: Option<Box<dyn AudioFilter + Send>>,
|
2018-02-26 01:50:41 +00:00
|
|
|
sink_builder: F,
|
|
|
|
) -> (Player, PlayerEventChannel)
|
|
|
|
where
|
2019-10-08 09:31:18 +00:00
|
|
|
F: FnOnce() -> Box<dyn Sink> + Send + 'static,
|
2017-08-03 18:31:15 +00:00
|
|
|
{
|
2021-01-21 21:22:32 +00:00
|
|
|
let (cmd_tx, cmd_rx) = mpsc::unbounded();
|
|
|
|
let (event_sender, event_receiver) = mpsc::unbounded();
|
2015-07-02 19:42:49 +00:00
|
|
|
|
2017-11-27 23:35:04 +00:00
|
|
|
let handle = thread::spawn(move || {
|
2017-02-22 04:17:04 +00:00
|
|
|
debug!("new Player[{}]", session.session_id());
|
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
let internal = PlayerInternal {
|
|
|
|
session: session,
|
2017-08-03 18:31:15 +00:00
|
|
|
config: config,
|
2017-01-29 14:11:20 +00:00
|
|
|
commands: cmd_rx,
|
2015-07-02 19:42:49 +00:00
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
state: PlayerState::Stopped,
|
2020-01-31 21:41:11 +00:00
|
|
|
preload: PlayerPreload::None,
|
2017-01-29 14:11:20 +00:00
|
|
|
sink: sink_builder(),
|
2020-03-10 12:26:01 +00:00
|
|
|
sink_status: SinkStatus::Closed,
|
|
|
|
sink_event_callback: None,
|
2017-02-21 22:46:19 +00:00
|
|
|
audio_filter: audio_filter,
|
2020-01-31 21:41:11 +00:00
|
|
|
event_senders: [event_sender].to_vec(),
|
2017-01-29 14:11:20 +00:00
|
|
|
};
|
|
|
|
|
2020-02-03 07:58:44 +00:00
|
|
|
// While PlayerInternal is written as a future, it still contains blocking code.
|
|
|
|
// It must be run by using wait() in a dedicated thread.
|
2021-01-21 21:22:32 +00:00
|
|
|
todo!("How to block in futures 0.3?");
|
2020-01-31 21:41:11 +00:00
|
|
|
debug!("PlayerInternal thread finished.");
|
2017-01-29 14:11:20 +00:00
|
|
|
});
|
2015-09-01 11:20:37 +00:00
|
|
|
|
2018-02-26 01:50:41 +00:00
|
|
|
(
|
|
|
|
Player {
|
|
|
|
commands: Some(cmd_tx),
|
|
|
|
thread_handle: Some(handle),
|
2020-01-31 21:41:11 +00:00
|
|
|
play_request_id_generator: SeqGenerator::new(0),
|
2018-02-26 01:50:41 +00:00
|
|
|
},
|
|
|
|
event_receiver,
|
|
|
|
)
|
2015-07-02 19:42:49 +00:00
|
|
|
}
|
|
|
|
|
2015-07-09 20:08:14 +00:00
|
|
|
fn command(&self, cmd: PlayerCommand) {
|
2020-01-31 21:41:11 +00:00
|
|
|
self.commands.as_ref().unwrap().unbounded_send(cmd).unwrap();
|
2015-07-02 19:42:49 +00:00
|
|
|
}
|
2016-01-20 14:11:49 +00:00
|
|
|
|
2020-01-31 21:41:11 +00:00
|
|
|
pub fn load(&mut self, track_id: SpotifyId, start_playing: bool, position_ms: u32) -> u64 {
|
|
|
|
let play_request_id = self.play_request_id_generator.get();
|
|
|
|
self.command(PlayerCommand::Load {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
play: start_playing,
|
|
|
|
position_ms,
|
|
|
|
});
|
|
|
|
|
|
|
|
play_request_id
|
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2020-02-02 00:07:05 +00:00
|
|
|
pub fn preload(&self, track_id: SpotifyId) {
|
|
|
|
self.command(PlayerCommand::Preload { track_id });
|
2016-01-20 14:11:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
pub fn play(&self) {
|
|
|
|
self.command(PlayerCommand::Play)
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn pause(&self) {
|
|
|
|
self.command(PlayerCommand::Pause)
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn stop(&self) {
|
|
|
|
self.command(PlayerCommand::Stop)
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn seek(&self, position_ms: u32) {
|
|
|
|
self.command(PlayerCommand::Seek(position_ms));
|
|
|
|
}
|
2020-01-31 21:41:11 +00:00
|
|
|
|
|
|
|
pub fn get_player_event_channel(&self) -> PlayerEventChannel {
|
2021-01-21 21:22:32 +00:00
|
|
|
let (event_sender, event_receiver) = mpsc::unbounded();
|
2020-01-31 21:41:11 +00:00
|
|
|
self.command(PlayerCommand::AddEventSender(event_sender));
|
|
|
|
event_receiver
|
|
|
|
}
|
|
|
|
|
2021-01-21 21:22:32 +00:00
|
|
|
pub async fn get_end_of_track_future(&self) {
|
|
|
|
self.get_player_event_channel()
|
|
|
|
.filter(|event| {
|
|
|
|
future::ready(matches!(
|
|
|
|
event,
|
|
|
|
PlayerEvent::EndOfTrack { .. } | PlayerEvent::Stopped { .. }
|
|
|
|
))
|
2020-02-02 00:07:05 +00:00
|
|
|
})
|
2021-01-21 21:22:32 +00:00
|
|
|
.for_each(|_| future::ready(()))
|
|
|
|
.await
|
2020-02-02 00:07:05 +00:00
|
|
|
}
|
|
|
|
|
2020-03-10 12:26:01 +00:00
|
|
|
pub fn set_sink_event_callback(&self, callback: Option<SinkEventCallback>) {
|
|
|
|
self.command(PlayerCommand::SetSinkEventCallback(callback));
|
|
|
|
}
|
|
|
|
|
2020-01-31 21:41:11 +00:00
|
|
|
pub fn emit_volume_set_event(&self, volume: u16) {
|
|
|
|
self.command(PlayerCommand::EmitVolumeSetEvent(volume));
|
|
|
|
}
|
2015-07-02 19:42:49 +00:00
|
|
|
}
|
2015-06-23 14:38:29 +00:00
|
|
|
|
2017-11-27 23:35:04 +00:00
|
|
|
impl Drop for Player {
|
|
|
|
fn drop(&mut self) {
|
|
|
|
debug!("Shutting down player thread ...");
|
|
|
|
self.commands = None;
|
|
|
|
if let Some(handle) = self.thread_handle.take() {
|
|
|
|
match handle.join() {
|
|
|
|
Ok(_) => (),
|
2018-02-26 01:50:41 +00:00
|
|
|
Err(_) => error!("Player thread panicked!"),
|
2017-11-27 23:35:04 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-31 21:41:11 +00:00
|
|
|
struct PlayerLoadedTrackData {
|
|
|
|
decoder: Decoder,
|
|
|
|
normalisation_factor: f32,
|
|
|
|
stream_loader_controller: StreamLoaderController,
|
|
|
|
bytes_per_second: usize,
|
|
|
|
duration_ms: u32,
|
2020-02-02 00:07:05 +00:00
|
|
|
stream_position_pcm: u64,
|
2020-01-31 21:41:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
enum PlayerPreload {
|
|
|
|
None,
|
|
|
|
Loading {
|
|
|
|
track_id: SpotifyId,
|
2021-01-21 21:22:32 +00:00
|
|
|
loader: Pin<Box<dyn Future<Output = Result<PlayerLoadedTrackData, ()>>>>,
|
2020-01-31 21:41:11 +00:00
|
|
|
},
|
|
|
|
Ready {
|
|
|
|
track_id: SpotifyId,
|
|
|
|
loaded_track: PlayerLoadedTrackData,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
2017-08-03 20:22:08 +00:00
|
|
|
type Decoder = VorbisDecoder<Subfile<AudioDecrypt<AudioFile>>>;
|
2020-01-31 21:41:11 +00:00
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
enum PlayerState {
|
|
|
|
Stopped,
|
2020-01-31 21:41:11 +00:00
|
|
|
Loading {
|
|
|
|
track_id: SpotifyId,
|
|
|
|
play_request_id: u64,
|
|
|
|
start_playback: bool,
|
2021-01-21 21:22:32 +00:00
|
|
|
loader: Pin<Box<dyn Future<Output = Result<PlayerLoadedTrackData, ()>>>>,
|
2020-01-31 21:41:11 +00:00
|
|
|
},
|
2017-01-29 14:11:20 +00:00
|
|
|
Paused {
|
2018-02-15 23:16:38 +00:00
|
|
|
track_id: SpotifyId,
|
2020-01-31 21:41:11 +00:00
|
|
|
play_request_id: u64,
|
2017-01-29 14:11:20 +00:00
|
|
|
decoder: Decoder,
|
2018-02-23 19:08:20 +00:00
|
|
|
normalisation_factor: f32,
|
2019-11-01 19:46:28 +00:00
|
|
|
stream_loader_controller: StreamLoaderController,
|
2019-11-07 13:02:53 +00:00
|
|
|
bytes_per_second: usize,
|
2020-01-31 21:41:11 +00:00
|
|
|
duration_ms: u32,
|
2020-02-02 00:07:05 +00:00
|
|
|
stream_position_pcm: u64,
|
2020-01-31 21:41:11 +00:00
|
|
|
suggested_to_preload_next_track: bool,
|
2017-01-29 14:11:20 +00:00
|
|
|
},
|
|
|
|
Playing {
|
2018-02-15 23:16:38 +00:00
|
|
|
track_id: SpotifyId,
|
2020-01-31 21:41:11 +00:00
|
|
|
play_request_id: u64,
|
2017-01-29 14:11:20 +00:00
|
|
|
decoder: Decoder,
|
2018-02-23 19:08:20 +00:00
|
|
|
normalisation_factor: f32,
|
2019-11-01 19:46:28 +00:00
|
|
|
stream_loader_controller: StreamLoaderController,
|
2019-11-07 13:02:53 +00:00
|
|
|
bytes_per_second: usize,
|
2020-01-31 21:41:11 +00:00
|
|
|
duration_ms: u32,
|
2020-02-02 00:07:05 +00:00
|
|
|
stream_position_pcm: u64,
|
2020-01-31 21:41:11 +00:00
|
|
|
reported_nominal_start_time: Option<Instant>,
|
|
|
|
suggested_to_preload_next_track: bool,
|
2017-01-29 14:11:20 +00:00
|
|
|
},
|
2018-02-26 01:50:41 +00:00
|
|
|
EndOfTrack {
|
|
|
|
track_id: SpotifyId,
|
2020-01-31 21:41:11 +00:00
|
|
|
play_request_id: u64,
|
2020-03-12 12:01:45 +00:00
|
|
|
loaded_track: PlayerLoadedTrackData,
|
2018-02-26 01:50:41 +00:00
|
|
|
},
|
2017-01-29 14:11:20 +00:00
|
|
|
Invalid,
|
2016-02-05 20:54:47 +00:00
|
|
|
}
|
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
impl PlayerState {
|
|
|
|
fn is_playing(&self) -> bool {
|
|
|
|
use self::PlayerState::*;
|
|
|
|
match *self {
|
2020-01-31 21:41:11 +00:00
|
|
|
Stopped | EndOfTrack { .. } | Paused { .. } | Loading { .. } => false,
|
2017-01-29 14:11:20 +00:00
|
|
|
Playing { .. } => true,
|
|
|
|
Invalid => panic!("invalid state"),
|
|
|
|
}
|
2016-05-04 08:11:03 +00:00
|
|
|
}
|
2017-01-05 13:25:14 +00:00
|
|
|
|
2020-05-09 11:59:28 +00:00
|
|
|
#[allow(dead_code)]
|
2020-01-31 21:41:11 +00:00
|
|
|
fn is_stopped(&self) -> bool {
|
|
|
|
use self::PlayerState::*;
|
|
|
|
match *self {
|
|
|
|
Stopped => true,
|
|
|
|
_ => false,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-05-09 11:59:28 +00:00
|
|
|
fn is_loading(&self) -> bool {
|
|
|
|
use self::PlayerState::*;
|
|
|
|
match *self {
|
|
|
|
Loading { .. } => true,
|
|
|
|
_ => false,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
fn decoder(&mut self) -> Option<&mut Decoder> {
|
|
|
|
use self::PlayerState::*;
|
|
|
|
match *self {
|
2020-01-31 21:41:11 +00:00
|
|
|
Stopped | EndOfTrack { .. } | Loading { .. } => None,
|
2019-10-08 09:31:18 +00:00
|
|
|
Paused {
|
|
|
|
ref mut decoder, ..
|
|
|
|
}
|
|
|
|
| Playing {
|
|
|
|
ref mut decoder, ..
|
|
|
|
} => Some(decoder),
|
2017-01-29 14:11:20 +00:00
|
|
|
Invalid => panic!("invalid state"),
|
2016-05-04 08:11:03 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
}
|
2016-05-04 08:11:03 +00:00
|
|
|
|
2019-11-01 19:46:28 +00:00
|
|
|
fn stream_loader_controller(&mut self) -> Option<&mut StreamLoaderController> {
|
|
|
|
use self::PlayerState::*;
|
|
|
|
match *self {
|
2020-01-31 21:41:11 +00:00
|
|
|
Stopped | EndOfTrack { .. } | Loading { .. } => None,
|
2019-11-11 07:22:41 +00:00
|
|
|
Paused {
|
|
|
|
ref mut stream_loader_controller,
|
|
|
|
..
|
|
|
|
}
|
|
|
|
| Playing {
|
|
|
|
ref mut stream_loader_controller,
|
|
|
|
..
|
|
|
|
} => Some(stream_loader_controller),
|
2019-11-01 19:46:28 +00:00
|
|
|
Invalid => panic!("invalid state"),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-02-20 20:58:02 +00:00
|
|
|
fn playing_to_end_of_track(&mut self) {
|
|
|
|
use self::PlayerState::*;
|
2018-02-23 19:16:03 +00:00
|
|
|
match mem::replace(self, Invalid) {
|
2018-02-26 01:50:41 +00:00
|
|
|
Playing {
|
|
|
|
track_id,
|
2020-01-31 21:41:11 +00:00
|
|
|
play_request_id,
|
2020-02-02 14:37:17 +00:00
|
|
|
decoder,
|
|
|
|
duration_ms,
|
|
|
|
bytes_per_second,
|
|
|
|
normalisation_factor,
|
|
|
|
stream_loader_controller,
|
|
|
|
stream_position_pcm,
|
2018-02-26 01:50:41 +00:00
|
|
|
..
|
|
|
|
} => {
|
2020-01-31 21:41:11 +00:00
|
|
|
*self = EndOfTrack {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
2020-03-12 12:01:45 +00:00
|
|
|
loaded_track: PlayerLoadedTrackData {
|
2020-02-02 14:37:17 +00:00
|
|
|
decoder,
|
|
|
|
duration_ms,
|
|
|
|
bytes_per_second,
|
|
|
|
normalisation_factor,
|
|
|
|
stream_loader_controller,
|
|
|
|
stream_position_pcm,
|
2020-03-12 12:01:45 +00:00
|
|
|
},
|
2020-01-31 21:41:11 +00:00
|
|
|
};
|
2018-02-26 01:50:41 +00:00
|
|
|
}
|
|
|
|
_ => panic!("Called playing_to_end_of_track in non-playing state."),
|
2016-05-04 08:11:03 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
}
|
2016-05-04 08:11:03 +00:00
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
fn paused_to_playing(&mut self) {
|
|
|
|
use self::PlayerState::*;
|
|
|
|
match ::std::mem::replace(self, Invalid) {
|
2018-02-26 01:50:41 +00:00
|
|
|
Paused {
|
|
|
|
track_id,
|
2020-01-31 21:41:11 +00:00
|
|
|
play_request_id,
|
2018-02-26 01:50:41 +00:00
|
|
|
decoder,
|
|
|
|
normalisation_factor,
|
2019-11-01 19:46:28 +00:00
|
|
|
stream_loader_controller,
|
2020-01-31 21:41:11 +00:00
|
|
|
duration_ms,
|
2019-11-11 07:22:41 +00:00
|
|
|
bytes_per_second,
|
2020-02-02 00:07:05 +00:00
|
|
|
stream_position_pcm,
|
2020-01-31 21:41:11 +00:00
|
|
|
suggested_to_preload_next_track,
|
2018-02-26 01:50:41 +00:00
|
|
|
} => {
|
2017-01-29 14:11:20 +00:00
|
|
|
*self = Playing {
|
2020-01-31 21:41:11 +00:00
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
decoder,
|
|
|
|
normalisation_factor,
|
|
|
|
stream_loader_controller,
|
|
|
|
duration_ms,
|
|
|
|
bytes_per_second,
|
2020-02-02 00:07:05 +00:00
|
|
|
stream_position_pcm,
|
2020-01-31 21:41:11 +00:00
|
|
|
reported_nominal_start_time: None,
|
|
|
|
suggested_to_preload_next_track,
|
2017-01-29 14:11:20 +00:00
|
|
|
};
|
|
|
|
}
|
|
|
|
_ => panic!("invalid state"),
|
|
|
|
}
|
|
|
|
}
|
2016-09-08 18:49:17 +00:00
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
fn playing_to_paused(&mut self) {
|
|
|
|
use self::PlayerState::*;
|
|
|
|
match ::std::mem::replace(self, Invalid) {
|
2018-02-26 01:50:41 +00:00
|
|
|
Playing {
|
|
|
|
track_id,
|
2020-01-31 21:41:11 +00:00
|
|
|
play_request_id,
|
2018-02-26 01:50:41 +00:00
|
|
|
decoder,
|
|
|
|
normalisation_factor,
|
2019-11-01 19:46:28 +00:00
|
|
|
stream_loader_controller,
|
2020-01-31 21:41:11 +00:00
|
|
|
duration_ms,
|
2019-11-07 13:02:53 +00:00
|
|
|
bytes_per_second,
|
2020-02-02 00:07:05 +00:00
|
|
|
stream_position_pcm,
|
2020-01-31 21:41:11 +00:00
|
|
|
reported_nominal_start_time: _,
|
|
|
|
suggested_to_preload_next_track,
|
2018-02-26 01:50:41 +00:00
|
|
|
} => {
|
2017-01-29 14:11:20 +00:00
|
|
|
*self = Paused {
|
2020-01-31 21:41:11 +00:00
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
decoder,
|
|
|
|
normalisation_factor,
|
|
|
|
stream_loader_controller,
|
|
|
|
duration_ms,
|
|
|
|
bytes_per_second,
|
2020-02-02 00:07:05 +00:00
|
|
|
stream_position_pcm,
|
2020-01-31 21:41:11 +00:00
|
|
|
suggested_to_preload_next_track,
|
2017-01-29 14:11:20 +00:00
|
|
|
};
|
|
|
|
}
|
|
|
|
_ => panic!("invalid state"),
|
|
|
|
}
|
|
|
|
}
|
2016-09-08 18:49:17 +00:00
|
|
|
}
|
|
|
|
|
2020-01-31 21:41:11 +00:00
|
|
|
struct PlayerTrackLoader {
|
|
|
|
session: Session,
|
|
|
|
config: PlayerConfig,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl PlayerTrackLoader {
|
2021-01-21 21:22:32 +00:00
|
|
|
async fn find_available_alternative<'a>(
|
|
|
|
&self,
|
|
|
|
audio: &'a AudioItem,
|
|
|
|
) -> Option<Cow<'a, AudioItem>> {
|
2020-01-31 21:41:11 +00:00
|
|
|
if audio.available {
|
|
|
|
Some(Cow::Borrowed(audio))
|
2021-01-21 21:22:32 +00:00
|
|
|
} else if let Some(alternatives) = &audio.alternatives {
|
|
|
|
let alternatives = alternatives
|
|
|
|
.iter()
|
|
|
|
.map(|alt_id| AudioItem::get_audio_item(&self.session, *alt_id));
|
|
|
|
let alternatives = future::try_join_all(alternatives).await.unwrap();
|
|
|
|
alternatives
|
|
|
|
.into_iter()
|
|
|
|
.find(|alt| alt.available)
|
|
|
|
.map(Cow::Owned)
|
2020-01-31 21:41:11 +00:00
|
|
|
} else {
|
2021-01-21 21:22:32 +00:00
|
|
|
None
|
2020-01-31 21:41:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn stream_data_rate(&self, format: FileFormat) -> usize {
|
|
|
|
match format {
|
|
|
|
FileFormat::OGG_VORBIS_96 => 12 * 1024,
|
|
|
|
FileFormat::OGG_VORBIS_160 => 20 * 1024,
|
|
|
|
FileFormat::OGG_VORBIS_320 => 40 * 1024,
|
|
|
|
FileFormat::MP3_256 => 32 * 1024,
|
|
|
|
FileFormat::MP3_320 => 40 * 1024,
|
|
|
|
FileFormat::MP3_160 => 20 * 1024,
|
|
|
|
FileFormat::MP3_96 => 12 * 1024,
|
|
|
|
FileFormat::MP3_160_ENC => 20 * 1024,
|
|
|
|
FileFormat::MP4_128_DUAL => 16 * 1024,
|
|
|
|
FileFormat::OTHER3 => 40 * 1024, // better some high guess than nothing
|
|
|
|
FileFormat::AAC_160 => 20 * 1024,
|
|
|
|
FileFormat::AAC_320 => 40 * 1024,
|
|
|
|
FileFormat::MP4_128 => 16 * 1024,
|
|
|
|
FileFormat::OTHER5 => 40 * 1024, // better some high guess than nothing
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-01-21 21:22:32 +00:00
|
|
|
async fn load_track(
|
|
|
|
&self,
|
|
|
|
spotify_id: SpotifyId,
|
|
|
|
position_ms: u32,
|
|
|
|
) -> Option<PlayerLoadedTrackData> {
|
|
|
|
let audio = match AudioItem::get_audio_item(&self.session, spotify_id).await {
|
2020-01-31 21:41:11 +00:00
|
|
|
Ok(audio) => audio,
|
|
|
|
Err(_) => {
|
|
|
|
error!("Unable to load audio item.");
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
info!("Loading <{}> with Spotify URI <{}>", audio.name, audio.uri);
|
|
|
|
|
2021-01-21 21:22:32 +00:00
|
|
|
let audio = match self.find_available_alternative(&audio).await {
|
2020-01-31 21:41:11 +00:00
|
|
|
Some(audio) => audio,
|
|
|
|
None => {
|
|
|
|
warn!("<{}> is not available", audio.uri);
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
assert!(audio.duration >= 0);
|
|
|
|
let duration_ms = audio.duration as u32;
|
|
|
|
|
|
|
|
// (Most) podcasts seem to support only 96 bit Vorbis, so fall back to it
|
|
|
|
let formats = match self.config.bitrate {
|
|
|
|
Bitrate::Bitrate96 => [
|
|
|
|
FileFormat::OGG_VORBIS_96,
|
|
|
|
FileFormat::OGG_VORBIS_160,
|
|
|
|
FileFormat::OGG_VORBIS_320,
|
|
|
|
],
|
|
|
|
Bitrate::Bitrate160 => [
|
|
|
|
FileFormat::OGG_VORBIS_160,
|
|
|
|
FileFormat::OGG_VORBIS_96,
|
|
|
|
FileFormat::OGG_VORBIS_320,
|
|
|
|
],
|
|
|
|
Bitrate::Bitrate320 => [
|
|
|
|
FileFormat::OGG_VORBIS_320,
|
|
|
|
FileFormat::OGG_VORBIS_160,
|
|
|
|
FileFormat::OGG_VORBIS_96,
|
|
|
|
],
|
|
|
|
};
|
|
|
|
let format = formats
|
|
|
|
.iter()
|
|
|
|
.find(|format| audio.files.contains_key(format))
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
let file_id = match audio.files.get(&format) {
|
|
|
|
Some(&file_id) => file_id,
|
|
|
|
None => {
|
|
|
|
warn!("<{}> in not available in format {:?}", audio.name, format);
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
let bytes_per_second = self.stream_data_rate(*format);
|
2020-02-02 00:07:05 +00:00
|
|
|
let play_from_beginning = position_ms == 0;
|
2020-01-31 21:41:11 +00:00
|
|
|
|
|
|
|
let key = self.session.audio_key().request(spotify_id, file_id);
|
|
|
|
let encrypted_file = AudioFile::open(
|
|
|
|
&self.session,
|
|
|
|
file_id,
|
|
|
|
bytes_per_second,
|
|
|
|
play_from_beginning,
|
|
|
|
);
|
|
|
|
|
2021-01-21 21:22:32 +00:00
|
|
|
let encrypted_file = match encrypted_file.await {
|
2020-01-31 21:41:11 +00:00
|
|
|
Ok(encrypted_file) => encrypted_file,
|
|
|
|
Err(_) => {
|
|
|
|
error!("Unable to load encrypted file.");
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
let mut stream_loader_controller = encrypted_file.get_stream_loader_controller();
|
|
|
|
|
|
|
|
if play_from_beginning {
|
|
|
|
// No need to seek -> we stream from the beginning
|
|
|
|
stream_loader_controller.set_stream_mode();
|
|
|
|
} else {
|
|
|
|
// we need to seek -> we set stream mode after the initial seek.
|
|
|
|
stream_loader_controller.set_random_access_mode();
|
|
|
|
}
|
|
|
|
|
2021-01-21 21:22:32 +00:00
|
|
|
let key = match key.await {
|
2020-01-31 21:41:11 +00:00
|
|
|
Ok(key) => key,
|
|
|
|
Err(_) => {
|
|
|
|
error!("Unable to load decryption key");
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
let mut decrypted_file = AudioDecrypt::new(key, encrypted_file);
|
|
|
|
|
|
|
|
let normalisation_factor = match NormalisationData::parse_from_file(&mut decrypted_file) {
|
|
|
|
Ok(normalisation_data) => {
|
|
|
|
NormalisationData::get_factor(&self.config, normalisation_data)
|
|
|
|
}
|
|
|
|
Err(_) => {
|
|
|
|
warn!("Unable to extract normalisation data, using default value.");
|
|
|
|
1.0 as f32
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
let audio_file = Subfile::new(decrypted_file, 0xa7);
|
|
|
|
|
|
|
|
let mut decoder = VorbisDecoder::new(audio_file).unwrap();
|
|
|
|
|
2020-02-02 00:07:05 +00:00
|
|
|
if position_ms != 0 {
|
|
|
|
match decoder.seek(position_ms as i64) {
|
2020-01-31 21:41:11 +00:00
|
|
|
Ok(_) => (),
|
|
|
|
Err(err) => error!("Vorbis error: {:?}", err),
|
|
|
|
}
|
|
|
|
stream_loader_controller.set_stream_mode();
|
|
|
|
}
|
2020-02-02 00:07:05 +00:00
|
|
|
let stream_position_pcm = PlayerInternal::position_ms_to_pcm(position_ms);
|
2020-01-31 21:41:11 +00:00
|
|
|
info!("<{}> ({} ms) loaded", audio.name, audio.duration);
|
|
|
|
Some(PlayerLoadedTrackData {
|
|
|
|
decoder,
|
|
|
|
normalisation_factor,
|
|
|
|
stream_loader_controller,
|
|
|
|
bytes_per_second,
|
|
|
|
duration_ms,
|
2020-02-02 00:07:05 +00:00
|
|
|
stream_position_pcm,
|
2020-01-31 21:41:11 +00:00
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Future for PlayerInternal {
|
2021-01-21 21:22:32 +00:00
|
|
|
type Output = ();
|
2020-01-31 21:41:11 +00:00
|
|
|
|
2021-01-21 21:22:32 +00:00
|
|
|
fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<()> {
|
2020-02-03 07:58:44 +00:00
|
|
|
// While this is written as a future, it still contains blocking code.
|
|
|
|
// It must be run on its own thread.
|
|
|
|
|
2020-01-31 21:41:11 +00:00
|
|
|
loop {
|
|
|
|
let mut all_futures_completed_or_not_ready = true;
|
|
|
|
|
|
|
|
// process commands that were sent to us
|
2021-01-21 21:22:32 +00:00
|
|
|
let cmd = match Pin::new(&mut self.commands).poll_next(cx) {
|
|
|
|
Poll::Ready(None) => return Poll::Ready(()), // client has disconnected - shut down.
|
|
|
|
Poll::Ready(Some(cmd)) => {
|
2020-01-31 21:41:11 +00:00
|
|
|
all_futures_completed_or_not_ready = false;
|
|
|
|
Some(cmd)
|
2017-01-31 08:21:30 +00:00
|
|
|
}
|
2021-01-21 21:22:32 +00:00
|
|
|
_ => None,
|
2015-12-28 17:45:13 +00:00
|
|
|
};
|
|
|
|
|
2017-01-29 14:11:20 +00:00
|
|
|
if let Some(cmd) = cmd {
|
|
|
|
self.handle_command(cmd);
|
|
|
|
}
|
2016-05-04 08:11:03 +00:00
|
|
|
|
2020-01-31 21:41:11 +00:00
|
|
|
// Handle loading of a new track to play
|
|
|
|
if let PlayerState::Loading {
|
|
|
|
ref mut loader,
|
|
|
|
track_id,
|
|
|
|
start_playback,
|
|
|
|
play_request_id,
|
|
|
|
} = self.state
|
|
|
|
{
|
2021-01-21 21:22:32 +00:00
|
|
|
match loader.as_mut().poll(cx) {
|
|
|
|
Poll::Ready(Ok(loaded_track)) => {
|
2020-01-31 21:41:11 +00:00
|
|
|
self.start_playback(
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
loaded_track,
|
|
|
|
start_playback,
|
|
|
|
);
|
|
|
|
if let PlayerState::Loading { .. } = self.state {
|
|
|
|
panic!("The state wasn't changed by start_playback()");
|
|
|
|
}
|
|
|
|
}
|
2021-01-21 21:22:32 +00:00
|
|
|
Poll::Ready(Err(_)) => {
|
2020-05-13 09:49:26 +00:00
|
|
|
warn!("Unable to load <{:?}>\nSkipping to next track", track_id);
|
2020-05-09 11:59:28 +00:00
|
|
|
assert!(self.state.is_loading());
|
|
|
|
self.send_event(PlayerEvent::EndOfTrack {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
})
|
2020-01-31 21:41:11 +00:00
|
|
|
}
|
2021-01-21 21:22:32 +00:00
|
|
|
Poll::Pending => (),
|
2020-01-31 21:41:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// handle pending preload requests.
|
|
|
|
if let PlayerPreload::Loading {
|
|
|
|
ref mut loader,
|
|
|
|
track_id,
|
|
|
|
} = self.preload
|
|
|
|
{
|
2021-01-21 21:22:32 +00:00
|
|
|
match loader.as_mut().poll(cx) {
|
|
|
|
Poll::Ready(Ok(loaded_track)) => {
|
2020-12-10 21:17:41 +00:00
|
|
|
self.send_event(PlayerEvent::Preloading { track_id });
|
2020-01-31 21:41:11 +00:00
|
|
|
self.preload = PlayerPreload::Ready {
|
|
|
|
track_id,
|
|
|
|
loaded_track,
|
|
|
|
};
|
|
|
|
}
|
2021-01-21 21:22:32 +00:00
|
|
|
Poll::Ready(Err(_)) => {
|
2020-05-13 09:49:26 +00:00
|
|
|
debug!("Unable to preload {:?}", track_id);
|
|
|
|
self.preload = PlayerPreload::None;
|
|
|
|
// Let Spirc know that the track was unavailable.
|
2020-05-10 12:31:43 +00:00
|
|
|
if let PlayerState::Playing {
|
|
|
|
play_request_id, ..
|
|
|
|
}
|
|
|
|
| PlayerState::Paused {
|
|
|
|
play_request_id, ..
|
|
|
|
} = self.state
|
|
|
|
{
|
2020-05-13 09:49:26 +00:00
|
|
|
self.send_event(PlayerEvent::Unavailable {
|
2020-05-10 12:31:43 +00:00
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
});
|
|
|
|
}
|
2020-01-31 21:41:11 +00:00
|
|
|
}
|
2021-01-21 21:22:32 +00:00
|
|
|
Poll::Pending => (),
|
2020-01-31 21:41:11 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-02-02 23:11:27 +00:00
|
|
|
if self.state.is_playing() {
|
|
|
|
self.ensure_sink_running();
|
2018-02-23 19:08:20 +00:00
|
|
|
|
2020-02-03 07:58:44 +00:00
|
|
|
if let PlayerState::Playing {
|
2020-01-31 21:41:11 +00:00
|
|
|
track_id,
|
|
|
|
play_request_id,
|
2018-02-26 01:50:41 +00:00
|
|
|
ref mut decoder,
|
|
|
|
normalisation_factor,
|
2020-02-02 00:07:05 +00:00
|
|
|
ref mut stream_position_pcm,
|
2020-01-31 21:41:11 +00:00
|
|
|
ref mut reported_nominal_start_time,
|
|
|
|
duration_ms,
|
2018-02-26 01:50:41 +00:00
|
|
|
..
|
|
|
|
} = self.state
|
|
|
|
{
|
2020-01-31 21:41:11 +00:00
|
|
|
let packet = decoder.next_packet().expect("Vorbis error");
|
|
|
|
|
|
|
|
if let Some(ref packet) = packet {
|
2021-01-21 21:22:32 +00:00
|
|
|
*stream_position_pcm += (packet.data().len() / 2) as u64;
|
2020-02-02 00:07:05 +00:00
|
|
|
let stream_position_millis = Self::position_pcm_to_ms(*stream_position_pcm);
|
|
|
|
|
2020-01-31 21:41:11 +00:00
|
|
|
let notify_about_position = match *reported_nominal_start_time {
|
|
|
|
None => true,
|
|
|
|
Some(reported_nominal_start_time) => {
|
|
|
|
// only notify if we're behind. If we're ahead it's probably due to a buffer of the backend and we;re actually in time.
|
|
|
|
let lag = (Instant::now() - reported_nominal_start_time).as_millis()
|
|
|
|
as i64
|
|
|
|
- stream_position_millis as i64;
|
2021-01-21 21:22:32 +00:00
|
|
|
lag > 1000
|
2020-01-31 21:41:11 +00:00
|
|
|
}
|
|
|
|
};
|
|
|
|
if notify_about_position {
|
|
|
|
*reported_nominal_start_time = Some(
|
|
|
|
Instant::now()
|
|
|
|
- Duration::from_millis(stream_position_millis as u64),
|
|
|
|
);
|
|
|
|
self.send_event(PlayerEvent::Playing {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
position_ms: stream_position_millis as u32,
|
|
|
|
duration_ms,
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-02-03 07:58:44 +00:00
|
|
|
self.handle_packet(packet, normalisation_factor);
|
2017-11-28 23:18:12 +00:00
|
|
|
} else {
|
2020-02-03 07:58:44 +00:00
|
|
|
unreachable!();
|
2017-11-28 23:18:12 +00:00
|
|
|
};
|
2017-01-29 14:11:20 +00:00
|
|
|
}
|
2018-04-21 15:46:29 +00:00
|
|
|
|
2020-01-31 21:41:11 +00:00
|
|
|
if let PlayerState::Playing {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
duration_ms,
|
2020-02-02 00:07:05 +00:00
|
|
|
stream_position_pcm,
|
2020-01-31 21:41:11 +00:00
|
|
|
ref mut stream_loader_controller,
|
|
|
|
ref mut suggested_to_preload_next_track,
|
|
|
|
..
|
|
|
|
}
|
|
|
|
| PlayerState::Paused {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
duration_ms,
|
2020-02-02 00:07:05 +00:00
|
|
|
stream_position_pcm,
|
2020-01-31 21:41:11 +00:00
|
|
|
ref mut stream_loader_controller,
|
|
|
|
ref mut suggested_to_preload_next_track,
|
|
|
|
..
|
|
|
|
} = self.state
|
|
|
|
{
|
|
|
|
if (!*suggested_to_preload_next_track)
|
2020-02-03 07:58:44 +00:00
|
|
|
&& ((duration_ms as i64 - Self::position_pcm_to_ms(stream_position_pcm) as i64)
|
2020-01-31 21:41:11 +00:00
|
|
|
< PRELOAD_NEXT_TRACK_BEFORE_END_DURATION_MS as i64)
|
|
|
|
&& stream_loader_controller.range_to_end_available()
|
|
|
|
{
|
|
|
|
*suggested_to_preload_next_track = true;
|
|
|
|
self.send_event(PlayerEvent::TimeToPreloadNextTrack {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-04-21 15:46:29 +00:00
|
|
|
if self.session.is_invalid() {
|
2021-01-21 21:22:32 +00:00
|
|
|
return Poll::Ready(());
|
2020-01-31 21:41:11 +00:00
|
|
|
}
|
|
|
|
|
2020-02-03 07:58:44 +00:00
|
|
|
if (!self.state.is_playing()) && all_futures_completed_or_not_ready {
|
2021-01-21 21:22:32 +00:00
|
|
|
return Poll::Pending;
|
2018-04-21 15:46:29 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
}
|
|
|
|
}
|
2020-01-31 21:41:11 +00:00
|
|
|
}
|
2016-01-02 15:19:39 +00:00
|
|
|
|
2020-01-31 21:41:11 +00:00
|
|
|
impl PlayerInternal {
|
2020-02-02 00:07:05 +00:00
|
|
|
fn position_pcm_to_ms(position_pcm: u64) -> u32 {
|
|
|
|
(position_pcm * 10 / 441) as u32
|
|
|
|
}
|
|
|
|
|
|
|
|
fn position_ms_to_pcm(position_ms: u32) -> u64 {
|
|
|
|
position_ms as u64 * 441 / 10
|
|
|
|
}
|
|
|
|
|
2020-02-02 23:11:27 +00:00
|
|
|
fn ensure_sink_running(&mut self) {
|
2020-03-10 12:26:01 +00:00
|
|
|
if self.sink_status != SinkStatus::Running {
|
2020-02-02 23:11:27 +00:00
|
|
|
trace!("== Starting sink ==");
|
2020-03-10 12:26:01 +00:00
|
|
|
if let Some(callback) = &mut self.sink_event_callback {
|
|
|
|
callback(SinkStatus::Running);
|
|
|
|
}
|
2020-02-02 23:11:27 +00:00
|
|
|
match self.sink.start() {
|
2020-03-10 12:26:01 +00:00
|
|
|
Ok(()) => self.sink_status = SinkStatus::Running,
|
2020-02-02 23:11:27 +00:00
|
|
|
Err(err) => error!("Could not start audio: {}", err),
|
|
|
|
}
|
2017-11-28 23:18:12 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-03-10 12:26:01 +00:00
|
|
|
fn ensure_sink_stopped(&mut self, temporarily: bool) {
|
|
|
|
match self.sink_status {
|
|
|
|
SinkStatus::Running => {
|
|
|
|
trace!("== Stopping sink ==");
|
|
|
|
self.sink.stop().unwrap();
|
|
|
|
self.sink_status = if temporarily {
|
|
|
|
SinkStatus::TemporarilyClosed
|
|
|
|
} else {
|
|
|
|
SinkStatus::Closed
|
|
|
|
};
|
|
|
|
if let Some(callback) = &mut self.sink_event_callback {
|
|
|
|
callback(self.sink_status);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
SinkStatus::TemporarilyClosed => {
|
|
|
|
if !temporarily {
|
|
|
|
self.sink_status = SinkStatus::Closed;
|
|
|
|
if let Some(callback) = &mut self.sink_event_callback {
|
|
|
|
callback(SinkStatus::Closed);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
SinkStatus::Closed => (),
|
2017-11-28 23:18:12 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-31 21:41:11 +00:00
|
|
|
fn handle_player_stop(&mut self) {
|
|
|
|
match self.state {
|
|
|
|
PlayerState::Playing {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
..
|
|
|
|
}
|
|
|
|
| PlayerState::Paused {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
..
|
|
|
|
}
|
|
|
|
| PlayerState::EndOfTrack {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
2020-02-02 14:37:17 +00:00
|
|
|
..
|
2020-01-31 21:41:11 +00:00
|
|
|
}
|
|
|
|
| PlayerState::Loading {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
..
|
|
|
|
} => {
|
2020-03-10 12:26:01 +00:00
|
|
|
self.ensure_sink_stopped(false);
|
2020-01-31 21:41:11 +00:00
|
|
|
self.send_event(PlayerEvent::Stopped {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
});
|
|
|
|
self.state = PlayerState::Stopped;
|
|
|
|
}
|
|
|
|
PlayerState::Stopped => (),
|
|
|
|
PlayerState::Invalid => panic!("invalid state"),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-02-02 14:37:17 +00:00
|
|
|
fn handle_play(&mut self) {
|
|
|
|
if let PlayerState::Paused {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
stream_position_pcm,
|
2020-02-03 07:58:44 +00:00
|
|
|
duration_ms,
|
2020-02-02 14:37:17 +00:00
|
|
|
..
|
|
|
|
} = self.state
|
|
|
|
{
|
|
|
|
self.state.paused_to_playing();
|
|
|
|
|
|
|
|
let position_ms = Self::position_pcm_to_ms(stream_position_pcm);
|
2020-02-03 07:58:44 +00:00
|
|
|
self.send_event(PlayerEvent::Playing {
|
2020-02-02 14:37:17 +00:00
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
position_ms,
|
2020-02-03 07:58:44 +00:00
|
|
|
duration_ms,
|
2020-02-02 14:37:17 +00:00
|
|
|
});
|
2020-02-02 23:11:27 +00:00
|
|
|
self.ensure_sink_running();
|
2020-02-02 14:37:17 +00:00
|
|
|
} else {
|
|
|
|
warn!("Player::play called from invalid state");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn handle_pause(&mut self) {
|
|
|
|
if let PlayerState::Playing {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
stream_position_pcm,
|
|
|
|
duration_ms,
|
|
|
|
..
|
|
|
|
} = self.state
|
|
|
|
{
|
|
|
|
self.state.playing_to_paused();
|
|
|
|
|
2020-03-10 12:26:01 +00:00
|
|
|
self.ensure_sink_stopped(false);
|
2020-02-02 14:37:17 +00:00
|
|
|
let position_ms = Self::position_pcm_to_ms(stream_position_pcm);
|
|
|
|
self.send_event(PlayerEvent::Paused {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
position_ms,
|
|
|
|
duration_ms,
|
|
|
|
});
|
|
|
|
} else {
|
|
|
|
warn!("Player::pause called from invalid state");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-02-23 19:08:20 +00:00
|
|
|
fn handle_packet(&mut self, packet: Option<VorbisPacket>, normalisation_factor: f32) {
|
2017-01-29 14:11:20 +00:00
|
|
|
match packet {
|
2017-08-03 20:22:08 +00:00
|
|
|
Some(mut packet) => {
|
2018-03-20 13:01:15 +00:00
|
|
|
if packet.data().len() > 0 {
|
|
|
|
if let Some(ref editor) = self.audio_filter {
|
|
|
|
editor.modify_stream(&mut packet.data_mut())
|
|
|
|
};
|
|
|
|
|
2021-01-21 21:22:32 +00:00
|
|
|
if self.config.normalisation
|
|
|
|
&& (normalisation_factor - 1.0).abs() < f32::EPSILON
|
|
|
|
{
|
2018-03-20 13:01:15 +00:00
|
|
|
for x in packet.data_mut().iter_mut() {
|
|
|
|
*x = (*x as f32 * normalisation_factor) as i16;
|
|
|
|
}
|
2018-02-23 19:08:20 +00:00
|
|
|
}
|
|
|
|
|
2018-03-20 13:01:15 +00:00
|
|
|
if let Err(err) = self.sink.write(&packet.data()) {
|
|
|
|
error!("Could not write audio: {}", err);
|
2020-03-10 12:26:01 +00:00
|
|
|
self.ensure_sink_stopped(false);
|
2018-03-20 13:01:15 +00:00
|
|
|
}
|
2017-11-28 23:18:12 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
None => {
|
2018-02-20 20:58:02 +00:00
|
|
|
self.state.playing_to_end_of_track();
|
2020-01-31 21:41:11 +00:00
|
|
|
if let PlayerState::EndOfTrack {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
2020-02-02 14:37:17 +00:00
|
|
|
..
|
2020-01-31 21:41:11 +00:00
|
|
|
} = self.state
|
|
|
|
{
|
|
|
|
self.send_event(PlayerEvent::EndOfTrack {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
})
|
|
|
|
} else {
|
|
|
|
unreachable!();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn start_playback(
|
|
|
|
&mut self,
|
|
|
|
track_id: SpotifyId,
|
|
|
|
play_request_id: u64,
|
|
|
|
loaded_track: PlayerLoadedTrackData,
|
|
|
|
start_playback: bool,
|
|
|
|
) {
|
2020-02-02 00:07:05 +00:00
|
|
|
let position_ms = Self::position_pcm_to_ms(loaded_track.stream_position_pcm);
|
2020-01-31 21:41:11 +00:00
|
|
|
|
|
|
|
if start_playback {
|
2020-02-02 23:11:27 +00:00
|
|
|
self.ensure_sink_running();
|
2020-01-31 21:41:11 +00:00
|
|
|
|
|
|
|
self.send_event(PlayerEvent::Playing {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
position_ms,
|
|
|
|
duration_ms: loaded_track.duration_ms,
|
|
|
|
});
|
|
|
|
|
|
|
|
self.state = PlayerState::Playing {
|
|
|
|
track_id: track_id,
|
|
|
|
play_request_id: play_request_id,
|
|
|
|
decoder: loaded_track.decoder,
|
|
|
|
normalisation_factor: loaded_track.normalisation_factor,
|
|
|
|
stream_loader_controller: loaded_track.stream_loader_controller,
|
|
|
|
duration_ms: loaded_track.duration_ms,
|
|
|
|
bytes_per_second: loaded_track.bytes_per_second,
|
2020-02-02 00:07:05 +00:00
|
|
|
stream_position_pcm: loaded_track.stream_position_pcm,
|
2020-01-31 21:41:11 +00:00
|
|
|
reported_nominal_start_time: Some(
|
|
|
|
Instant::now() - Duration::from_millis(position_ms as u64),
|
|
|
|
),
|
|
|
|
suggested_to_preload_next_track: false,
|
|
|
|
};
|
|
|
|
} else {
|
2020-03-10 12:26:01 +00:00
|
|
|
self.ensure_sink_stopped(false);
|
2020-02-03 07:58:44 +00:00
|
|
|
|
2020-01-31 21:41:11 +00:00
|
|
|
self.state = PlayerState::Paused {
|
|
|
|
track_id: track_id,
|
|
|
|
play_request_id: play_request_id,
|
|
|
|
decoder: loaded_track.decoder,
|
|
|
|
normalisation_factor: loaded_track.normalisation_factor,
|
|
|
|
stream_loader_controller: loaded_track.stream_loader_controller,
|
|
|
|
duration_ms: loaded_track.duration_ms,
|
|
|
|
bytes_per_second: loaded_track.bytes_per_second,
|
2020-02-02 00:07:05 +00:00
|
|
|
stream_position_pcm: loaded_track.stream_position_pcm,
|
2020-01-31 21:41:11 +00:00
|
|
|
suggested_to_preload_next_track: false,
|
|
|
|
};
|
|
|
|
|
|
|
|
self.send_event(PlayerEvent::Paused {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
position_ms,
|
|
|
|
duration_ms: loaded_track.duration_ms,
|
|
|
|
});
|
2017-01-29 14:11:20 +00:00
|
|
|
}
|
|
|
|
}
|
2015-07-02 19:42:49 +00:00
|
|
|
|
2020-02-03 07:58:44 +00:00
|
|
|
fn handle_command_load(
|
|
|
|
&mut self,
|
|
|
|
track_id: SpotifyId,
|
|
|
|
play_request_id: u64,
|
|
|
|
play: bool,
|
|
|
|
position_ms: u32,
|
|
|
|
) {
|
2020-03-10 12:00:57 +00:00
|
|
|
if !self.config.gapless {
|
2020-03-10 12:53:58 +00:00
|
|
|
self.ensure_sink_stopped(play);
|
2020-03-10 12:00:57 +00:00
|
|
|
}
|
2020-02-03 07:58:44 +00:00
|
|
|
// emit the correct player event
|
|
|
|
match self.state {
|
|
|
|
PlayerState::Playing {
|
|
|
|
track_id: old_track_id,
|
|
|
|
..
|
|
|
|
}
|
|
|
|
| PlayerState::Paused {
|
|
|
|
track_id: old_track_id,
|
|
|
|
..
|
|
|
|
}
|
|
|
|
| PlayerState::EndOfTrack {
|
|
|
|
track_id: old_track_id,
|
|
|
|
..
|
|
|
|
}
|
|
|
|
| PlayerState::Loading {
|
|
|
|
track_id: old_track_id,
|
|
|
|
..
|
|
|
|
} => self.send_event(PlayerEvent::Changed {
|
|
|
|
old_track_id: old_track_id,
|
|
|
|
new_track_id: track_id,
|
|
|
|
}),
|
|
|
|
PlayerState::Stopped => self.send_event(PlayerEvent::Started {
|
2020-01-31 21:41:11 +00:00
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
position_ms,
|
2020-02-03 07:58:44 +00:00
|
|
|
}),
|
|
|
|
PlayerState::Invalid { .. } => panic!("Player is in an invalid state."),
|
|
|
|
}
|
2018-02-15 23:16:38 +00:00
|
|
|
|
2020-02-03 07:58:44 +00:00
|
|
|
// Now we check at different positions whether we already have a pre-loaded version
|
|
|
|
// of this track somewhere. If so, use it and return.
|
2020-02-02 14:37:17 +00:00
|
|
|
|
2020-02-03 07:58:44 +00:00
|
|
|
// Check if there's a matching loaded track in the EndOfTrack player state.
|
|
|
|
// This is the case if we're repeating the same track again.
|
|
|
|
if let PlayerState::EndOfTrack {
|
|
|
|
track_id: previous_track_id,
|
|
|
|
..
|
|
|
|
} = self.state
|
|
|
|
{
|
|
|
|
if previous_track_id == track_id {
|
2020-03-12 12:01:45 +00:00
|
|
|
let mut loaded_track = match mem::replace(&mut self.state, PlayerState::Invalid) {
|
|
|
|
PlayerState::EndOfTrack { loaded_track, .. } => loaded_track,
|
|
|
|
_ => unreachable!(),
|
|
|
|
};
|
|
|
|
|
|
|
|
if Self::position_ms_to_pcm(position_ms) != loaded_track.stream_position_pcm {
|
|
|
|
loaded_track
|
|
|
|
.stream_loader_controller
|
|
|
|
.set_random_access_mode();
|
|
|
|
let _ = loaded_track.decoder.seek(position_ms as i64); // This may be blocking.
|
|
|
|
// But most likely the track is fully
|
|
|
|
// loaded already because we played
|
|
|
|
// to the end of it.
|
|
|
|
loaded_track.stream_loader_controller.set_stream_mode();
|
|
|
|
loaded_track.stream_position_pcm = Self::position_ms_to_pcm(position_ms);
|
|
|
|
}
|
|
|
|
self.preload = PlayerPreload::None;
|
2020-03-20 06:31:18 +00:00
|
|
|
self.start_playback(track_id, play_request_id, loaded_track, play);
|
2020-03-12 12:01:45 +00:00
|
|
|
if let PlayerState::Invalid = self.state {
|
|
|
|
panic!("start_playback() hasn't set a valid player state.");
|
2020-02-03 07:58:44 +00:00
|
|
|
}
|
2020-03-12 12:01:45 +00:00
|
|
|
return;
|
2020-02-03 07:58:44 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check if we are already playing the track. If so, just do a seek and update our info.
|
|
|
|
if let PlayerState::Playing {
|
|
|
|
track_id: current_track_id,
|
|
|
|
ref mut stream_position_pcm,
|
|
|
|
ref mut decoder,
|
|
|
|
ref mut stream_loader_controller,
|
|
|
|
..
|
|
|
|
}
|
|
|
|
| PlayerState::Paused {
|
|
|
|
track_id: current_track_id,
|
|
|
|
ref mut stream_position_pcm,
|
|
|
|
ref mut decoder,
|
|
|
|
ref mut stream_loader_controller,
|
|
|
|
..
|
|
|
|
} = self.state
|
|
|
|
{
|
|
|
|
if current_track_id == track_id {
|
|
|
|
// we can use the current decoder. Ensure it's at the correct position.
|
|
|
|
if Self::position_ms_to_pcm(position_ms) != *stream_position_pcm {
|
|
|
|
stream_loader_controller.set_random_access_mode();
|
|
|
|
let _ = decoder.seek(position_ms as i64); // This may be blocking.
|
|
|
|
stream_loader_controller.set_stream_mode();
|
|
|
|
*stream_position_pcm = Self::position_ms_to_pcm(position_ms);
|
2020-01-31 21:41:11 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2020-02-03 07:58:44 +00:00
|
|
|
// Move the info from the current state into a PlayerLoadedTrackData so we can use
|
|
|
|
// the usual code path to start playback.
|
|
|
|
let old_state = mem::replace(&mut self.state, PlayerState::Invalid);
|
|
|
|
|
2020-02-02 14:37:17 +00:00
|
|
|
if let PlayerState::Playing {
|
2020-02-03 07:58:44 +00:00
|
|
|
stream_position_pcm,
|
|
|
|
decoder,
|
|
|
|
stream_loader_controller,
|
|
|
|
bytes_per_second,
|
|
|
|
duration_ms,
|
|
|
|
normalisation_factor,
|
2020-02-02 14:37:17 +00:00
|
|
|
..
|
|
|
|
}
|
|
|
|
| PlayerState::Paused {
|
2020-02-03 07:58:44 +00:00
|
|
|
stream_position_pcm,
|
|
|
|
decoder,
|
|
|
|
stream_loader_controller,
|
|
|
|
bytes_per_second,
|
|
|
|
duration_ms,
|
|
|
|
normalisation_factor,
|
2020-02-02 14:37:17 +00:00
|
|
|
..
|
2020-02-03 07:58:44 +00:00
|
|
|
} = old_state
|
2020-02-02 14:37:17 +00:00
|
|
|
{
|
2020-02-03 07:58:44 +00:00
|
|
|
let loaded_track = PlayerLoadedTrackData {
|
|
|
|
decoder,
|
|
|
|
normalisation_factor,
|
|
|
|
stream_loader_controller,
|
|
|
|
bytes_per_second,
|
|
|
|
duration_ms,
|
|
|
|
stream_position_pcm,
|
|
|
|
};
|
2020-02-03 03:31:15 +00:00
|
|
|
|
2020-02-07 12:52:20 +00:00
|
|
|
self.preload = PlayerPreload::None;
|
2020-02-03 07:58:44 +00:00
|
|
|
self.start_playback(track_id, play_request_id, loaded_track, play);
|
2020-02-03 03:31:15 +00:00
|
|
|
|
2020-02-03 07:58:44 +00:00
|
|
|
if let PlayerState::Invalid = self.state {
|
|
|
|
panic!("start_playback() hasn't set a valid player state.");
|
|
|
|
}
|
2020-02-03 03:31:15 +00:00
|
|
|
|
2020-02-03 07:58:44 +00:00
|
|
|
return;
|
|
|
|
} else {
|
|
|
|
unreachable!();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-02-03 03:31:15 +00:00
|
|
|
|
2020-02-03 07:58:44 +00:00
|
|
|
// Check if the requested track has been preloaded already. If so use the preloaded data.
|
|
|
|
if let PlayerPreload::Ready {
|
|
|
|
track_id: loaded_track_id,
|
|
|
|
..
|
|
|
|
} = self.preload
|
|
|
|
{
|
|
|
|
if track_id == loaded_track_id {
|
|
|
|
let preload = std::mem::replace(&mut self.preload, PlayerPreload::None);
|
|
|
|
if let PlayerPreload::Ready {
|
|
|
|
track_id,
|
|
|
|
mut loaded_track,
|
|
|
|
} = preload
|
|
|
|
{
|
|
|
|
if Self::position_ms_to_pcm(position_ms) != loaded_track.stream_position_pcm {
|
|
|
|
loaded_track
|
|
|
|
.stream_loader_controller
|
|
|
|
.set_random_access_mode();
|
|
|
|
let _ = loaded_track.decoder.seek(position_ms as i64); // This may be blocking
|
|
|
|
loaded_track.stream_loader_controller.set_stream_mode();
|
2020-02-02 14:37:17 +00:00
|
|
|
}
|
2020-02-03 07:58:44 +00:00
|
|
|
self.start_playback(track_id, play_request_id, loaded_track, play);
|
|
|
|
return;
|
|
|
|
} else {
|
|
|
|
unreachable!();
|
2020-02-02 14:37:17 +00:00
|
|
|
}
|
2020-02-03 07:58:44 +00:00
|
|
|
}
|
|
|
|
}
|
2020-02-02 14:37:17 +00:00
|
|
|
|
2020-02-03 07:58:44 +00:00
|
|
|
// We need to load the track - either from scratch or by completing a preload.
|
|
|
|
// In any case we go into a Loading state to load the track.
|
2020-03-10 12:26:01 +00:00
|
|
|
self.ensure_sink_stopped(play);
|
2020-02-03 07:58:44 +00:00
|
|
|
|
|
|
|
self.send_event(PlayerEvent::Loading {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
position_ms,
|
|
|
|
});
|
|
|
|
|
|
|
|
// Try to extract a pending loader from the preloading mechanism
|
|
|
|
let loader = if let PlayerPreload::Loading {
|
|
|
|
track_id: loaded_track_id,
|
|
|
|
..
|
|
|
|
} = self.preload
|
|
|
|
{
|
|
|
|
if (track_id == loaded_track_id) && (position_ms == 0) {
|
|
|
|
let mut preload = PlayerPreload::None;
|
|
|
|
std::mem::swap(&mut preload, &mut self.preload);
|
|
|
|
if let PlayerPreload::Loading { loader, .. } = preload {
|
|
|
|
Some(loader)
|
|
|
|
} else {
|
|
|
|
None
|
2020-02-02 14:37:17 +00:00
|
|
|
}
|
2020-02-03 07:58:44 +00:00
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
};
|
2020-02-02 14:37:17 +00:00
|
|
|
|
2020-02-03 07:58:44 +00:00
|
|
|
self.preload = PlayerPreload::None;
|
2020-02-02 23:11:27 +00:00
|
|
|
|
2020-02-03 07:58:44 +00:00
|
|
|
// If we don't have a loader yet, create one from scratch.
|
2021-01-21 21:22:32 +00:00
|
|
|
let loader = loader.unwrap_or_else(|| Box::pin(self.load_track(track_id, position_ms)));
|
2020-01-31 21:41:11 +00:00
|
|
|
|
2020-02-03 07:58:44 +00:00
|
|
|
// Set ourselves to a loading state.
|
|
|
|
self.state = PlayerState::Loading {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
start_playback: play,
|
|
|
|
loader,
|
|
|
|
};
|
|
|
|
}
|
2020-01-31 21:41:11 +00:00
|
|
|
|
2020-02-03 07:58:44 +00:00
|
|
|
fn handle_command_preload(&mut self, track_id: SpotifyId) {
|
|
|
|
debug!("Preloading track");
|
|
|
|
let mut preload_track = true;
|
|
|
|
// check whether the track is already loaded somewhere or being loaded.
|
|
|
|
if let PlayerPreload::Loading {
|
|
|
|
track_id: currently_loading,
|
|
|
|
..
|
|
|
|
}
|
|
|
|
| PlayerPreload::Ready {
|
|
|
|
track_id: currently_loading,
|
|
|
|
..
|
|
|
|
} = self.preload
|
|
|
|
{
|
|
|
|
if currently_loading == track_id {
|
|
|
|
// we're already preloading the requested track.
|
|
|
|
preload_track = false;
|
|
|
|
} else {
|
|
|
|
// we're preloading something else - cancel it.
|
|
|
|
self.preload = PlayerPreload::None;
|
|
|
|
}
|
|
|
|
}
|
2016-01-02 15:48:44 +00:00
|
|
|
|
2020-02-03 07:58:44 +00:00
|
|
|
if let PlayerState::Playing {
|
|
|
|
track_id: current_track_id,
|
|
|
|
..
|
|
|
|
}
|
|
|
|
| PlayerState::Paused {
|
|
|
|
track_id: current_track_id,
|
|
|
|
..
|
|
|
|
}
|
|
|
|
| PlayerState::EndOfTrack {
|
|
|
|
track_id: current_track_id,
|
|
|
|
..
|
|
|
|
} = self.state
|
|
|
|
{
|
|
|
|
if current_track_id == track_id {
|
|
|
|
// we already have the requested track loaded.
|
|
|
|
preload_track = false;
|
2020-01-31 21:41:11 +00:00
|
|
|
}
|
2020-02-03 07:58:44 +00:00
|
|
|
}
|
2020-01-31 21:41:11 +00:00
|
|
|
|
2020-03-12 12:01:45 +00:00
|
|
|
// schedule the preload of the current track if desired.
|
2020-02-03 07:58:44 +00:00
|
|
|
if preload_track {
|
|
|
|
let loader = self.load_track(track_id, 0);
|
2021-01-21 21:22:32 +00:00
|
|
|
self.preload = PlayerPreload::Loading {
|
|
|
|
track_id,
|
|
|
|
loader: Box::pin(loader),
|
|
|
|
}
|
2020-02-03 07:58:44 +00:00
|
|
|
}
|
|
|
|
}
|
2020-02-02 14:37:17 +00:00
|
|
|
|
2020-02-03 07:58:44 +00:00
|
|
|
fn handle_command_seek(&mut self, position_ms: u32) {
|
|
|
|
if let Some(stream_loader_controller) = self.state.stream_loader_controller() {
|
|
|
|
stream_loader_controller.set_random_access_mode();
|
|
|
|
}
|
|
|
|
if let Some(decoder) = self.state.decoder() {
|
|
|
|
match decoder.seek(position_ms as i64) {
|
|
|
|
Ok(_) => {
|
|
|
|
if let PlayerState::Playing {
|
|
|
|
ref mut stream_position_pcm,
|
|
|
|
..
|
2017-01-29 14:11:20 +00:00
|
|
|
}
|
2020-02-03 07:58:44 +00:00
|
|
|
| PlayerState::Paused {
|
|
|
|
ref mut stream_position_pcm,
|
|
|
|
..
|
|
|
|
} = self.state
|
|
|
|
{
|
|
|
|
*stream_position_pcm = Self::position_ms_to_pcm(position_ms);
|
2020-02-02 14:37:17 +00:00
|
|
|
}
|
|
|
|
}
|
2020-02-03 07:58:44 +00:00
|
|
|
Err(err) => error!("Vorbis error: {:?}", err),
|
2017-01-29 14:11:20 +00:00
|
|
|
}
|
2020-02-03 07:58:44 +00:00
|
|
|
} else {
|
|
|
|
warn!("Player::seek called from invalid state");
|
|
|
|
}
|
2016-04-24 13:48:15 +00:00
|
|
|
|
2020-02-03 07:58:44 +00:00
|
|
|
// If we're playing, ensure, that we have enough data leaded to avoid a buffer underrun.
|
|
|
|
if let Some(stream_loader_controller) = self.state.stream_loader_controller() {
|
|
|
|
stream_loader_controller.set_stream_mode();
|
|
|
|
}
|
2019-11-01 19:46:28 +00:00
|
|
|
|
2020-02-03 07:58:44 +00:00
|
|
|
// ensure we have a bit of a buffer of downloaded data
|
|
|
|
self.preload_data_before_playback();
|
2020-01-31 21:41:11 +00:00
|
|
|
|
2020-02-03 07:58:44 +00:00
|
|
|
if let PlayerState::Playing {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
ref mut reported_nominal_start_time,
|
|
|
|
duration_ms,
|
|
|
|
..
|
|
|
|
} = self.state
|
|
|
|
{
|
|
|
|
*reported_nominal_start_time =
|
|
|
|
Some(Instant::now() - Duration::from_millis(position_ms as u64));
|
|
|
|
self.send_event(PlayerEvent::Playing {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
position_ms,
|
|
|
|
duration_ms,
|
|
|
|
});
|
|
|
|
}
|
|
|
|
if let PlayerState::Paused {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
duration_ms,
|
|
|
|
..
|
|
|
|
} = self.state
|
|
|
|
{
|
|
|
|
self.send_event(PlayerEvent::Paused {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
position_ms,
|
|
|
|
duration_ms,
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
2020-01-31 21:41:11 +00:00
|
|
|
|
2020-02-03 07:58:44 +00:00
|
|
|
fn handle_command(&mut self, cmd: PlayerCommand) {
|
|
|
|
debug!("command={:?}", cmd);
|
|
|
|
match cmd {
|
|
|
|
PlayerCommand::Load {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
play,
|
|
|
|
position_ms,
|
|
|
|
} => self.handle_command_load(track_id, play_request_id, play, position_ms),
|
2015-07-02 19:42:49 +00:00
|
|
|
|
2020-02-03 07:58:44 +00:00
|
|
|
PlayerCommand::Preload { track_id } => self.handle_command_preload(track_id),
|
2016-04-24 13:48:15 +00:00
|
|
|
|
2020-02-03 07:58:44 +00:00
|
|
|
PlayerCommand::Seek(position_ms) => self.handle_command_seek(position_ms),
|
|
|
|
|
|
|
|
PlayerCommand::Play => self.handle_play(),
|
|
|
|
|
|
|
|
PlayerCommand::Pause => self.handle_pause(),
|
2016-04-24 13:48:15 +00:00
|
|
|
|
2020-01-31 21:41:11 +00:00
|
|
|
PlayerCommand::Stop => self.handle_player_stop(),
|
2015-06-23 14:38:29 +00:00
|
|
|
|
2020-01-31 21:41:11 +00:00
|
|
|
PlayerCommand::AddEventSender(sender) => self.event_senders.push(sender),
|
2016-01-20 13:55:36 +00:00
|
|
|
|
2020-03-10 12:26:01 +00:00
|
|
|
PlayerCommand::SetSinkEventCallback(callback) => self.sink_event_callback = callback,
|
|
|
|
|
2020-01-31 21:41:11 +00:00
|
|
|
PlayerCommand::EmitVolumeSetEvent(volume) => {
|
|
|
|
self.send_event(PlayerEvent::VolumeSet { volume })
|
2019-10-07 22:27:26 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
}
|
2016-01-15 00:12:08 +00:00
|
|
|
}
|
2015-07-09 20:08:14 +00:00
|
|
|
|
2020-01-31 21:41:11 +00:00
|
|
|
fn send_event(&mut self, event: PlayerEvent) {
|
|
|
|
let mut index = 0;
|
|
|
|
while index < self.event_senders.len() {
|
|
|
|
match self.event_senders[index].unbounded_send(event.clone()) {
|
|
|
|
Ok(_) => index += 1,
|
|
|
|
Err(_) => {
|
|
|
|
self.event_senders.remove(index);
|
|
|
|
}
|
|
|
|
}
|
2019-11-01 19:46:28 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-01-21 21:22:32 +00:00
|
|
|
pub fn load_track(
|
2019-11-11 07:22:41 +00:00
|
|
|
&self,
|
|
|
|
spotify_id: SpotifyId,
|
2020-02-02 00:07:05 +00:00
|
|
|
position_ms: u32,
|
2021-01-21 21:22:32 +00:00
|
|
|
) -> impl Future<Output = Result<PlayerLoadedTrackData, ()>> + 'static {
|
2020-01-31 21:41:11 +00:00
|
|
|
// This method creates a future that returns the loaded stream and associated info.
|
|
|
|
// Ideally all work should be done using asynchronous code. However, seek() on the
|
|
|
|
// audio stream is implemented in a blocking fashion. Thus, we can't turn it into future
|
|
|
|
// easily. Instead we spawn a thread to do the work and return a one-shot channel as the
|
|
|
|
// future to work with.
|
|
|
|
|
2021-01-21 21:22:32 +00:00
|
|
|
let session = self.session.clone();
|
|
|
|
let config = self.config.clone();
|
2020-01-22 14:15:30 +00:00
|
|
|
|
2021-01-21 21:22:32 +00:00
|
|
|
async move {
|
|
|
|
let loader = PlayerTrackLoader { session, config };
|
2019-11-01 19:48:18 +00:00
|
|
|
|
2021-01-21 21:22:32 +00:00
|
|
|
let (result_tx, result_rx) = oneshot::channel();
|
|
|
|
|
|
|
|
std::thread::spawn(move || {
|
|
|
|
todo!("How to block in futures 0.3?")
|
|
|
|
/*if let Some(data) = block_on(loader.load_track(spotify_id, position_ms)) {
|
2020-01-31 21:41:11 +00:00
|
|
|
let _ = result_tx.send(data);
|
2021-01-21 21:22:32 +00:00
|
|
|
}*/
|
|
|
|
});
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2021-01-21 21:22:32 +00:00
|
|
|
result_rx.await.map_err(|_| ())
|
|
|
|
}
|
2020-01-31 21:41:11 +00:00
|
|
|
}
|
2019-11-07 13:02:53 +00:00
|
|
|
|
2020-01-31 21:41:11 +00:00
|
|
|
fn preload_data_before_playback(&mut self) {
|
|
|
|
if let PlayerState::Playing {
|
2020-01-17 17:11:07 +00:00
|
|
|
bytes_per_second,
|
2020-01-31 21:41:11 +00:00
|
|
|
ref mut stream_loader_controller,
|
|
|
|
..
|
|
|
|
} = self.state
|
|
|
|
{
|
|
|
|
// Request our read ahead range
|
|
|
|
let request_data_length = max(
|
|
|
|
(READ_AHEAD_DURING_PLAYBACK_ROUNDTRIPS
|
|
|
|
* (0.001 * stream_loader_controller.ping_time_ms() as f64)
|
|
|
|
* bytes_per_second as f64) as usize,
|
|
|
|
(READ_AHEAD_DURING_PLAYBACK_SECONDS * bytes_per_second as f64) as usize,
|
|
|
|
);
|
|
|
|
stream_loader_controller.fetch_next(request_data_length);
|
|
|
|
|
|
|
|
// Request the part we want to wait for blocking. This effecively means we wait for the previous request to partially complete.
|
|
|
|
let wait_for_data_length = max(
|
|
|
|
(READ_AHEAD_BEFORE_PLAYBACK_ROUNDTRIPS
|
|
|
|
* (0.001 * stream_loader_controller.ping_time_ms() as f64)
|
|
|
|
* bytes_per_second as f64) as usize,
|
|
|
|
(READ_AHEAD_BEFORE_PLAYBACK_SECONDS * bytes_per_second as f64) as usize,
|
|
|
|
);
|
|
|
|
stream_loader_controller.fetch_next_blocking(wait_for_data_length);
|
2019-11-01 19:46:28 +00:00
|
|
|
}
|
2015-07-09 22:09:40 +00:00
|
|
|
}
|
2015-07-09 20:08:14 +00:00
|
|
|
}
|
2017-01-29 14:11:20 +00:00
|
|
|
|
2017-02-22 04:17:04 +00:00
|
|
|
impl Drop for PlayerInternal {
|
|
|
|
fn drop(&mut self) {
|
2020-01-31 21:41:11 +00:00
|
|
|
debug!("drop PlayerInternal[{}]", self.session.session_id());
|
2017-02-22 04:17:04 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-02-09 01:27:52 +00:00
|
|
|
impl ::std::fmt::Debug for PlayerCommand {
|
|
|
|
fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result {
|
|
|
|
match *self {
|
2020-01-31 21:41:11 +00:00
|
|
|
PlayerCommand::Load {
|
|
|
|
track_id,
|
|
|
|
play,
|
|
|
|
position_ms,
|
|
|
|
..
|
|
|
|
} => f
|
2018-07-03 11:08:42 +00:00
|
|
|
.debug_tuple("Load")
|
2020-01-31 21:41:11 +00:00
|
|
|
.field(&track_id)
|
2018-02-26 01:50:41 +00:00
|
|
|
.field(&play)
|
2020-01-31 21:41:11 +00:00
|
|
|
.field(&position_ms)
|
2018-02-26 01:50:41 +00:00
|
|
|
.finish(),
|
2020-01-31 21:41:11 +00:00
|
|
|
PlayerCommand::Preload { track_id } => {
|
|
|
|
f.debug_tuple("Preload").field(&track_id).finish()
|
|
|
|
}
|
2018-02-26 01:50:41 +00:00
|
|
|
PlayerCommand::Play => f.debug_tuple("Play").finish(),
|
|
|
|
PlayerCommand::Pause => f.debug_tuple("Pause").finish(),
|
|
|
|
PlayerCommand::Stop => f.debug_tuple("Stop").finish(),
|
|
|
|
PlayerCommand::Seek(position) => f.debug_tuple("Seek").field(&position).finish(),
|
2020-01-31 21:41:11 +00:00
|
|
|
PlayerCommand::AddEventSender(_) => f.debug_tuple("AddEventSender").finish(),
|
2020-03-10 12:26:01 +00:00
|
|
|
PlayerCommand::SetSinkEventCallback(_) => {
|
|
|
|
f.debug_tuple("SetSinkEventCallback").finish()
|
|
|
|
}
|
2020-01-31 21:41:11 +00:00
|
|
|
PlayerCommand::EmitVolumeSetEvent(volume) => {
|
|
|
|
f.debug_tuple("VolumeSet").field(&volume).finish()
|
|
|
|
}
|
2017-02-09 01:27:52 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2018-02-10 15:26:08 +00:00
|
|
|
|
2020-05-09 11:59:28 +00:00
|
|
|
impl ::std::fmt::Debug for PlayerState {
|
|
|
|
fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result {
|
|
|
|
use PlayerState::*;
|
|
|
|
match *self {
|
|
|
|
Stopped => f.debug_struct("Stopped").finish(),
|
|
|
|
Loading {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
..
|
|
|
|
} => f
|
|
|
|
.debug_struct("Loading")
|
|
|
|
.field("track_id", &track_id)
|
|
|
|
.field("play_request_id", &play_request_id)
|
|
|
|
.finish(),
|
|
|
|
Paused {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
..
|
|
|
|
} => f
|
|
|
|
.debug_struct("Paused")
|
|
|
|
.field("track_id", &track_id)
|
|
|
|
.field("play_request_id", &play_request_id)
|
|
|
|
.finish(),
|
|
|
|
Playing {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
..
|
|
|
|
} => f
|
|
|
|
.debug_struct("Playing")
|
|
|
|
.field("track_id", &track_id)
|
|
|
|
.field("play_request_id", &play_request_id)
|
|
|
|
.finish(),
|
|
|
|
EndOfTrack {
|
|
|
|
track_id,
|
|
|
|
play_request_id,
|
|
|
|
..
|
|
|
|
} => f
|
|
|
|
.debug_struct("EndOfTrack")
|
|
|
|
.field("track_id", &track_id)
|
|
|
|
.field("play_request_id", &play_request_id)
|
|
|
|
.finish(),
|
|
|
|
Invalid => f.debug_struct("Invalid").finish(),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2018-02-10 15:26:08 +00:00
|
|
|
struct Subfile<T: Read + Seek> {
|
|
|
|
stream: T,
|
|
|
|
offset: u64,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<T: Read + Seek> Subfile<T> {
|
|
|
|
pub fn new(mut stream: T, offset: u64) -> Subfile<T> {
|
|
|
|
stream.seek(SeekFrom::Start(offset)).unwrap();
|
|
|
|
Subfile {
|
|
|
|
stream: stream,
|
|
|
|
offset: offset,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<T: Read + Seek> Read for Subfile<T> {
|
2021-01-21 21:22:32 +00:00
|
|
|
fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
|
2018-02-10 15:26:08 +00:00
|
|
|
self.stream.read(buf)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<T: Read + Seek> Seek for Subfile<T> {
|
2021-01-21 21:22:32 +00:00
|
|
|
fn seek(&mut self, mut pos: SeekFrom) -> io::Result<u64> {
|
2018-02-10 15:26:08 +00:00
|
|
|
pos = match pos {
|
|
|
|
SeekFrom::Start(offset) => SeekFrom::Start(offset + self.offset),
|
|
|
|
x => x,
|
|
|
|
};
|
|
|
|
|
2019-10-08 09:31:18 +00:00
|
|
|
let newpos = self.stream.seek(pos)?;
|
2018-02-10 15:26:08 +00:00
|
|
|
if newpos > self.offset {
|
|
|
|
Ok(newpos - self.offset)
|
|
|
|
} else {
|
|
|
|
Ok(0)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|