moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2025-07-19 19:13:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash queuing input buffer on stop

Browse Source
This commit is contained in:
Cameron Gutman 2017-05-17 20:09:11 -07:00
parent 32b787e77c
commit bafa2addd3
1 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
app/src/main/java/com/limelight/binding/video/MediaCodecDecoderRenderer.java
View File

@ -351,7 +351,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
startTime = MediaCodecHelper.getMonotonicMillis(); startTime = MediaCodecHelper.getMonotonicMillis();
while (rendererThread.isAlive() && index < 0) { while (rendererThread.isAlive() && index < 0 && !stopping) {
index = videoDecoder.dequeueInputBuffer(10000); index = videoDecoder.dequeueInputBuffer(10000);
} }
@ -390,7 +390,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
} }
} }
private void queueInputBuffer(int inputBufferIndex, int offset, int length, long timestampUs, int codecFlags) { private boolean queueInputBuffer(int inputBufferIndex, int offset, int length, long timestampUs, int codecFlags) {
// Try 25 times to submit the input buffer before throwing a real exception // Try 25 times to submit the input buffer before throwing a real exception
int i; int i;
Exception lastException = null; Exception lastException = null;
@ -407,9 +407,17 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
} }
} }
if (i == 25) { if (i == 25 && totalFrames > 0 && totalFrames < 20 && !stopping) {
throw new RendererException(this, lastException, null, codecFlags); throw new RendererException(this, lastException, null, codecFlags);
} }
else if (i != 25) {
// Queued input buffer
return true;
}
else {
// Failed to queue
return false;
}
} }
// Using the new getInputBuffer() API on Lollipop allows // Using the new getInputBuffer() API on Lollipop allows
@ -576,11 +584,14 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
ByteBuffer escapedNalu = H264Utils.writeSPS(sps, frameData.length); ByteBuffer escapedNalu = H264Utils.writeSPS(sps, frameData.length);
buf.put(escapedNalu); buf.put(escapedNalu);
queueInputBuffer(inputBufferIndex, if (queueInputBuffer(inputBufferIndex,
0, buf.position(), 0, buf.position(),
timestampUs, codecFlags); timestampUs, codecFlags)) {
return MoonBridge.DR_OK;
return MoonBridge.DR_OK; }
else {
return MoonBridge.DR_NEED_IDR;
}
// H264 PPS // H264 PPS
} else if (frameData[4] == 0x68) { } else if (frameData[4] == 0x68) {
@ -612,19 +623,29 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
// Copy data from our buffer list into the input buffer // Copy data from our buffer list into the input buffer
buf.put(frameData); buf.put(frameData);
queueInputBuffer(inputBufferIndex, if (!queueInputBuffer(inputBufferIndex,
0, frameData.length, 0, frameData.length,
timestampUs, codecFlags); timestampUs, codecFlags)) {
return MoonBridge.DR_NEED_IDR;
}
if (needsSpsReplay) { if (needsSpsReplay) {
replaySps(); if (!replaySps()) {
return MoonBridge.DR_NEED_IDR;
}
LimeLog.info("SPS replay complete");
} }
return MoonBridge.DR_OK; return MoonBridge.DR_OK;
} }
private void replaySps() { private boolean replaySps() {
int inputIndex = dequeueInputBuffer(); int inputIndex = dequeueInputBuffer();
if (inputIndex < 0) {
return false;
}
ByteBuffer inputBuffer = getEmptyInputBuffer(inputIndex); ByteBuffer inputBuffer = getEmptyInputBuffer(inputIndex);
// Write the Annex B header // Write the Annex B header
@ -645,12 +666,10 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
savedSps = null; savedSps = null;
// Queue the new SPS // Queue the new SPS
queueInputBuffer(inputIndex, return queueInputBuffer(inputIndex,
0, inputBuffer.position(), 0, inputBuffer.position(),
System.nanoTime() / 1000, System.nanoTime() / 1000,
MediaCodec.BUFFER_FLAG_CODEC_CONFIG); MediaCodec.BUFFER_FLAG_CODEC_CONFIG);
LimeLog.info("SPS replay complete");
} }
@Override @Override