From cc141f7bf472e22637ace3fa5125e3796d8a253d Mon Sep 17 00:00:00 2001 From: samrobinson Date: Mon, 7 Aug 2023 11:06:13 +0000 Subject: [PATCH] Use specific type for SequenceAssetLoader internal logic. PiperOrigin-RevId: 554431024 --- .../androidx/media3/transformer/SequenceAssetLoader.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceAssetLoader.java b/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceAssetLoader.java index 066cc4f73c..fb31d56d18 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceAssetLoader.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/SequenceAssetLoader.java @@ -69,7 +69,7 @@ import java.util.concurrent.atomic.AtomicInteger; *

This map never contains more than 2 entries, as the only track types allowed are audio and * video. */ - private final Map sampleConsumersByTrackType; + private final Map sampleConsumersByTrackType; /** * A mapping from track types to {@link OnMediaItemChangedListener} instances. @@ -241,9 +241,9 @@ import java.util.concurrent.atomic.AtomicInteger; @Nullable @Override - public SampleConsumer onOutputFormat(Format format) throws ExportException { + public SampleConsumerWrapper onOutputFormat(Format format) throws ExportException { @C.TrackType int trackType = getProcessedTrackType(format.sampleMimeType); - SampleConsumer sampleConsumer; + SampleConsumerWrapper sampleConsumer; if (isCurrentAssetFirstAsset) { @Nullable SampleConsumer wrappedSampleConsumer = sequenceAssetLoaderListener.onOutputFormat(format); @@ -281,7 +281,8 @@ import java.util.concurrent.atomic.AtomicInteger; } onMediaItemChanged(trackType, format); if (nonEndedTracks.get() == 1 && sampleConsumersByTrackType.size() == 2) { - for (Map.Entry entry : sampleConsumersByTrackType.entrySet()) { + for (Map.Entry entry : + sampleConsumersByTrackType.entrySet()) { int outputTrackType = entry.getKey(); if (trackType != outputTrackType) { onMediaItemChanged(outputTrackType, /* format= */ null);