zinface
/
SDL
mirror of https://github.com/libsdl-org/SDL
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

audio: more AudioStream allocation work. 

This was only including the resampling buffer needs if it was larger
the other allocation needs, but it needs to be included unconditionally.

For safety's sake, we also make sure the pre-resample buffer doesn't risk
overflow, too, but this might not be necessary in practice.
This commit is contained in:
Ryan C. Gordon 2023-05-12 21:35:23 -04:00
parent e596dd8dad
commit 9facc86b6a
No known key found for this signature in database
GPG Key ID: FA148B892AB48044
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/audio/SDL_audiocvt.c
View File

@ -801,7 +801,7 @@ static int CalculateAudioStreamWorkBufSize(const SDL_AudioStream *stream, int le
if (stream->dst_rate != stream->src_rate) {
/* calculate requested sample frames needed before resampling. Use a Uint64 so the multiplication doesn't overflow. */
const int input_frames = ((int) ((((Uint64) workbuf_frames) * stream->src_rate) / stream->dst_rate));
inputlen = input_frames * stream->src_sample_frame_size;
inputlen = input_frames * stream->max_sample_frame_size;
if (inputlen > workbuflen) {
workbuflen = inputlen;
}
@ -811,10 +811,7 @@ static int CalculateAudioStreamWorkBufSize(const SDL_AudioStream *stream, int le
workbuflen = inputlen;
}
/* Calculate space needed after resample (which lives in a second copy in the same buffer). */
inputlen += workbuf_frames * stream->pre_resample_channels * sizeof (float);
if (inputlen > workbuflen) {
workbuflen = inputlen;
}
workbuflen += workbuf_frames * stream->pre_resample_channels * sizeof (float);
}
return workbuflen;