From b5ca187e85930228fee353a29c270af3ea43049b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 31 Jul 2019 16:44:19 +0100
Subject: [PATCH] Mp3Extractor: Avoid outputting seek frame as a sample

This could previously occur when seeking back to position=0

PiperOrigin-RevId: 260933636
---
 .../android/exoplayer2/extractor/mp3/Mp3Extractor.java       | 5 +++++
 1 file changed, 5 insertions(+)

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 c65ad0bc67..e42a10a75f 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
@@ -117,6 +117,7 @@ public final class Mp3Extractor implements Extractor {
   private Seeker seeker;
   private long basisTimeUs;
   private long samplesRead;
+  private int firstSamplePosition;
   private int sampleBytesRemaining;
 
   public Mp3Extractor() {
@@ -214,6 +215,10 @@ public final class Mp3Extractor implements Extractor {
               /* selectionFlags= */ 0,
               /* language= */ null,
               (flags & FLAG_DISABLE_ID3_METADATA) != 0 ? null : metadata));
+      firstSamplePosition = (int) input.getPosition();
+    } else if (input.getPosition() == 0 && firstSamplePosition != 0) {
+      // Skip past the seek frame.
+      input.skipFully(firstSamplePosition);
     }
     return readSample(input);
   }