aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/inputPlugins/mp3_plugin.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/inputPlugins/mp3_plugin.c b/src/inputPlugins/mp3_plugin.c
index 9c4925dfa..2bdff4bd4 100644
--- a/src/inputPlugins/mp3_plugin.c
+++ b/src/inputPlugins/mp3_plugin.c
@@ -957,12 +957,18 @@ static int mp3Read(mp3DecodeData * data, ReplayGainInfo ** replayGainInfo)
pcm_length -= data->dropSamplesAtEnd;
}
- for (; i < pcm_length; i++) {
- unsigned int num_samples;
+ while (i < pcm_length) {
+ unsigned int num_samples =
+ (data->outputBufferEnd - data->outputPtr) /
+ (2 * MAD_NCHANNELS(&(data->frame).header));
+ if (num_samples > pcm_length - i)
+ num_samples = pcm_length - i;
+
+ i += num_samples;
num_samples = dither_buffer((mpd_sint16 *) data->outputPtr,
&data->synth, &data->dither,
- i, i + 1,
+ i - num_samples, i,
MAD_NCHANNELS(&(data->frame).header));
data->outputPtr += 2 * num_samples;