From 3f47da1fd6ffa5d8412969b0b3c62d205f313ba5 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 17 Jan 2022 09:18:42 +0000
Subject: [PATCH] Reset readingPositionUs in BaseRenderer.enable

This does currently only happen by chance in replaceStream (called from
enable) if the stream previosly played read until C.TIME_END_OF_SOURCE.

enable already makes all changes done in resetPosition (except resetting
the reading position), so it's less error-prone and makes the intention
clearer if the same code is called from both enable and resetPosition.

The effect of this bug was quite limited because the numerical value
of readingPositionUs was only relevant for periods with changing
durations and server-side inserted ads.

PiperOrigin-RevId: 422300690
---
 .../java/com/google/android/exoplayer2/BaseRenderer.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java
index 683db1ecbc..ac35a5148a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/BaseRenderer.java
@@ -99,10 +99,9 @@ public abstract class BaseRenderer implements Renderer, RendererCapabilities {
     Assertions.checkState(state == STATE_DISABLED);
     this.configuration = configuration;
     state = STATE_ENABLED;
-    lastResetPositionUs = positionUs;
     onEnabled(joining, mayRenderStartOfStream);
     replaceStream(formats, stream, startPositionUs, offsetUs);
-    onPositionReset(positionUs, joining);
+    resetPosition(positionUs, joining);
   }
 
   @Override
@@ -159,10 +158,14 @@ public abstract class BaseRenderer implements Renderer, RendererCapabilities {
 
   @Override
   public final void resetPosition(long positionUs) throws ExoPlaybackException {
+    resetPosition(positionUs, /* joining= */ false);
+  }
+
+  private void resetPosition(long positionUs, boolean joining) throws ExoPlaybackException {
     streamIsFinal = false;
     lastResetPositionUs = positionUs;
     readingPositionUs = positionUs;
-    onPositionReset(positionUs, false);
+    onPositionReset(positionUs, joining);
   }
 
   @Override