loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #147 from jonasl/dev-gc

Browse Source 
MediaCodecTrackRenderer: Avoid excessive garbage generation
This commit is contained in:
ojw28 2014-11-19 16:08:38 +00:00
commit d506d7660d
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
library/src/main/java/com/google/android/exoplayer/MediaCodecTrackRenderer.java
View File

@ -30,7 +30,8 @@ import android.os.SystemClock;
import java.io.IOException; import java.io.IOException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.HashSet; import java.util.ArrayList;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
@ -141,7 +142,7 @@ public abstract class MediaCodecTrackRenderer extends TrackRenderer {
private final SampleSource source; private final SampleSource source;
private final SampleHolder sampleHolder; private final SampleHolder sampleHolder;
private final MediaFormatHolder formatHolder; private final MediaFormatHolder formatHolder;
private final HashSet<Long> decodeOnlyPresentationTimestamps; private final List<Long> decodeOnlyPresentationTimestamps;
private final MediaCodec.BufferInfo outputBufferInfo; private final MediaCodec.BufferInfo outputBufferInfo;
private final EventListener eventListener; private final EventListener eventListener;
protected final Handler eventHandler; protected final Handler eventHandler;
@ -191,7 +192,7 @@ public abstract class MediaCodecTrackRenderer extends TrackRenderer {
codecCounters = new CodecCounters(); codecCounters = new CodecCounters();
sampleHolder = new SampleHolder(SampleHolder.BUFFER_REPLACEMENT_MODE_DISABLED); sampleHolder = new SampleHolder(SampleHolder.BUFFER_REPLACEMENT_MODE_DISABLED);
formatHolder = new MediaFormatHolder(); formatHolder = new MediaFormatHolder();
decodeOnlyPresentationTimestamps = new HashSet<Long>(); decodeOnlyPresentationTimestamps = new ArrayList<Long>();
outputBufferInfo = new MediaCodec.BufferInfo(); outputBufferInfo = new MediaCodec.BufferInfo();
} }
@ -736,12 +737,11 @@ public abstract class MediaCodecTrackRenderer extends TrackRenderer {
return false; return false;
} }
boolean decodeOnly = decodeOnlyPresentationTimestamps.contains( int decodeOnlyIdx = getDecodeOnlyIndex(outputBufferInfo.presentationTimeUs);
outputBufferInfo.presentationTimeUs);
if (processOutputBuffer(positionUs, elapsedRealtimeUs, codec, outputBuffers[outputIndex], if (processOutputBuffer(positionUs, elapsedRealtimeUs, codec, outputBuffers[outputIndex],
outputBufferInfo, outputIndex, decodeOnly)) { outputBufferInfo, outputIndex, decodeOnlyIdx >= 0)) {
if (decodeOnly) { if (decodeOnlyIdx >= 0) {
decodeOnlyPresentationTimestamps.remove(outputBufferInfo.presentationTimeUs); decodeOnlyPresentationTimestamps.remove(decodeOnlyIdx);
} else { } else {
currentPositionUs = outputBufferInfo.presentationTimeUs; currentPositionUs = outputBufferInfo.presentationTimeUs;
} }
@ -785,4 +785,13 @@ public abstract class MediaCodecTrackRenderer extends TrackRenderer {
} }
} }
private int getDecodeOnlyIndex(long presentationTimeUs) {
final int size = decodeOnlyPresentationTimestamps.size();
for (int i = 0; i < size; i++) {
if (decodeOnlyPresentationTimestamps.get(i).longValue() == presentationTimeUs) {
return i;
}
}
return -1;
}
} }