diff options
author | Kipp Cannon <kipp.cannon@ligo.org> | 2014-07-08 12:37:41 -0400 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2014-09-11 17:09:19 +0300 |
commit | 0bf81236c2f1e4661106020fd0b5e2c7f6e7f160 (patch) | |
tree | 20a690ae519877d637a25118701918a6b0913f5b /gst | |
parent | 102d428ca8529fe595b0a0acc8c70f2911dd44d2 (diff) |
audioresample: don't skip input samples
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
Diffstat (limited to 'gst')
-rw-r--r-- | gst/audioresample/resample.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gst/audioresample/resample.c b/gst/audioresample/resample.c index d4df97902..d06719229 100644 --- a/gst/audioresample/resample.c +++ b/gst/audioresample/resample.c @@ -1183,7 +1183,7 @@ speex_resampler_process_float (SpeexResamplerState * st, if (st->magic_samples[channel_index]) olen -= speex_resampler_magic (st, channel_index, &out, olen); if (!st->magic_samples[channel_index]) { - while (ilen && olen) { + while (ilen) { spx_uint32_t ichunk = (ilen > xlen) ? xlen : ilen; spx_uint32_t ochunk = olen; @@ -1238,7 +1238,7 @@ speex_resampler_process_int (SpeexResamplerState * st, st->out_stride = 1; - while (ilen && olen) { + while (ilen) { spx_word16_t *y = ystack; spx_uint32_t ichunk = (ilen > xlen) ? xlen : ilen; spx_uint32_t ochunk = (olen > ylen) ? ylen : olen; |