loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle the last MP3 sample being truncated without throwing.

Browse Source 
Issue: #599
This commit is contained in:
Oliver Woodman 2015-07-21 17:35:09 +01:00
parent ed2b65654c
commit 3b34b0682c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/src/main/java/com/google/android/exoplayer/extractor/mp3/Mp3Extractor.java
View File

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