Since we try to fill the buffer in every iteration, we assume that we
should flush the output buffer at the end of each iteration.
---
src/inputPlugins/mp3_plugin.c | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/src/inputPlugins/mp3_plugin.c b/src/inputPlugins/mp3_plugin.c
index 0a99cab..27f26db 100644
--- a/src/inputPlugins/mp3_plugin.c
+++ b/src/inputPlugins/mp3_plugin.c
@@ -933,6 +933,7 @@ static int mp3Read(mp3DecodeData * data, struct decoder
*decoder,
}
while (i < pcm_length) {
+ enum decoder_command cmd;
unsigned int num_samples =
(data->outputBufferEnd - data->outputPtr) /
(2 * MAD_NCHANNELS(&(data->frame).header));
@@ -947,22 +948,19 @@ static int mp3Read(mp3DecodeData * data, struct decoder
*decoder,
MAD_NCHANNELS(&(data->frame).header));
data->outputPtr += 2 * num_samples;
- if (data->outputPtr >= data->outputBufferEnd) {
- enum decoder_command cmd;
- cmd = decoder_data(decoder, data->inStream,
- data->inStream->seekable,
- data->outputBuffer,
- data->outputPtr -
data->outputBuffer,
- data->elapsedTime,
- data->bitRate / 1000,
- (replayGainInfo != NULL) ?
*replayGainInfo : NULL);
- if (cmd == DECODE_COMMAND_STOP) {
- data->flush = 0;
- return DECODE_BREAK;
- }
-
- data->outputPtr = data->outputBuffer;
+ cmd = decoder_data(decoder, data->inStream,
+ data->inStream->seekable,
+ data->outputBuffer,
+ data->outputPtr - data->outputBuffer,
+ data->elapsedTime,
+ data->bitRate / 1000,
+ (replayGainInfo != NULL) ?
*replayGainInfo : NULL);
+ if (cmd == DECODE_COMMAND_STOP) {
+ data->flush = 0;
+ return DECODE_BREAK;
}
+
+ data->outputPtr = data->outputBuffer;
}
if (data->dropSamplesAtEnd &&
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Musicpd-dev-team mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
