loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-18 13:09:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Stop using SparseArray where a regular array will do.

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=120240634
This commit is contained in:
olly 2016-04-19 10:07:26 -07:00 committed by Oliver Woodman
parent b5bdbedfd5
commit 69b431b8c2
2 changed files with 29 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/src/main/java/com/google/android/exoplayer/extractor/ExtractorOutput.java
View File

@ -27,7 +27,7 @@ public interface ExtractorOutput {
* <p> * <p>
* Returns a {@link TrackOutput} that will receive track level data belonging to the track. * Returns a {@link TrackOutput} that will receive track level data belonging to the track.
* *
* @param trackId A track identifier. * @param trackId A unique track identifier.
* @return The {@link TrackOutput} that should receive track level data belonging to the track. * @return The {@link TrackOutput} that should receive track level data belonging to the track.
*/ */
TrackOutput track(int trackId); TrackOutput track(int trackId);

59
library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java
View File

@ -35,7 +35,6 @@ import com.google.android.exoplayer.util.Util;
import android.net.Uri; import android.net.Uri;
import android.os.Handler; import android.os.Handler;
import android.util.SparseArray;
import java.io.EOFException; import java.io.EOFException;
import java.io.IOException; import java.io.IOException;
@ -195,7 +194,6 @@ public final class ExtractorSampleSource implements SampleSource, ExtractorOutpu
private final ExtractorHolder extractorHolder; private final ExtractorHolder extractorHolder;
private final Allocator allocator; private final Allocator allocator;
private final int requestedBufferSize; private final int requestedBufferSize;
private final SparseArray<RollingSampleBuffer> sampleQueues;
private final int minLoadableRetryCount; private final int minLoadableRetryCount;
private final Uri uri; private final Uri uri;
private final DataSource dataSource; private final DataSource dataSource;
@ -210,6 +208,7 @@ public final class ExtractorSampleSource implements SampleSource, ExtractorOutpu
private boolean prepared; private boolean prepared;
private boolean seenFirstTrackSelection; private boolean seenFirstTrackSelection;
private int enabledTrackCount; private int enabledTrackCount;
private RollingSampleBuffer[] sampleQueues;
private TrackGroupArray tracks; private TrackGroupArray tracks;
private long durationUs; private long durationUs;
private boolean[] pendingMediaFormat; private boolean[] pendingMediaFormat;
@ -324,8 +323,8 @@ public final class ExtractorSampleSource implements SampleSource, ExtractorOutpu
} }
} }
extractorHolder = new ExtractorHolder(extractors, this); extractorHolder = new ExtractorHolder(extractors, this);
sampleQueues = new SparseArray<>();
pendingResetPositionUs = C.UNSET_TIME_US; pendingResetPositionUs = C.UNSET_TIME_US;
sampleQueues = new RollingSampleBuffer[0];
} }
// SampleSource implementation. // SampleSource implementation.
@ -336,14 +335,14 @@ public final class ExtractorSampleSource implements SampleSource, ExtractorOutpu
return true; return true;
} }
if (seekMap != null && tracksBuilt && haveFormatsForAllTracks()) { if (seekMap != null && tracksBuilt && haveFormatsForAllTracks()) {
int trackCount = sampleQueues.size(); int trackCount = sampleQueues.length;
TrackGroup[] trackArray = new TrackGroup[trackCount]; TrackGroup[] trackArray = new TrackGroup[trackCount];
trackEnabledStates = new boolean[trackCount]; trackEnabledStates = new boolean[trackCount];
pendingResets = new boolean[trackCount]; pendingResets = new boolean[trackCount];
pendingMediaFormat = new boolean[trackCount]; pendingMediaFormat = new boolean[trackCount];
durationUs = seekMap.getDurationUs(); durationUs = seekMap.getDurationUs();
for (int i = 0; i < trackCount; i++) { for (int i = 0; i < trackCount; i++) {
trackArray[i] = new TrackGroup(sampleQueues.valueAt(i).getUpstreamFormat()); trackArray[i] = new TrackGroup(sampleQueues[i].getUpstreamFormat());
} }
tracks = new TrackGroupArray(trackArray); tracks = new TrackGroupArray(trackArray);
if (minLoadableRetryCount == MIN_RETRY_COUNT_DEFAULT_FOR_MEDIA && !seekMap.isSeekable() if (minLoadableRetryCount == MIN_RETRY_COUNT_DEFAULT_FOR_MEDIA && !seekMap.isSeekable()
@ -426,9 +425,9 @@ public final class ExtractorSampleSource implements SampleSource, ExtractorOutpu
return pendingResetPositionUs; return pendingResetPositionUs;
} else { } else {
long largestQueuedTimestampUs = Long.MIN_VALUE; long largestQueuedTimestampUs = Long.MIN_VALUE;
for (int i = 0; i < sampleQueues.size(); i++) { for (RollingSampleBuffer sampleQueue : sampleQueues) {
largestQueuedTimestampUs = Math.max(largestQueuedTimestampUs, largestQueuedTimestampUs = Math.max(largestQueuedTimestampUs,
sampleQueues.valueAt(i).getLargestQueuedTimestampUs()); sampleQueue.getLargestQueuedTimestampUs());
} }
return largestQueuedTimestampUs == Long.MIN_VALUE ? downstreamPositionUs return largestQueuedTimestampUs == Long.MIN_VALUE ? downstreamPositionUs
: largestQueuedTimestampUs; : largestQueuedTimestampUs;
@ -450,7 +449,7 @@ public final class ExtractorSampleSource implements SampleSource, ExtractorOutpu
/* package */ boolean isReady(int track) { /* package */ boolean isReady(int track) {
Assertions.checkState(trackEnabledStates[track]); Assertions.checkState(trackEnabledStates[track]);
return !sampleQueues.valueAt(track).isEmpty(); return sampleQueues[track].isEmpty();
} }
@ -474,7 +473,7 @@ public final class ExtractorSampleSource implements SampleSource, ExtractorOutpu
return TrackStream.NOTHING_READ; return TrackStream.NOTHING_READ;
} }
RollingSampleBuffer sampleQueue = sampleQueues.valueAt(track); RollingSampleBuffer sampleQueue = sampleQueues[track];
if (pendingMediaFormat[track]) { if (pendingMediaFormat[track]) {
formatHolder.format = sampleQueue.getUpstreamFormat(); formatHolder.format = sampleQueue.getUpstreamFormat();
formatHolder.drmInitData = drmInitData; formatHolder.drmInitData = drmInitData;
@ -538,11 +537,9 @@ public final class ExtractorSampleSource implements SampleSource, ExtractorOutpu
@Override @Override
public TrackOutput track(int id) { public TrackOutput track(int id) {
RollingSampleBuffer sampleQueue = sampleQueues.get(id); sampleQueues = Arrays.copyOf(sampleQueues, sampleQueues.length + 1);
if (sampleQueue == null) { RollingSampleBuffer sampleQueue = new RollingSampleBuffer(allocator);
sampleQueue = new RollingSampleBuffer(allocator); sampleQueues[sampleQueues.length - 1] = sampleQueue;
sampleQueues.put(id, sampleQueue);
}
return sampleQueue; return sampleQueue;
} }
@ -565,14 +562,14 @@ public final class ExtractorSampleSource implements SampleSource, ExtractorOutpu
private void seekToInternal(long positionUs) { private void seekToInternal(long positionUs) {
// Treat all seeks into non-seekable media as being to t=0. // Treat all seeks into non-seekable media as being to t=0.
positionUs = !seekMap.isSeekable() ? 0 : positionUs; positionUs = seekMap.isSeekable() ? positionUs : 0;
lastSeekPositionUs = positionUs; lastSeekPositionUs = positionUs;
downstreamPositionUs = positionUs; downstreamPositionUs = positionUs;
Arrays.fill(pendingResets, true); Arrays.fill(pendingResets, true);
// If we're not pending a reset, see if we can seek within the sample queues. // If we're not pending a reset, see if we can seek within the sample queues.
boolean seekInsideBuffer = !isPendingReset(); boolean seekInsideBuffer = !isPendingReset();
for (int i = 0; seekInsideBuffer && i < sampleQueues.size(); i++) { for (int i = 0; seekInsideBuffer && i < sampleQueues.length; i++) {
seekInsideBuffer &= sampleQueues.valueAt(i).skipToKeyframeBefore(positionUs); seekInsideBuffer &= sampleQueues[i].skipToKeyframeBefore(positionUs);
} }
// If we failed to seek within the sample queues, we need to restart. // If we failed to seek within the sample queues, we need to restart.
if (!seekInsideBuffer) { if (!seekInsideBuffer) {
@ -616,18 +613,14 @@ public final class ExtractorSampleSource implements SampleSource, ExtractorOutpu
// We don't know whether we're playing an on-demand or a live stream. For a live stream we // We don't know whether we're playing an on-demand or a live stream. For a live stream we
// need to load from the start, as outlined below. Since we might be playing a live stream, // need to load from the start, as outlined below. Since we might be playing a live stream,
// play it safe and load from the start. // play it safe and load from the start.
for (int i = 0; i < sampleQueues.size(); i++) { clearSampleQueues();
sampleQueues.valueAt(i).clear();
}
loadable.setLoadPosition(0); loadable.setLoadPosition(0);
} else if (!seekMap.isSeekable() && durationUs == C.UNSET_TIME_US) { } else if (!seekMap.isSeekable() && durationUs == C.UNSET_TIME_US) {
// We're playing a non-seekable stream with unknown duration. Assume it's live, and // We're playing a non-seekable stream with unknown duration. Assume it's live, and
// therefore that the data at the uri is a continuously shifting window of the latest // therefore that the data at the uri is a continuously shifting window of the latest
// available media. For this case there's no way to continue loading from where a previous // available media. For this case there's no way to continue loading from where a previous
// load finished, so it's necessary to load from the start whenever commencing a new load. // load finished, so it's necessary to load from the start whenever commencing a new load.
for (int i = 0; i < sampleQueues.size(); i++) { clearSampleQueues();
sampleQueues.valueAt(i).clear();
}
loadable.setLoadPosition(0); loadable.setLoadPosition(0);
// To avoid introducing a discontinuity, we shift the sample timestamps so that they will // To avoid introducing a discontinuity, we shift the sample timestamps so that they will
// continue from the current downstream position. // continue from the current downstream position.
@ -641,15 +634,15 @@ public final class ExtractorSampleSource implements SampleSource, ExtractorOutpu
private int getExtractedSamplesCount() { private int getExtractedSamplesCount() {
int extractedSamplesCount = 0; int extractedSamplesCount = 0;
for (int i = 0; i < sampleQueues.size(); i++) { for (RollingSampleBuffer sampleQueue : sampleQueues) {
extractedSamplesCount += sampleQueues.valueAt(i).getWriteIndex(); extractedSamplesCount += sampleQueue.getWriteIndex();
} }
return extractedSamplesCount; return extractedSamplesCount;
} }
private boolean haveFormatsForAllTracks() { private boolean haveFormatsForAllTracks() {
for (int i = 0; i < sampleQueues.size(); i++) { for (RollingSampleBuffer sampleQueue : sampleQueues) {
if (sampleQueues.valueAt(i).getUpstreamFormat() == null) { if (sampleQueue.getUpstreamFormat() == null) {
return false; return false;
} }
} }
@ -659,19 +652,23 @@ public final class ExtractorSampleSource implements SampleSource, ExtractorOutpu
private void discardSamplesForDisabledTracks() { private void discardSamplesForDisabledTracks() {
for (int i = 0; i < trackEnabledStates.length; i++) { for (int i = 0; i < trackEnabledStates.length; i++) {
if (!trackEnabledStates[i]) { if (!trackEnabledStates[i]) {
sampleQueues.valueAt(i).skipAllSamples(); sampleQueues[i].skipAllSamples();
} }
} }
} }
private void clearState() { private void clearState() {
for (int i = 0; i < sampleQueues.size(); i++) { clearSampleQueues();
sampleQueues.valueAt(i).clear();
}
loadable = null; loadable = null;
fatalException = null; fatalException = null;
} }
private void clearSampleQueues() {
for (RollingSampleBuffer sampleQueue : sampleQueues) {
sampleQueue.clear();
}
}
private boolean isPendingReset() { private boolean isPendingReset() {
return pendingResetPositionUs != C.UNSET_TIME_US; return pendingResetPositionUs != C.UNSET_TIME_US;
} }