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
This commit is contained in:
parent
469ff63093
commit
5da19e5f78
@ -835,15 +835,17 @@ 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)
|
||||
return DECODE_BREAK;
|
||||
(data->currentFrame == (data->maxFrames - data->dropFramesAtEnd)) &&
|
||||
(samplesLeft < data->dropSamplesAtEnd)) {
|
||||
/* stop decoding, effectively dropping
|
||||
* all remaining samples */
|
||||
return DECODE_BREAK;
|
||||
}
|
||||
|
||||
sample = (mpd_sint16 *) data->outputPtr;
|
||||
|
Loading…
Reference in New Issue
Block a user