From e15e6212f25d531c2f1403876e463dc645e4ab29 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 17 Apr 2019 14:45:18 +0100
Subject: [PATCH] Fix playback of badly clipped MP3 streams

Issue: #5772
PiperOrigin-RevId: 243987497
---
 RELEASENOTES.md                                  |  6 ++++--
 .../exoplayer2/extractor/mp3/Mp3Extractor.java   | 16 +++++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 765244ac1af..182701ec34c 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -32,14 +32,16 @@
     replaced with an opt out flag
     (`DataSpec.FLAG_DONT_CACHE_IF_LENGTH_UNKNOWN`).
 * Extractors:
-  * MP3: Add support for SHOUTcast ICY metadata
-    ([#3735](https://github.com/google/ExoPlayer/issues/3735)).
   * MP4/FMP4: Add support for Dolby Vision.
   * MP4: Fix issue handling meta atoms in some streams
     ([#5698](https://github.com/google/ExoPlayer/issues/5698),
     [#5694](https://github.com/google/ExoPlayer/issues/5694)).
+  * MP3: Add support for SHOUTcast ICY metadata
+    ([#3735](https://github.com/google/ExoPlayer/issues/3735)).
   * MP3: Fix ID3 frame unsychronization
     ([#5673](https://github.com/google/ExoPlayer/issues/5673)).
+  * MP3: Fix playback of badly clipped files
+    ([#5772](https://github.com/google/ExoPlayer/issues/5772)).  
   * MPEG-TS: Enable HDMV DTS stream detection only if a flag is set. By default
     (i.e. if the flag is not set), the 0x82 elementary stream type is now
     treated as an SCTE subtitle track
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java
index 4db715f53eb..c65ad0bc670 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/mp3/Mp3Extractor.java
@@ -341,9 +341,19 @@ private boolean synchronize(ExtractorInput input, boolean sniffing)
    */
   private boolean peekEndOfStreamOrHeader(ExtractorInput extractorInput)
       throws IOException, InterruptedException {
-    return (seeker != null && extractorInput.getPeekPosition() == seeker.getDataEndPosition())
-        || !extractorInput.peekFully(
-            scratch.data, /* offset= */ 0, /* length= */ 4, /* allowEndOfInput= */ true);
+    if (seeker != null) {
+      long dataEndPosition = seeker.getDataEndPosition();
+      if (dataEndPosition != C.POSITION_UNSET
+          && extractorInput.getPeekPosition() > dataEndPosition - 4) {
+        return true;
+      }
+    }
+    try {
+      return !extractorInput.peekFully(
+          scratch.data, /* offset= */ 0, /* length= */ 4, /* allowEndOfInput= */ true);
+    } catch (EOFException e) {
+      return true;
+    }
   }
 
   /**