Properly calculate the number of remaining samples in the MP3 frame, even

though in practice it should never matter. git-svn-id: https://svn.musicpd.org/mpd/trunk@5147 09075e82-0dd4-0310-85a5-a0d7c8717e4f

Properly calculate the number of remaining samples in the MP3 frame, even
5da19e5f · J. Alexander Treuman · 469ff630 · 5da19e5f
Commit 5da19e5f authored Dec 23, 2006 by J. Alexander Treuman
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

mp3_plugin.c src/inputPlugins/mp3_plugin.c +6 -4

No files found.
--- a/src/inputPlugins/mp3_plugin.c
+++ b/src/inputPlugins/mp3_plugin.c
@@ -835,14 +835,16 @@ static int mp3Read(mp3DecodeData * data, OutputBuffer * cb, DecoderControl * dc,
 		for (i = 0; i < (data->synth).pcm.length; i++) {
 			mpd_sint16 *sample;

+			samplesLeft--;
+
 			if (!data->decodedFirstFrame &&
 			    (i < data->dropSamplesAtStart)) {
 				continue;
 			} else if (data->dropSamplesAtEnd &&
-			           (data->currentFrame == (data->maxFrames - data->dropFramesAtEnd))) {
-				samplesLeft--;
-				/* stop decoding, since samples were dropped */
-				if (samplesLeft < data->dropSamplesAtEnd)
+			           (data->currentFrame == (data->maxFrames - data->dropFramesAtEnd)) &&
+				   (samplesLeft < data->dropSamplesAtEnd)) {
+				/* stop decoding, effectively dropping
+				 * all remaining samples */
 				return DECODE_BREAK;
 			}