Handle the last MP3 sample being truncated without throwing.

Issue: #599
This commit is contained in:
Oliver Woodman 2015-07-21 17:35:09 +01:00
parent ed2b65654c
commit 3b34b0682c

View File

@ -113,9 +113,12 @@ public final class Mp3Extractor implements Extractor {
sampleBytesRemaining -= inputBuffer.drainToOutput(trackOutput, sampleBytesRemaining);
if (sampleBytesRemaining > 0) {
inputBuffer.mark();
try {
sampleBytesRemaining -= trackOutput.sampleData(extractorInput, sampleBytesRemaining);
} catch (EOFException e) {
return RESULT_END_OF_INPUT;
}
// Return if we still need more data.
sampleBytesRemaining -= trackOutput.sampleData(extractorInput, sampleBytesRemaining);
if (sampleBytesRemaining > 0) {
return RESULT_CONTINUE;
}