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

Fix handling packet loss in the second of a split frame

Browse Source
This commit is contained in:
Cameron Gutman 2014-03-13 01:31:47 -04:00
parent 4cbaee6806
commit 7e30d043eb
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
moonlight-common/src/com/limelight/nvstream/av/video/VideoDepacketizer.java
View File

@ -21,6 +21,7 @@ public class VideoDepacketizer {
private int nextPacketNumber;
private int startFrameNumber = 1;
private boolean waitingForNextSuccessfulFrame;
private boolean gotNextFrameStart;
// Cached objects
private ByteBufferDescriptor cachedDesc = new ByteBufferDescriptor(null, 0, 0);
@ -179,13 +180,10 @@ public class VideoDepacketizer {
avcFrameDataLength = 0;
}
// FIXME: This check shouldn't be needed
if (avcFrameDataChain != null) {
// Add the payload data to the chain
avcFrameDataChain.add(location);
avcFrameDataLength += location.length;
}
}
public void addInputData(VideoPacket packet)
{
@ -232,6 +230,7 @@ public class VideoDepacketizer {
// Tell the encoder when we're done decoding this frame
// that we lost some previous frames
waitingForNextSuccessfulFrame = true;
gotNextFrameStart = false;
}
else {
LimeLog.warning("Got packet "+packetIndex+" of frame "+frameIndex+
@ -239,6 +238,7 @@ public class VideoDepacketizer {
" of frame "+nextFrameNumber);
// We dropped the start of this frame too
waitingForNextSuccessfulFrame = true;
gotNextFrameStart = false;
// Try to pickup on the next frame
nextFrameNumber = frameIndex + 1;
@ -258,6 +258,7 @@ public class VideoDepacketizer {
LimeLog.warning("Frame "+frameIndex+": expected packet "+nextPacketNumber+" but got "+packetIndex);
// At this point, we're guaranteed that it's not FEC data that we lost
waitingForNextSuccessfulFrame = true;
gotNextFrameStart = false;
// Skip this frame
nextFrameNumber++;
@ -266,6 +267,24 @@ public class VideoDepacketizer {
return;
}
if (waitingForNextSuccessfulFrame) {
if (!gotNextFrameStart) {
if (!firstPacket) {
// We're waiting for the next frame, but this one is a fragment of a frame
// so we must discard it and wait for the next one
LimeLog.warning("Expected start of frame "+frameIndex);
nextFrameNumber = frameIndex + 1;
nextPacketNumber = 0;
clearAvcFrameState();
return;
}
else {
gotNextFrameStart = true;
}
}
}
nextPacketNumber++;
// Remove extra padding