sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use specific type for SequenceAssetLoader internal logic.

Browse source 
PiperOrigin-RevId: 554431024
This commit is contained in:
samrobinson 2023-08-07 11:06:13 +00:00 committed by Tianyi Feng
parent 42425334ae
commit cc141f7bf4
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libraries/transformer/src/main/java/androidx/media3/transformer/SequenceAssetLoader.java
View file

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