mirror of
https://github.com/androidx/media.git
synced 2025-05-03 21:57:46 +08:00
Small fixes in CompositeAssetLoader
PiperOrigin-RevId: 512038052
This commit is contained in:
parent
34b9824201
commit
be014f30c3
@ -39,6 +39,7 @@ import com.google.common.collect.ImmutableMap;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
/**
|
||||
@ -90,7 +91,7 @@ import java.util.concurrent.atomic.AtomicInteger;
|
||||
currentMediaItemIndex = new AtomicInteger();
|
||||
handler = clock.createHandler(looper, /* callback= */ null);
|
||||
sampleConsumersByTrackType = new HashMap<>();
|
||||
mediaItemChangedListenersByTrackType = new HashMap<>();
|
||||
mediaItemChangedListenersByTrackType = new ConcurrentHashMap<>();
|
||||
processedInputsBuilder = new ImmutableList.Builder<>();
|
||||
nonEndedTracks = new AtomicInteger();
|
||||
// It's safe to use "this" because we don't start the AssetLoader before exiting the
|
||||
@ -145,6 +146,8 @@ import java.util.concurrent.atomic.AtomicInteger;
|
||||
*
|
||||
* <p>There can't be more than one {@link OnMediaItemChangedListener} for the same track type.
|
||||
*
|
||||
* <p>Can be called from any thread.
|
||||
*
|
||||
* @param onMediaItemChangedListener The {@link OnMediaItemChangedListener}.
|
||||
* @param trackType The {@link C.TrackType} for which to listen to {@link MediaItem} change
|
||||
* events. Must be {@link C#TRACK_TYPE_AUDIO} or {@link C#TRACK_TYPE_VIDEO}.
|
||||
@ -234,9 +237,9 @@ import java.util.concurrent.atomic.AtomicInteger;
|
||||
onMediaItemChanged(trackType, format);
|
||||
if (nonEndedTracks.get() == 1 && sampleConsumersByTrackType.size() == 2) {
|
||||
for (Map.Entry<Integer, SampleConsumer> entry : sampleConsumersByTrackType.entrySet()) {
|
||||
int listenerTrackType = entry.getKey();
|
||||
if (trackType != listenerTrackType) {
|
||||
onMediaItemChanged(listenerTrackType, /* format= */ null);
|
||||
int outputTrackType = entry.getKey();
|
||||
if (trackType != outputTrackType) {
|
||||
onMediaItemChanged(outputTrackType, /* format= */ null);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user