mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 07:47:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

audioresample: don't skip input samples

Browse source 
when downsampling, the output buffer can be filled before all the input
samples are consumed.  this is correct:  when downsampling, several input
samples are needed for each output sample, so when only a small number of
input samples are available the number of output samples produced can be 0.

the resampler, however, was discarding those extra input samples instead of
clocking them into its filter history for the next iteration.  this patch
fixes this by removing the check that the output buffer is full.  the code
now always loops until all input samples are consumed, and relies on the
calling code to have provided a suitably sized location for the output.
note that there are already other checks in place in the calling code to
ensure that this is the case.

https://bugzilla.gnome.org/show_bug.cgi?id=732908
This commit is contained in:
Kipp Cannon 2014-07-08 12:37:41 -04:00 committed by Sebastian Dröge
parent f47c2442fe
commit 684cf44ee3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/audioresample/resample.c
View file

@ -1183,7 +1183,7 @@ speex_resampler_process_float (SpeexResamplerState * st,
if (st->magic_samples[channel_index]) if (st->magic_samples[channel_index])
olen -= speex_resampler_magic (st, channel_index, &out, olen); olen -= speex_resampler_magic (st, channel_index, &out, olen);
if (!st->magic_samples[channel_index]) { if (!st->magic_samples[channel_index]) {
while (ilen && olen) { while (ilen) {
spx_uint32_t ichunk = (ilen > xlen) ? xlen : ilen; spx_uint32_t ichunk = (ilen > xlen) ? xlen : ilen;
spx_uint32_t ochunk = olen; spx_uint32_t ochunk = olen;
@ -1238,7 +1238,7 @@ speex_resampler_process_int (SpeexResamplerState * st,
st->out_stride = 1; st->out_stride = 1;
while (ilen && olen) { while (ilen) {
spx_word16_t *y = ystack; spx_word16_t *y = ystack;
spx_uint32_t ichunk = (ilen > xlen) ? xlen : ilen; spx_uint32_t ichunk = (ilen > xlen) ? xlen : ilen;
spx_uint32_t ochunk = (olen > ylen) ? ylen : olen; spx_uint32_t ochunk = (olen > ylen) ? ylen : olen;