Update the TransformerMediaClock trackTime before deducting the offset.

#minor-release PiperOrigin-RevId: 407086818
google · Nov 3, 2021 · 5a98c82 · 5a98c82
1 parent 368f4d6
commit 5a98c82
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/...mer/src/main/java/com/google/android/exoplayer2/transformer/TransformerAudioRenderer.java b/...mer/src/main/java/com/google/android/exoplayer2/transformer/TransformerAudioRenderer.java
@@ -279,8 +279,8 @@ private boolean feedDecoderFromInput(MediaCodecAdapterWrapper decoder) {
     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/...rmer/src/main/java/com/google/android/exoplayer2/transformer/TransformerBaseRenderer.java b/...rmer/src/main/java/com/google/android/exoplayer2/transformer/TransformerBaseRenderer.java
@@ -48,8 +48,7 @@ public TransformerBaseRenderer(
   }
 
   @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/...c/main/java/com/google/android/exoplayer2/transformer/TransformerMuxingVideoRenderer.java b/...c/main/java/com/google/android/exoplayer2/transformer/TransformerMuxingVideoRenderer.java
@@ -117,8 +117,8 @@ private boolean readAndTransformBuffer() {
       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/...n/java/com/google/android/exoplayer2/transformer/TransformerTranscodingVideoRenderer.java b/...n/java/com/google/android/exoplayer2/transformer/TransformerTranscodingVideoRenderer.java
@@ -320,8 +320,8 @@ private boolean feedDecoderFromInput(MediaCodecAdapterWrapper decoder) {
       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);