From 953b258e5eb8e93adb13046c5ae8a61934d35f61 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 16 Jan 2009 18:52:01 +0100 Subject: pcm_resample_fallback: corrected the sample calculation Due to rounding errors, it was possible that the fallback resampler returned partial frames. --- src/pcm_resample_fallback.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/pcm_resample_fallback.c b/src/pcm_resample_fallback.c index dedb2eabc..c7789d69c 100644 --- a/src/pcm_resample_fallback.c +++ b/src/pcm_resample_fallback.c @@ -37,9 +37,10 @@ pcm_resample_16(struct pcm_resample_state *state, size_t *dest_size_r) { unsigned src_pos, dest_pos = 0; - unsigned src_samples = src_size / sizeof(*src_buffer); - unsigned dest_samples = - (src_samples * dest_rate + src_rate - 1) / src_rate; + unsigned src_frames = src_size / channels / sizeof(*src_buffer); + unsigned dest_frames = + (src_frames * dest_rate + src_rate - 1) / src_rate; + unsigned dest_samples = dest_frames * channels; size_t dest_size = dest_samples * sizeof(*src_buffer); int16_t *dest_buffer = pcm_buffer_get(&state->buffer, dest_size); @@ -77,9 +78,10 @@ pcm_resample_24(struct pcm_resample_state *state, size_t *dest_size_r) { unsigned src_pos, dest_pos = 0; - unsigned src_samples = src_size / sizeof(*src_buffer); - unsigned dest_samples = - (src_samples * dest_rate + src_rate - 1) / src_rate; + unsigned src_frames = src_size / channels / sizeof(*src_buffer); + unsigned dest_frames = + (src_frames * dest_rate + src_rate - 1) / src_rate; + unsigned dest_samples = dest_frames * channels; size_t dest_size = dest_samples * sizeof(*src_buffer); int32_t *dest_buffer = pcm_buffer_get(&state->buffer, dest_size); -- cgit v1.2.3