Mirrors/rodio
2
0
Fork 0
mirror of https://github.com/RustAudio/rodio synced 2024-11-10 06:04:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

removes seeking from vorbis decoder, can not be implemented

Browse source
This commit is contained in:
dvdsk 2024-04-03 13:08:21 +02:00
parent 5562241f39
commit 80add81532
No known key found for this signature in database
GPG key ID: 6CF9D20C5709A836
2 changed files with 9 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/decoder/vorbis.rs
View file

@ -76,38 +76,16 @@ where
None
}
/// vorbis decoder only supports seeking to a number of samples
/// from the start. Since the samplerate can change in between frames
/// we can not reliably and efficiently calculate where to seek to.
///
/// recommendation: use symphonia if you want seeking in ogg files
#[inline]
fn try_seek(&mut self, pos: Duration) -> Result<(), SeekError> {
let samples = pos.as_secs_f32() * self.sample_rate() as f32;
self.stream_reader.seek_absgp_pg(samples as u64)?;
// first few frames (packets) sometimes fail to decode, if
// that happens just retry a few times.
let mut last_err = None;
for _ in 0..10 {
// 10 seemed to work best in testing
let res = self.stream_reader.read_dec_packet_itl();
match res {
Ok(data) => {
match data {
Some(d) => self.current_data = d,
None => self.current_data = Vec::new(),
}
// make sure the next seek returns the
// sample for the correct speaker
let to_skip = self.next % self.channels() as usize;
for _ in 0..to_skip {
self.next();
}
return Ok(());
}
Err(e) => last_err = Some(e),
}
}
Err(SeekError::LewtonDecoder(
last_err.expect("is set if we get out of the for loop"),
))
fn try_seek(&mut self, _: Duration) -> Result<(), SeekError> {
Err(SeekError::NotSupported {
underlying_source: std::any::type_name::<Self>(),
})
}
}

6
src/source/mod.rs
View file

@ -415,12 +415,6 @@ pub enum SeekError {
#[cfg(all(feature = "wav", not(feature = "symphonia-wav")))]
#[error("Error seeking in wav source: {0}")]
HoundDecoder(std::io::Error),
#[cfg(all(feature = "vorbis", not(feature = "symphonia-vorbis")))]
#[error("Error seeking in ogg source: {0}")]
LewtonDecoder(#[from] lewton::VorbisError),
#[cfg(all(feature = "minimp3", not(feature = "symphonia-mp3")))]
#[error("Error seeking in mp3 source: {0}")]
Minimp3Decoder(#[from] minimp3_fixed::Error),
#[error("An error occurred")]
Other(Box<dyn std::error::Error + Send>),
}