github-mirrors/librespot
1
0
Fork 0
mirror of https://github.com/librespot-org/librespot.git synced 2025-01-27 17:44:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify time calculations in SymphoniaDecoder

Browse source 
Time impl's from f64 (as secs) so there's no need to manually calculate it beyond converting ms to sec.

If we grab the TimeBase in new we don't need to continually call decoder.codec_params().time_base everytime we want to convert ts to ms.
This commit is contained in:
JasonLG1979 2023-06-24 17:43:10 -05:00
parent 0bdfa726ca
commit 5e02b6643d
1 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
playback/src/decoder/symphonia_decoder.rs
View file

@ -8,7 +8,7 @@ use symphonia::{
formats::{FormatOptions, FormatReader, SeekMode, SeekTo},
io::{MediaSource, MediaSourceStream, MediaSourceStreamOptions},
meta::{StandardTagKey, Value},
units::Time,
units::TimeBase,
},
default::{
codecs::{MpaDecoder, VorbisDecoder},
@ -27,6 +27,7 @@ use crate::{
pub struct SymphoniaDecoder {
format: Box<dyn FormatReader>,
decoder: Box<dyn Decoder>,
time_base: Option<TimeBase>,
sample_buffer: Option<SampleBuffer<f64>>,
}
@ -88,9 +89,12 @@ impl SymphoniaDecoder {
)));
}
let time_base = decoder.codec_params().time_base;
Ok(Self {
format,
decoder,
time_base,
// We set the sample buffer when decoding the first full packet,
// whose duration is also the ideal sample buffer size.
@ -133,30 +137,23 @@ impl SymphoniaDecoder {
}
fn ts_to_ms(&self, ts: u64) -> u32 {
let time_base = self.decoder.codec_params().time_base;
let seeked_to_ms = match time_base {
Some(time_base) => {
// Falls back in the unexpected case that the format has no base time set.
self.time_base
.map(|time_base| {
let time = time_base.calc_time(ts);
(time.seconds as f64 + time.frac) * 1000.
}
// Fallback in the unexpected case that the format has no base time set.
None => ts as f64 * PAGES_PER_MS,
};
seeked_to_ms as u32
((time.seconds as f64 + time.frac) * 1000.) as u32
})
.unwrap_or((ts as f64 * PAGES_PER_MS) as u32)
}
}
impl AudioDecoder for SymphoniaDecoder {
fn seek(&mut self, position_ms: u32) -> Result<u32, DecoderError> {
let seconds = position_ms as u64 / 1000;
let frac = (position_ms as f64 % 1000.) / 1000.;
let time = Time::new(seconds, frac);
// `track_id: None` implies the default track ID (of the container, not of Spotify).
let seeked_to_ts = self.format.seek(
SeekMode::Accurate,
SeekTo::Time {
time,
time: (position_ms as f64 / 1000.).into(),
track_id: None,
},
)?;