From 20c2d706e7c1ac10399dd3f7ad532257e2abcf07 Mon Sep 17 00:00:00 2001 From: e Date: Fri, 19 Jan 2024 20:50:30 -0300 Subject: [PATCH] fix ogg decoding adds silence at end --- src/SDL_sound_vorbis.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/SDL_sound_vorbis.c b/src/SDL_sound_vorbis.c index 9e66b97..6fdd7a3 100644 --- a/src/SDL_sound_vorbis.c +++ b/src/SDL_sound_vorbis.c @@ -153,14 +153,23 @@ static Uint32 VORBIS_read(Sound_Sample *sample) Uint32 retval; int rc; int err; + int delta; Sound_SampleInternal *internal = (Sound_SampleInternal *) sample->opaque; stb_vorbis *stb = (stb_vorbis *) internal->decoder_private; const int channels = (int) sample->actual.channels; const int want_samples = (int) (internal->buffer_size / sizeof (float)); + const int offset = stb_vorbis_get_playback_sample_offset(stb); + + delta = internal->total_length - offset; stb_vorbis_get_error(stb); /* clear any error state */ rc = stb_vorbis_get_samples_float_interleaved(stb, channels, (float *) internal->buffer, want_samples); - retval = (Uint32) (rc * channels * sizeof (float)); /* rc == number of sample frames read */ + if(delta > 0 && delta < rc) { + retval = (Uint32) (delta * channels * sizeof (float)); /* prevents bug in stb_vorbis */ + } else { + retval = (Uint32) (rc * channels * sizeof (float)); /* rc == number of sample frames read */ + } + err = stb_vorbis_get_error(stb); if (retval == 0)