Skip to content

fix: SymphoniaDecoder::current_span_length now returns None instead of Some(0) #833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jgraef wants to merge 2 commits into
base: master
Choose a base branch
from
+22 −15
Open

fix: SymphoniaDecoder::current_span_length now returns None instead of Some(0) #833

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59893b8
skip over packets from non-selected tracks in Iterator::next
jgraef Jan 15, 2026
51acc39
skip over packets without frames when initializing the decoder
jgraef Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 22 additions & 15 deletions src/decoder/symphonia.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ pub(crate) struct SymphoniaDecoder {
buffer: SampleBuffer<Sample>,
spec: SignalSpec,
seek_mode: SeekMode,
selected_track_id: u32,
}

impl SymphoniaDecoder {
Expand Down Expand Up @@ -82,25 +83,15 @@ impl SymphoniaDecoder {
};

// Select the first supported track
let track_id = probed
let track = probed
.format
.tracks()
.iter()
.find(|t| t.codec_params.codec != CODEC_TYPE_NULL)
.ok_or(symphonia::core::errors::Error::Unsupported(
"No track with supported codec",
))?
.id;

let track = match probed
.format
.tracks()
.iter()
.find(|track| track.id == track_id)
{
Some(track) => track,
None => return Ok(None),
};
))?;
let track_id = track.id;

let mut decoder = symphonia::default::get_codecs()
.make(&track.codec_params, &DecoderOptions::default())?;
Expand All @@ -122,8 +113,8 @@ impl SymphoniaDecoder {
continue;
}

match decoder.decode(&current_span) {
Ok(decoded) => break decoded,
let decoded = match decoder.decode(&current_span) {
Ok(decoded) => decoded,
Err(e) => match e {
Error::DecodeError(_) => {
// Decode errors are intentionally ignored with no retry limit.
Expand All @@ -133,6 +124,15 @@ impl SymphoniaDecoder {
}
_ => return Err(e),
},
};

// Loop until we get a packet with audio frames. This is necessary because some
// formats can have packets with only metadata, particularly when rewinding, in
// which case the iterator would otherwise end with `None`.
// Note: checking `decoded.frames()` is more reliable than `packet.dur()`, which
// can resturn non-zero durations for packets without audio frames.
if decoded.frames() > 0 {
break decoded;
}
};
let spec = decoded.spec().to_owned();
Expand All @@ -145,6 +145,7 @@ impl SymphoniaDecoder {
buffer,
spec,
seek_mode,
selected_track_id: track_id,
}))
}

Expand Down Expand Up @@ -300,6 +301,12 @@ impl Iterator for SymphoniaDecoder {
if self.current_span_offset >= self.buffer.len() {
let decoded = loop {
let packet = self.format.next_packet().ok()?;

// If the packet does not belong to the selected track, skip over it
if packet.track_id() != self.selected_track_id {
continue;
}

let decoded = match self.decoder.decode(&packet) {
Ok(decoded) => decoded,
Err(Error::DecodeError(_)) => {
Expand Down