libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-12-02 21:37:14 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Merge pull request #4712 from leiradel/master

Browse Source 
Fix resampler->process overriding memory because we don't know exactl…
This commit is contained in:
Jean-André Santoni 2017-02-28 19:49:45 +01:00 committed by GitHub
commit dbd359ad6a
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
audio/audio_mixer.c
View File

@ -195,8 +195,15 @@ static bool one_shot_resample(const float* in, size_t samples_in,
if (!retro_resampler_realloc(&data, &resampler, NULL, ratio))
return false;
/* Allocate on a 16-byte boundary, and pad to a multiple of 16 bytes */
*samples_out = samples_in * ratio;
/*
* Allocate on a 16-byte boundary, and pad to a multiple of 16 bytes. We
* add four more samples in the formula below just as safeguard, because
* resampler->process sometimes reports more output samples than the
* formula below calculates. Ideally, audio resamplers should have a
* function to return the number of samples they will output given a
* count of input samples.
*/
*samples_out = samples_in * ratio + 4;
*out = (float*)memalign_alloc(16,
((*samples_out + 15) & ~15) * sizeof(float));