From 03ebc5b52f618ef65bf4dc84f12f40b95cc6be08 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Tue, 12 Jan 2021 21:43:17 +0000
Subject: [PATCH] Move readPosition modification out of readSampleMetadata

Preparation CL for SampleQueue.peek.

PiperOrigin-RevId: 351439887
---
 .../google/android/exoplayer2/source/SampleQueue.java    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
index 120f6dc2e8..ccbfd6a0b0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
@@ -403,9 +403,10 @@ public class SampleQueue implements TrackOutput {
       boolean formatRequired,
       boolean loadingFinished) {
     int result =
-        readSampleMetadata(formatHolder, buffer, formatRequired, loadingFinished, extrasHolder);
+        peekSampleMetadata(formatHolder, buffer, formatRequired, loadingFinished, extrasHolder);
     if (result == C.RESULT_BUFFER_READ && !buffer.isEndOfStream() && !buffer.isFlagsOnly()) {
       sampleDataQueue.readToBuffer(buffer, extrasHolder);
+      readPosition++;
     }
     return result;
   }
@@ -650,7 +651,7 @@ public class SampleQueue implements TrackOutput {
   }
 
   @SuppressWarnings("ReferenceEquality") // See comments in setUpstreamFormat
-  private synchronized int readSampleMetadata(
+  private synchronized int peekSampleMetadata(
       FormatHolder formatHolder,
       DecoderInputBuffer buffer,
       boolean formatRequired,
@@ -685,14 +686,10 @@ public class SampleQueue implements TrackOutput {
     if (buffer.timeUs < startTimeUs) {
       buffer.addFlag(C.BUFFER_FLAG_DECODE_ONLY);
     }
-    if (buffer.isFlagsOnly()) {
-      return C.RESULT_BUFFER_READ;
-    }
     extrasHolder.size = sizes[relativeReadIndex];
     extrasHolder.offset = offsets[relativeReadIndex];
     extrasHolder.cryptoData = cryptoDatas[relativeReadIndex];
 
-    readPosition++;
     return C.RESULT_BUFFER_READ;
   }