Fix bug where streamOffsetUs is passed instead of streamPositionUs

Also make order of streamStartPositionUs and streamOffsetUs consistent PiperOrigin-RevId: 487511633
DiceTechnology · Nov 10, 2022 · acfea39 · acfea39
1 parent 4949fbe
commit acfea39
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/...c/main/java/com/google/android/exoplayer2/transformer/AudioTranscodingSamplePipeline.java b/...c/main/java/com/google/android/exoplayer2/transformer/AudioTranscodingSamplePipeline.java
@@ -55,8 +55,8 @@
 
   public AudioTranscodingSamplePipeline(
       Format inputFormat,
-      long streamOffsetUs,
       long streamStartPositionUs,
+      long streamOffsetUs,
       TransformationRequest transformationRequest,
       Codec.DecoderFactory decoderFactory,
       Codec.EncoderFactory encoderFactory,
@@ -65,8 +65,8 @@ public AudioTranscodingSamplePipeline(
       throws TransformationException {
     super(
         inputFormat,
-        streamOffsetUs,
         streamStartPositionUs,
+        streamOffsetUs,
         transformationRequest.flattenForSlowMotion,
         muxerWrapper);
 

diff --git a/...ansformer/src/main/java/com/google/android/exoplayer2/transformer/BaseSamplePipeline.java b/...ansformer/src/main/java/com/google/android/exoplayer2/transformer/BaseSamplePipeline.java
@@ -30,8 +30,8 @@
 
 /* package */ abstract class BaseSamplePipeline implements SamplePipeline {
 
-  private final long streamOffsetUs;
   private final long streamStartPositionUs;
+  private final long streamOffsetUs;
   private final MuxerWrapper muxerWrapper;
   private final @C.TrackType int trackType;
   private final @MonotonicNonNull SefSlowMotionFlattener sefVideoSlowMotionFlattener;
@@ -42,12 +42,12 @@
 
   public BaseSamplePipeline(
       Format inputFormat,
-      long streamOffsetUs,
       long streamStartPositionUs,
+      long streamOffsetUs,
       boolean flattenForSlowMotion,
       MuxerWrapper muxerWrapper) {
-    this.streamOffsetUs = streamOffsetUs;
     this.streamStartPositionUs = streamStartPositionUs;
+    this.streamOffsetUs = streamOffsetUs;
     this.muxerWrapper = muxerWrapper;
     trackType = MimeTypes.getTrackType(inputFormat.sampleMimeType);
     sefVideoSlowMotionFlattener =

diff --git a/...src/main/java/com/google/android/exoplayer2/transformer/ExoPlayerAssetLoaderRenderer.java b/...src/main/java/com/google/android/exoplayer2/transformer/ExoPlayerAssetLoaderRenderer.java
@@ -44,8 +44,8 @@
   private final DecoderInputBuffer decoderInputBuffer;
 
   private boolean isTransformationRunning;
-  private long streamOffsetUs;
   private long streamStartPositionUs;
+  private long streamOffsetUs;
   private @MonotonicNonNull SamplePipeline samplePipeline;
 
   public ExoPlayerAssetLoaderRenderer(
@@ -110,8 +110,8 @@ public void render(long positionUs, long elapsedRealtimeUs) {
 
   @Override
   protected void onStreamChanged(Format[] formats, long startPositionUs, long offsetUs) {
-    this.streamOffsetUs = offsetUs;
     this.streamStartPositionUs = startPositionUs;
+    this.streamOffsetUs = offsetUs;
   }
 
   @Override

diff --git a/...er/src/main/java/com/google/android/exoplayer2/transformer/PassthroughSamplePipeline.java b/...er/src/main/java/com/google/android/exoplayer2/transformer/PassthroughSamplePipeline.java
@@ -30,15 +30,15 @@
 
   public PassthroughSamplePipeline(
       Format format,
-      long streamOffsetUs,
       long streamStartPositionUs,
+      long streamOffsetUs,
       TransformationRequest transformationRequest,
       MuxerWrapper muxerWrapper,
       FallbackListener fallbackListener) {
     super(
         format,
-        streamOffsetUs,
         streamStartPositionUs,
+        streamOffsetUs,
         transformationRequest.flattenForSlowMotion,
         muxerWrapper);
     this.format = format;

diff --git a/...nsformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerInternal.java b/...nsformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerInternal.java
@@ -160,7 +160,7 @@ private SamplePipeline getSamplePipeline(
       if (MimeTypes.isAudio(inputFormat.sampleMimeType) && shouldTranscodeAudio(inputFormat)) {
         return new AudioTranscodingSamplePipeline(
             inputFormat,
-            streamOffsetUs,
+            streamStartPositionUs,
             streamOffsetUs,
             transformationRequest,
             decoderFactory,
@@ -172,8 +172,8 @@ && shouldTranscodeVideo(inputFormat, streamStartPositionUs, streamOffsetUs)) {
         return new VideoTranscodingSamplePipeline(
             context,
             inputFormat,
-            streamOffsetUs,
             streamStartPositionUs,
+            streamOffsetUs,
             transformationRequest,
             videoEffects,
             frameProcessorFactory,
@@ -186,8 +186,8 @@ && shouldTranscodeVideo(inputFormat, streamStartPositionUs, streamOffsetUs)) {
       } else {
         return new PassthroughSamplePipeline(
             inputFormat,
-            streamOffsetUs,
             streamStartPositionUs,
+            streamOffsetUs,
             transformationRequest,
             muxerWrapper,
             fallbackListener);

diff --git a/...c/main/java/com/google/android/exoplayer2/transformer/VideoTranscodingSamplePipeline.java b/...c/main/java/com/google/android/exoplayer2/transformer/VideoTranscodingSamplePipeline.java
@@ -66,8 +66,8 @@
   public VideoTranscodingSamplePipeline(
       Context context,
       Format inputFormat,
-      long streamOffsetUs,
       long streamStartPositionUs,
+      long streamOffsetUs,
       TransformationRequest transformationRequest,
       ImmutableList<Effect> effects,
       FrameProcessor.Factory frameProcessorFactory,
@@ -80,8 +80,8 @@ public VideoTranscodingSamplePipeline(
       throws TransformationException {
     super(
         inputFormat,
-        streamOffsetUs,
         streamStartPositionUs,
+        streamOffsetUs,
         transformationRequest.flattenForSlowMotion,
         muxerWrapper);