Skip to content

Don't let span chunking change the resampler's output - #915

Open
benface wants to merge 1 commit into
RustAudio:masterfrom
benface:fix/resampler-span-boundaries
Open

Don't let span chunking change the resampler's output#915
benface wants to merge 1 commit into
RustAudio:masterfrom
benface:fix/resampler-span-boundaries

Conversation

@benface

@benface benface commented Aug 6, 2026

Copy link
Copy Markdown

Resampler output changes depending on how the input happens to be split into spans, which it shouldn't.

fill_input_buffer stops at every span boundary and marks the read partial, so rubato zero-pads it as if the stream had ended. Decoders report a span per packet, so this happens constantly — a 48 kHz file on a 44.1 kHz device hisses the whole way through. It now reads across spans and only marks partial at a real end or a format change.

The resamplers were also tracking input position against span length to spot boundaries, but they read ahead into their own buffer, so that count never matched where the input actually was. Filling already stops at a format change, so the tracking is gone — the passthrough keeps its own, where it's accurate.

Tests cover the chunking, plus a sample rate change and a channel count change at a boundary. The chunking one fails on master.

`fill_input_buffer` treats `current_span_len()` as the samples left in
the span, but it's the span's total length, so it stops reading at the
end of every span. Vorbis packets are smaller than a resampler chunk,
so every chunk ends up short, gets marked `partial_len`, and rubato
pads it with zeros. The same audio comes out different depending on how
the decoder split it.

Stop only where the rate or channel count actually changes, and check
that before reading anything from the next span. When reading stops
there, rebuild the resampler.

That fixes a second bug: a span that changed the sample rate was still
being resampled at the old one. 441 frames at 44.1k then 441 at 22.05k,
converted to 48k, gave 962 samples instead of 1440.

Drop the counter the boundary detection was using — reading stops at
the change itself now, so there's nothing left to count. Only the
passthrough still needs it.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
@benface
benface force-pushed the fix/resampler-span-boundaries branch from 1623f94 to 6c15966 Compare August 6, 2026 01:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant