From dfd5c512f6dfd62ba60e0363a474fbf18192efe6 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Thu, 9 Apr 2020 14:40:49 +0100
Subject: [PATCH] Tweak PassthroughSectionPayloadReader to allow timestamp to
 change

PiperOrigin-RevId: 305674374
---
 .../ts/PassthroughSectionPayloadReader.java   | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PassthroughSectionPayloadReader.java b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PassthroughSectionPayloadReader.java
index c09049bc0e..72667e2a3f 100644
--- a/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PassthroughSectionPayloadReader.java
+++ b/library/extractor/src/main/java/com/google/android/exoplayer2/extractor/ts/PassthroughSectionPayloadReader.java
@@ -33,10 +33,9 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
  */
 public final class PassthroughSectionPayloadReader implements SectionPayloadReader {
 
-  private final String mimeType;
+  private Format format;
   private @MonotonicNonNull TimestampAdjuster timestampAdjuster;
   private @MonotonicNonNull TrackOutput output;
-  private boolean formatOutputWithTimestampAdjustment;
 
   /**
    * Create a new PassthroughSectionPayloadReader.
@@ -44,7 +43,7 @@ public final class PassthroughSectionPayloadReader implements SectionPayloadRead
    * @param mimeType The MIME type set as {@link Format#sampleMimeType} on the created output track.
    */
   public PassthroughSectionPayloadReader(String mimeType) {
-    this.mimeType = mimeType;
+    this.format = new Format.Builder().setSampleMimeType(mimeType).build();
   }
 
   @Override
@@ -57,23 +56,20 @@ public final class PassthroughSectionPayloadReader implements SectionPayloadRead
     output = extractorOutput.track(idGenerator.getTrackId(), C.TRACK_TYPE_METADATA);
     // Eagerly output an incomplete format (missing timestamp offset) to ensure source preparation
     // is not blocked waiting for potentially sparse metadata.
-    output.format(new Format.Builder().setSampleMimeType(mimeType).build());
+    output.format(format);
   }
 
   @Override
   public void consume(ParsableByteArray sectionData) {
     assertInitialized();
-    if (!formatOutputWithTimestampAdjustment) {
-      if (timestampAdjuster.getTimestampOffsetUs() == C.TIME_UNSET) {
-        // There is not enough information to initialize the timestamp adjuster.
-        return;
-      }
-      output.format(
-          new Format.Builder()
-              .setSampleMimeType(mimeType)
-              .setSubsampleOffsetUs(timestampAdjuster.getTimestampOffsetUs())
-              .build());
-      formatOutputWithTimestampAdjustment = true;
+    long subsampleOffsetUs = timestampAdjuster.getTimestampOffsetUs();
+    if (subsampleOffsetUs == C.TIME_UNSET) {
+      // Don't output samples without a known subsample offset.
+      return;
+    }
+    if (subsampleOffsetUs != format.subsampleOffsetUs) {
+      format = format.buildUpon().setSubsampleOffsetUs(subsampleOffsetUs).build();
+      output.format(format);
     }
     int sampleSize = sectionData.bytesLeft();
     output.sampleData(sectionData, sampleSize);