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

Fix IDR frame NALU drop race condition

Browse Source
This commit is contained in:
Cameron Gutman 2017-11-18 14:43:04 -08:00
parent b774b47213
commit 37b5ba004c
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -584,7 +584,8 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
@Override @Override
public int submitDecodeUnit(byte[] frameData, int frameLength, int frameNumber, long receiveTimeMs) { public int submitDecodeUnit(byte[] decodeUnitData, int decodeUnitLength, int decodeUnitType,
int frameNumber, long receiveTimeMs) {
totalFrames++; totalFrames++;
// We can receive the same "frame" multiple times if it's an IDR frame. // We can receive the same "frame" multiple times if it's an IDR frame.
@ -618,11 +619,11 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
boolean needsSpsReplay = false; boolean needsSpsReplay = false;
// H264 SPS // H264 SPS
if (frameData[4] == 0x67) { if (decodeUnitData[4] == 0x67) {
numSpsIn++; numSpsIn++;
codecFlags |= MediaCodec.BUFFER_FLAG_CODEC_CONFIG; codecFlags |= MediaCodec.BUFFER_FLAG_CODEC_CONFIG;
ByteBuffer spsBuf = ByteBuffer.wrap(frameData); ByteBuffer spsBuf = ByteBuffer.wrap(decodeUnitData);
// Skip to the start of the NALU data // Skip to the start of the NALU data
spsBuf.position(5); spsBuf.position(5);
@ -728,11 +729,11 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
} }
// Write the annex B header // Write the annex B header
buf.put(frameData, 0, 5); buf.put(decodeUnitData, 0, 5);
// The H264Utils.writeSPS function safely handles // The H264Utils.writeSPS function safely handles
// Annex B NALUs (including NALUs with escape sequences) // Annex B NALUs (including NALUs with escape sequences)
ByteBuffer escapedNalu = H264Utils.writeSPS(sps, frameLength); ByteBuffer escapedNalu = H264Utils.writeSPS(sps, decodeUnitLength);
buf.put(escapedNalu); buf.put(escapedNalu);
if (queueInputBuffer(inputBufferIndex, if (queueInputBuffer(inputBufferIndex,
@ -745,7 +746,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
} }
// H264 PPS // H264 PPS
} else if (frameData[4] == 0x68) { } else if (decodeUnitData[4] == 0x68) {
numPpsIn++; numPpsIn++;
codecFlags |= MediaCodec.BUFFER_FLAG_CODEC_CONFIG; codecFlags |= MediaCodec.BUFFER_FLAG_CODEC_CONFIG;
@ -769,23 +770,23 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
needsSpsReplay = true; needsSpsReplay = true;
} }
} }
else if (frameData[4] == 0x40) { else if (decodeUnitData[4] == 0x40) {
numVpsIn++; numVpsIn++;
// Batch this to submit together with SPS and PPS per AOSP docs // Batch this to submit together with SPS and PPS per AOSP docs
vpsBuffer = new byte[frameLength]; vpsBuffer = new byte[decodeUnitLength];
System.arraycopy(frameData, 0, vpsBuffer, 0, frameLength); System.arraycopy(decodeUnitData, 0, vpsBuffer, 0, decodeUnitLength);
return MoonBridge.DR_OK; return MoonBridge.DR_OK;
} }
else if (frameData[4] == 0x42) { else if (decodeUnitData[4] == 0x42) {
numSpsIn++; numSpsIn++;
// Batch this to submit together with VPS and PPS per AOSP docs // Batch this to submit together with VPS and PPS per AOSP docs
spsBuffer = new byte[frameLength]; spsBuffer = new byte[decodeUnitLength];
System.arraycopy(frameData, 0, spsBuffer, 0, frameLength); System.arraycopy(decodeUnitData, 0, spsBuffer, 0, decodeUnitLength);
return MoonBridge.DR_OK; return MoonBridge.DR_OK;
} }
else if (frameData[4] == 0x44) { else if (decodeUnitData[4] == 0x44) {
numPpsIn++; numPpsIn++;
inputBufferIndex = dequeueInputBuffer(); inputBufferIndex = dequeueInputBuffer();
@ -827,7 +828,7 @@ 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, 0, frameLength); buf.put(decodeUnitData, 0, decodeUnitLength);
if (!queueInputBuffer(inputBufferIndex, if (!queueInputBuffer(inputBufferIndex,
0, buf.position(), 0, buf.position(),

2
moonlight-common

@ -1 +1 @@
Subproject commit 26235fdd504df956d02e39135cd0f0e6e5d496d2 Subproject commit e3d28f9337da95ff3b820fbe9daae2302b98d4be