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

Return the oldest packet instead of removing it upon RTP queue constraint violation

Browse Source
This commit is contained in:
Cameron Gutman 2016-05-07 20:26:44 -04:00
parent 537a50bee5
commit 3c11ff63a7
1 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
moonlight-common/src/com/limelight/nvstream/av/RtpReorderQueue.java
View File

@ -14,7 +14,6 @@ public class RtpReorderQueue {
private short nextRtpSequenceNumber;
private long oldestQueuedTime;
private RtpQueueEntry oldestQueuedEntry;
public enum RtpQueueStatus {
HANDLE_IMMEDIATELY,
@ -65,7 +64,6 @@ public class RtpReorderQueue {
if (oldestQueuedTime == Long.MAX_VALUE) {
oldestQueuedTime = entry.queueTime;
oldestQueuedEntry = entry;
}
// Add a reference to the packet while it's in the queue
@ -83,10 +81,8 @@ public class RtpReorderQueue {
private void updateOldestQueued() {
oldestQueuedTime = Long.MAX_VALUE;
oldestQueuedEntry = null;
for (RtpQueueEntry entry : queue) {
if (entry.queueTime < oldestQueuedTime) {
oldestQueuedEntry = entry;
oldestQueuedTime = entry.queueTime;
}
}
@ -114,36 +110,28 @@ public class RtpReorderQueue {
return lowestSeqEntry;
}
private void removeEntry(RtpQueueEntry entry) {
queue.remove(entry);
entry.packet.dereferencePacket();
}
private RtpQueueEntry validateQueueConstraints() {
if (queue.isEmpty()) {
return null;
}
boolean needsUpdate = false;
boolean dequeuePacket = false;
// Check that the queue's time constraint is satisfied
if (TimeHelper.getMonotonicMillis() - oldestQueuedTime > maxQueueTime) {
LimeLog.info("Discarding RTP packet queued for too long: "+(TimeHelper.getMonotonicMillis() - oldestQueuedTime));
removeEntry(oldestQueuedEntry);
needsUpdate = true;
LimeLog.info("Returning RTP packet queued for too long: "+(TimeHelper.getMonotonicMillis() - oldestQueuedTime));
dequeuePacket = true;
}
// Check that the queue's size constraint is satisfied
if (queue.size() == maxSize) {
// Check that the queue's size constraint is satisfied. We subtract one
// because this is validating that the queue will meet constraints _after_
// the current packet is enqueued.
if (!dequeuePacket && queue.size() == maxSize - 1) {
LimeLog.info("Discarding RTP packet after queue overgrowth");
removeEntry(oldestQueuedEntry);
needsUpdate = true;
dequeuePacket = true;
}
if (needsUpdate) {
// Recalculate the oldest entry if needed
updateOldestQueued();
if (dequeuePacket) {
// Return the lowest seq queued
return getEntryByLowestSeq();
}