183 |
int ratio1k = (resample_to_srate * 1000) / format->nSamplesPerSec; |
int ratio1k = (resample_to_srate * 1000) / format->nSamplesPerSec; |
184 |
#endif |
#endif |
185 |
int innum, outnum; |
int innum, outnum; |
186 |
static BOOL warned = False; |
unsigned char *tmpdata = NULL, *tmp = NULL; |
|
unsigned char *tmpdata = NULL; |
|
187 |
int samplewidth = format->wBitsPerSample / 8; |
int samplewidth = format->wBitsPerSample / 8; |
188 |
int outsize = 0; |
int outsize = 0; |
189 |
int i; |
int i; |
198 |
rdpsnd_dsp_swapbytes(in, size, format); |
rdpsnd_dsp_swapbytes(in, size, format); |
199 |
#endif |
#endif |
200 |
|
|
201 |
|
if (resample_to_channels != format->nChannels) |
202 |
|
{ |
203 |
|
int newsize = (size / format->nChannels) * resample_to_channels; |
204 |
|
tmpdata = xmalloc(newsize); |
205 |
|
|
206 |
|
for (i = 0; i < newsize / samplewidth; i++) |
207 |
|
{ |
208 |
|
if (format->nChannels > resample_to_channels) |
209 |
|
memcpy(tmpdata + (i * samplewidth), |
210 |
|
in + |
211 |
|
(((i * format->nChannels) / resample_to_channels) * |
212 |
|
samplewidth), samplewidth); |
213 |
|
else |
214 |
|
memcpy(tmpdata + (i * samplewidth), |
215 |
|
in + |
216 |
|
(((i / resample_to_channels) * format->nChannels + |
217 |
|
(i % format->nChannels)) * samplewidth), samplewidth); |
218 |
|
|
219 |
|
} |
220 |
|
|
221 |
|
in = tmpdata; |
222 |
|
size = newsize; |
223 |
|
} |
224 |
|
|
225 |
|
|
226 |
/* Expand 8bit input-samples to 16bit */ |
/* Expand 8bit input-samples to 16bit */ |
227 |
#ifndef HAVE_LIBSAMPLERATE /* libsamplerate needs 16bit samples */ |
#ifndef HAVE_LIBSAMPLERATE /* libsamplerate needs 16bit samples */ |
228 |
if (format->wBitsPerSample != resample_to_bitspersample) |
if (format->wBitsPerSample != resample_to_bitspersample) |
231 |
/* source: 8 bit, dest: 16bit */ |
/* source: 8 bit, dest: 16bit */ |
232 |
if (format->wBitsPerSample == 8) |
if (format->wBitsPerSample == 8) |
233 |
{ |
{ |
234 |
|
tmp = tmpdata; |
235 |
tmpdata = xmalloc(size * 2); |
tmpdata = xmalloc(size * 2); |
236 |
for (i = 0; i < size; i++) |
for (i = 0; i < size; i++) |
237 |
{ |
{ |
241 |
in = tmpdata; |
in = tmpdata; |
242 |
samplewidth = 16 / 2; |
samplewidth = 16 / 2; |
243 |
size *= 2; |
size *= 2; |
|
} |
|
|
} |
|
244 |
|
|
245 |
if (resample_to_channels != format->nChannels) |
if (tmp != NULL) |
246 |
{ |
xfree(tmp); |
247 |
warning("unsupported resample-settings (%u -> %u/%u -> %u/%u -> %u), not resampling!\n", format->nSamplesPerSec, resample_to_srate, format->wBitsPerSample, resample_to_bitspersample, format->nChannels, resample_to_channels); |
} |
|
warned = True; |
|
248 |
} |
} |
249 |
|
|
250 |
innum = size / samplewidth; |
innum = size / samplewidth; |
299 |
|
|
300 |
for (i = 0; i < outsize / (resample_to_channels * samplewidth); i++) |
for (i = 0; i < outsize / (resample_to_channels * samplewidth); i++) |
301 |
{ |
{ |
302 |
int source = ((i * 1000) + ratio1k - 1000) / (ratio1k + 1); |
int source = (i * 1000) / ratio1k; |
303 |
|
#if 0 /* Partial for linear resampler */ |
304 |
|
int part = (i * 100000) / ratio1k - source * 100; |
305 |
|
#endif |
306 |
|
int j; |
307 |
|
|
308 |
if (source * resample_to_channels + samplewidth > size) |
if (source * resample_to_channels + samplewidth > size) |
309 |
break; |
break; |
310 |
|
|
311 |
if (resample_to_channels == 2) |
#if 0 /* Linear resampling, TODO: soundquality fixes (LP filter) */ |
312 |
|
if (samplewidth == 1) |
313 |
{ |
{ |
314 |
memcpy(*out + (i * resample_to_channels * samplewidth), |
sint8 cval1, cval2; |
315 |
in + (source * resample_to_channels * samplewidth), samplewidth); |
for (j = 0; j < resample_to_channels; j++) |
316 |
memcpy(*out + (i * resample_to_channels * samplewidth) + samplewidth, |
{ |
317 |
in + (source * resample_to_channels * samplewidth) + samplewidth, |
memcpy(&cval1, |
318 |
samplewidth); |
in + (source * resample_to_channels * samplewidth) + |
319 |
|
(samplewidth * j), samplewidth); |
320 |
|
memcpy(&cval2, |
321 |
|
in + ((source + 1) * resample_to_channels * samplewidth) + |
322 |
|
(samplewidth * j), samplewidth); |
323 |
|
|
324 |
|
cval1 += (sint8)(cval2 * part) / 100; |
325 |
|
|
326 |
|
memcpy(*out + (i * resample_to_channels * samplewidth) + |
327 |
|
(samplewidth * j), &cval1, samplewidth); |
328 |
|
} |
329 |
} |
} |
330 |
else |
else |
331 |
{ |
{ |
332 |
memcpy(*out + (i * samplewidth), in + (source * samplewidth), samplewidth); |
sint16 sval1, sval2; |
333 |
|
for (j = 0; j < resample_to_channels; j++) |
334 |
|
{ |
335 |
|
memcpy(&sval1, |
336 |
|
in + (source * resample_to_channels * samplewidth) + |
337 |
|
(samplewidth * j), samplewidth); |
338 |
|
memcpy(&sval2, |
339 |
|
in + ((source + 1) * resample_to_channels * samplewidth) + |
340 |
|
(samplewidth * j), samplewidth); |
341 |
|
|
342 |
|
sval1 += (sint16)(sval2 * part) / 100; |
343 |
|
|
344 |
|
memcpy(*out + (i * resample_to_channels * samplewidth) + |
345 |
|
(samplewidth * j), &sval1, samplewidth); |
346 |
|
} |
347 |
} |
} |
348 |
|
#else /* Nearest neighbor search */ |
349 |
|
for (j = 0; j < resample_to_channels; j++) |
350 |
|
{ |
351 |
|
memcpy(*out + (i * resample_to_channels * samplewidth) + (samplewidth * j), |
352 |
|
in + (source * resample_to_channels * samplewidth) + |
353 |
|
(samplewidth * j), samplewidth); |
354 |
|
} |
355 |
|
#endif |
356 |
} |
} |
357 |
outsize = i * resample_to_channels * samplewidth; |
outsize = i * resample_to_channels * samplewidth; |
358 |
#endif |
#endif |