From 5a98c823fcf46699dd9757bdc4ac0f0d28a321d2 Mon Sep 17 00:00:00 2001
From: samrobinson <samrobinson@google.com>
Date: Tue, 2 Nov 2021 15:18:29 +0000
Subject: [PATCH] Update the TransformerMediaClock trackTime before deducting
 the offset.

#minor-release

PiperOrigin-RevId: 407086818
---
 .../exoplayer2/transformer/TransformerAudioRenderer.java       | 2 +-
 .../exoplayer2/transformer/TransformerBaseRenderer.java        | 3 +--
 .../exoplayer2/transformer/TransformerMuxingVideoRenderer.java | 2 +-
 .../transformer/TransformerTranscodingVideoRenderer.java       | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerAudioRenderer.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerAudioRenderer.java
index 8da9dcd2e1..f20915c120 100644
--- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerAudioRenderer.java
+++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerAudioRenderer.java
@@ -279,8 +279,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
     int result = readSource(getFormatHolder(), decoderInputBuffer, /* readFlags= */ 0);
     switch (result) {
       case C.RESULT_BUFFER_READ:
-        decoderInputBuffer.timeUs -= streamOffsetUs;
         mediaClock.updateTimeForTrackType(getTrackType(), decoderInputBuffer.timeUs);
+        decoderInputBuffer.timeUs -= streamOffsetUs;
         decoderInputBuffer.flip();
         decoder.queueInputBuffer(decoderInputBuffer);
         return !decoderInputBuffer.isEndOfStream();
diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerBaseRenderer.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerBaseRenderer.java
index 6e19f0b9f9..d3fe72d65b 100644
--- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerBaseRenderer.java
+++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerBaseRenderer.java
@@ -48,8 +48,7 @@ import com.google.android.exoplayer2.util.MimeTypes;
   }
 
   @Override
-  protected void onStreamChanged(Format[] formats, long startPositionUs, long offsetUs)
-      throws ExoPlaybackException {
+  protected void onStreamChanged(Format[] formats, long startPositionUs, long offsetUs) {
     this.streamOffsetUs = offsetUs;
   }
 
diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerMuxingVideoRenderer.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerMuxingVideoRenderer.java
index d14378754e..4692a6ca81 100644
--- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerMuxingVideoRenderer.java
+++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerMuxingVideoRenderer.java
@@ -117,8 +117,8 @@ import java.nio.ByteBuffer;
       muxerWrapper.endTrack(getTrackType());
       return false;
     }
-    buffer.timeUs -= streamOffsetUs;
     mediaClock.updateTimeForTrackType(getTrackType(), buffer.timeUs);
+    buffer.timeUs -= streamOffsetUs;
     ByteBuffer data = checkNotNull(buffer.data);
     data.flip();
     if (sampleTransformer != null) {
diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerTranscodingVideoRenderer.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerTranscodingVideoRenderer.java
index 931e985a5d..f4836e49df 100644
--- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerTranscodingVideoRenderer.java
+++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerTranscodingVideoRenderer.java
@@ -320,8 +320,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
       case C.RESULT_FORMAT_READ:
         throw new IllegalStateException("Format changes are not supported.");
       case C.RESULT_BUFFER_READ:
-        decoderInputBuffer.timeUs -= streamOffsetUs;
         mediaClock.updateTimeForTrackType(getTrackType(), decoderInputBuffer.timeUs);
+        decoderInputBuffer.timeUs -= streamOffsetUs;
         ByteBuffer data = checkNotNull(decoderInputBuffer.data);
         data.flip();
         decoder.queueInputBuffer(decoderInputBuffer);