From 95ed5ce65d278d9793f409535a3035e8977cb6e9 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 1 Aug 2019 13:06:45 +0100
Subject: [PATCH] Make OggSeeker.startSeek take a granule rather than a time

PiperOrigin-RevId: 261102180
---
 .../exoplayer2/extractor/ogg/DefaultOggSeeker.java     |  5 ++---
 .../android/exoplayer2/extractor/ogg/FlacReader.java   |  6 ++----
 .../android/exoplayer2/extractor/ogg/OggSeeker.java    | 10 ++++------
 .../android/exoplayer2/extractor/ogg/StreamReader.java |  9 +++++----
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java
index a4aa6b8dd5..308547e510 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeeker.java
@@ -120,12 +120,11 @@ import java.io.IOException;
   }
 
   @Override
-  public long startSeek(long timeUs) {
+  public void startSeek(long targetGranule) {
     Assertions.checkArgument(state == STATE_IDLE || state == STATE_SEEK);
-    targetGranule = timeUs == 0 ? 0 : streamReader.convertTimeToGranule(timeUs);
+    this.targetGranule = targetGranule;
     state = STATE_SEEK;
     resetSeeking();
-    return targetGranule;
   }
 
   @Override
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java
index d4c2bbb485..4efd5c5e11 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/FlacReader.java
@@ -185,11 +185,9 @@ import java.util.List;
     }
 
     @Override
-    public long startSeek(long timeUs) {
-      long granule = convertTimeToGranule(timeUs);
-      int index = Util.binarySearchFloor(seekPointGranules, granule, true, true);
+    public void startSeek(long targetGranule) {
+      int index = Util.binarySearchFloor(seekPointGranules, targetGranule, true, true);
       pendingSeekGranule = seekPointGranules[index];
-      return granule;
     }
 
     @Override
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java
index aa88e5bf89..e4c3a163e6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggSeeker.java
@@ -33,16 +33,14 @@ import java.io.IOException;
   SeekMap createSeekMap();
 
   /**
-   * Initializes a seek operation.
+   * Starts a seek operation.
    *
-   * @param timeUs The seek position in microseconds.
-   * @return The granule position targeted by the seek.
+   * @param targetGranule The target granule position.
    */
-  long startSeek(long timeUs);
+  void startSeek(long targetGranule);
 
   /**
-   * Reads data from the {@link ExtractorInput} to build the {@link SeekMap} or to continue a
-   * progressive seek.
+   * Reads data from the {@link ExtractorInput} to build the {@link SeekMap} or to continue a seek.
    * <p/>
    * If more data is required or if the position of the input needs to be modified then a position
    * from which data should be provided is returned. Else a negative value is returned. If a seek
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java
index e459ad1e58..35a07fcf49 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java
@@ -91,7 +91,8 @@ import java.io.IOException;
       reset(!seekMapSet);
     } else {
       if (state != STATE_READ_HEADERS) {
-        targetGranule = oggSeeker.startSeek(timeUs);
+        targetGranule = convertTimeToGranule(timeUs);
+        oggSeeker.startSeek(targetGranule);
         state = STATE_READ_PAYLOAD;
       }
     }
@@ -248,13 +249,13 @@ import java.io.IOException;
   private static final class UnseekableOggSeeker implements OggSeeker {
 
     @Override
-    public long read(ExtractorInput input) throws IOException, InterruptedException {
+    public long read(ExtractorInput input) {
       return -1;
     }
 
     @Override
-    public long startSeek(long timeUs) {
-      return 0;
+    public void startSeek(long targetGranule) {
+      // Do nothing.
     }
 
     @Override