diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSamplePipeline.java b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSamplePipeline.java index 11a3651948..045ad5ac69 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSamplePipeline.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/AudioSamplePipeline.java @@ -60,7 +60,6 @@ import org.checkerframework.dataflow.qual.Pure; // TODO(b/260618558): Move silent audio generation upstream of this component. public AudioSamplePipeline( Format firstInputFormat, - long streamStartPositionUs, long streamOffsetUs, TransformationRequest transformationRequest, boolean flattenForSlowMotion, @@ -69,7 +68,7 @@ import org.checkerframework.dataflow.qual.Pure; MuxerWrapper muxerWrapper, FallbackListener fallbackListener) throws ExportException { - super(firstInputFormat, streamStartPositionUs, muxerWrapper); + super(firstInputFormat, /* streamStartPositionUs= */ streamOffsetUs, muxerWrapper); silentAudioGenerator = new SilentAudioGenerator(firstInputFormat); availableInputBuffers = new ConcurrentLinkedDeque<>(); diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/CompositeAssetLoader.java b/libraries/transformer/src/main/java/androidx/media3/transformer/CompositeAssetLoader.java index e2fae067a3..0d7c542cc3 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/CompositeAssetLoader.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/CompositeAssetLoader.java @@ -196,7 +196,7 @@ import java.util.concurrent.atomic.AtomicInteger; compositeAssetLoaderListener.onTrackAdded( firstAudioFormat, SUPPORTED_OUTPUT_TYPE_DECODED, - /* streamStartPositionUs= */ streamOffsetUs, + streamStartPositionUs, streamOffsetUs)); sampleConsumersByTrackType.put(C.TRACK_TYPE_AUDIO, audioSampleConsumer); } diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java index a2a0768d7a..e928e0a09b 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java @@ -434,7 +434,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; if (MimeTypes.isAudio(firstInputFormat.sampleMimeType)) { return new AudioSamplePipeline( firstInputFormat, - streamStartPositionUs, streamOffsetUs, transformationRequest, firstEditedMediaItem.flattenForSlowMotion,