Handle the last MP3 sample being truncated without throwing.

Issue: google#599
b95505017 · Jul 21, 2015 · 3b34b06 · 3b34b06
1 parent ed2b656
commit 3b34b06
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/library/src/main/java/com/google/android/exoplayer/extractor/mp3/Mp3Extractor.java b/library/src/main/java/com/google/android/exoplayer/extractor/mp3/Mp3Extractor.java
@@ -113,9 +113,12 @@ private int readSample(ExtractorInput extractorInput) throws IOException, Interr
     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;
       }