encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

audio: fixed arbitrary upsampling (thanks, Sylvain!). 

This was a leftover of simplifying the resamplers down from autogenerated
code; I forgot to make something that the generator hardcoded into something
variable.

Fixes Bugzilla #3507.
This commit is contained in:
Ryan C. Gordon 2016-12-17 16:15:24 -05:00
parent b515b34dbb
commit f956df23bb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/audio/SDL_audiotypecvt.c
View File

@ -222,8 +222,8 @@ SDL_Upsample_Arbitrary(SDL_AudioCVT *cvt, const int channels)
const int srcsize = cvt->len_cvt - (64 * channels); const int srcsize = cvt->len_cvt - (64 * channels);
const int dstsize = (int) (((double)(cvt->len_cvt/(channels*4))) * cvt->rate_incr) * (channels*4); const int dstsize = (int) (((double)(cvt->len_cvt/(channels*4))) * cvt->rate_incr) * (channels*4);
register int eps = 0; register int eps = 0;
float *dst = ((float *) (cvt->buf + dstsize)) - 8; float *dst = ((float *) (cvt->buf + dstsize)) - channels;
const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - 8; const float *src = ((float *) (cvt->buf + cvt->len_cvt)) - channels;
const float *target = ((const float *) cvt->buf); const float *target = ((const float *) cvt->buf);
const size_t cpy = sizeof (float) * channels; const size_t cpy = sizeof (float) * channels;
float last_sample[8]; float last_sample[8];
@ -241,10 +241,10 @@ SDL_Upsample_Arbitrary(SDL_AudioCVT *cvt, const int channels)
while (dst > target) { while (dst > target) {
SDL_memcpy(dst, sample, cpy); SDL_memcpy(dst, sample, cpy);
dst -= 8; dst -= channels;
eps += srcsize; eps += srcsize;
if ((eps << 1) >= dstsize) { if ((eps << 1) >= dstsize) {
src -= 8; src -= channels;
for (i = 0; i < channels; i++) { for (i = 0; i < channels; i++) {
sample[i] = (float) ((((double) src[i]) + ((double) last_sample[i])) * 0.5); sample[i] = (float) ((((double) src[i]) + ((double) last_sample[i])) * 0.5);
} }