From acfea3923575fa40c9c064c34174e6a5a7bdb523 Mon Sep 17 00:00:00 2001 From: kimvde Date: Thu, 10 Nov 2022 13:46:39 +0000 Subject: [PATCH] Fix bug where streamOffsetUs is passed instead of streamPositionUs Also make order of streamStartPositionUs and streamOffsetUs consistent PiperOrigin-RevId: 487511633 --- .../transformer/AudioTranscodingSamplePipeline.java | 4 ++-- .../android/exoplayer2/transformer/BaseSamplePipeline.java | 6 +++--- .../transformer/ExoPlayerAssetLoaderRenderer.java | 4 ++-- .../exoplayer2/transformer/PassthroughSamplePipeline.java | 4 ++-- .../android/exoplayer2/transformer/TransformerInternal.java | 6 +++--- .../transformer/VideoTranscodingSamplePipeline.java | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/AudioTranscodingSamplePipeline.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/AudioTranscodingSamplePipeline.java index cbe9050b77..861f69a692 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/AudioTranscodingSamplePipeline.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/AudioTranscodingSamplePipeline.java @@ -55,8 +55,8 @@ import org.checkerframework.dataflow.qual.Pure; public AudioTranscodingSamplePipeline( Format inputFormat, - long streamOffsetUs, long streamStartPositionUs, + long streamOffsetUs, TransformationRequest transformationRequest, Codec.DecoderFactory decoderFactory, Codec.EncoderFactory encoderFactory, @@ -65,8 +65,8 @@ import org.checkerframework.dataflow.qual.Pure; throws TransformationException { super( inputFormat, - streamOffsetUs, streamStartPositionUs, + streamOffsetUs, transformationRequest.flattenForSlowMotion, muxerWrapper); diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/BaseSamplePipeline.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/BaseSamplePipeline.java index e2ffa47332..95b523466f 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/BaseSamplePipeline.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/BaseSamplePipeline.java @@ -30,8 +30,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; /* 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 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; 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/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/ExoPlayerAssetLoaderRenderer.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/ExoPlayerAssetLoaderRenderer.java index 42ca161d2a..c1b22102af 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/ExoPlayerAssetLoaderRenderer.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/ExoPlayerAssetLoaderRenderer.java @@ -44,8 +44,8 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; 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 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; @Override protected void onStreamChanged(Format[] formats, long startPositionUs, long offsetUs) { - this.streamOffsetUs = offsetUs; this.streamStartPositionUs = startPositionUs; + this.streamOffsetUs = offsetUs; } @Override diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/PassthroughSamplePipeline.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/PassthroughSamplePipeline.java index 74904eb10f..042b890c69 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/PassthroughSamplePipeline.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/PassthroughSamplePipeline.java @@ -30,15 +30,15 @@ import com.google.android.exoplayer2.decoder.DecoderInputBuffer; 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/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerInternal.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerInternal.java index 2c1e82f2ab..6c3c211ff3 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerInternal.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/TransformerInternal.java @@ -160,7 +160,7 @@ import com.google.common.collect.ImmutableList; if (MimeTypes.isAudio(inputFormat.sampleMimeType) && shouldTranscodeAudio(inputFormat)) { return new AudioTranscodingSamplePipeline( inputFormat, - streamOffsetUs, + streamStartPositionUs, streamOffsetUs, transformationRequest, decoderFactory, @@ -172,8 +172,8 @@ import com.google.common.collect.ImmutableList; return new VideoTranscodingSamplePipeline( context, inputFormat, - streamOffsetUs, streamStartPositionUs, + streamOffsetUs, transformationRequest, videoEffects, frameProcessorFactory, @@ -186,8 +186,8 @@ import com.google.common.collect.ImmutableList; } else { return new PassthroughSamplePipeline( inputFormat, - streamOffsetUs, streamStartPositionUs, + streamOffsetUs, transformationRequest, muxerWrapper, fallbackListener); diff --git a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoTranscodingSamplePipeline.java b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoTranscodingSamplePipeline.java index 5523fc058a..45d51c6778 100644 --- a/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoTranscodingSamplePipeline.java +++ b/library/transformer/src/main/java/com/google/android/exoplayer2/transformer/VideoTranscodingSamplePipeline.java @@ -66,8 +66,8 @@ import org.checkerframework.dataflow.qual.Pure; public VideoTranscodingSamplePipeline( Context context, Format inputFormat, - long streamOffsetUs, long streamStartPositionUs, + long streamOffsetUs, TransformationRequest transformationRequest, ImmutableList effects, FrameProcessor.Factory frameProcessorFactory, @@ -80,8 +80,8 @@ import org.checkerframework.dataflow.qual.Pure; throws TransformationException { super( inputFormat, - streamOffsetUs, streamStartPositionUs, + streamOffsetUs, transformationRequest.flattenForSlowMotion, muxerWrapper);