moonlight-stream/moonlight-common-c
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-common-c.git synced 2026-04-10 09:46:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Derive bufferHighestSequenceNumber from the FEC info to ensure it's always accurate

Browse Source
This commit is contained in:
Cameron Gutman
2018-09-04 20:06:04 -07:00
parent 6e633498c3
commit ea0f06ded0
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/RtpFecQueue.c
View File

@@ -74,7 +74,6 @@ static int queuePacket(PRTP_FEC_QUEUE queue, PRTPFEC_QUEUE_ENTRY newEntry, int h
// Returns 0 if the frame is completely constructed // Returns 0 if the frame is completely constructed
static int reconstructFrame(PRTP_FEC_QUEUE queue) { static int reconstructFrame(PRTP_FEC_QUEUE queue) {
int totalPackets = U16(queue->bufferHighestSequenceNumber - queue->bufferLowestSequenceNumber) + 1; int totalPackets = U16(queue->bufferHighestSequenceNumber - queue->bufferLowestSequenceNumber) + 1;
int totalParityPackets = (queue->bufferDataPackets * queue->fecPercentage + 99) / 100;
int parityPackets = totalPackets - queue->bufferDataPackets; int parityPackets = totalPackets - queue->bufferDataPackets;
int missingPackets = totalPackets - queue->bufferSize; int missingPackets = totalPackets - queue->bufferSize;
int ret; int ret;
@@ -97,7 +96,7 @@ static int reconstructFrame(PRTP_FEC_QUEUE queue) {
goto cleanup; goto cleanup;
} }
rs = reed_solomon_new(queue->bufferDataPackets, totalParityPackets); rs = reed_solomon_new(queue->bufferDataPackets, queue->bufferParityPackets);
// This could happen in an OOM condition, but it could also mean the FEC data // This could happen in an OOM condition, but it could also mean the FEC data
// that we fed to reed_solomon_new() is bogus, so we'll assert to get a better look. // that we fed to reed_solomon_new() is bogus, so we'll assert to get a better look.
@@ -107,8 +106,6 @@ static int reconstructFrame(PRTP_FEC_QUEUE queue) {
goto cleanup; goto cleanup;
} }
rs->shards = queue->bufferDataPackets + missingPackets; //Don't let RS complain about missing parity packets
memset(marks, 1, sizeof(char) * (totalPackets)); memset(marks, 1, sizeof(char) * (totalPackets));
int receiveSize = StreamConfig.packetSize + MAX_RTP_HEADER_SIZE; int receiveSize = StreamConfig.packetSize + MAX_RTP_HEADER_SIZE;
@@ -255,15 +252,16 @@ int RtpfAddPacket(PRTP_FEC_QUEUE queue, PRTP_PACKET packet, int length, PRTPFEC_
queue->bufferLowestSequenceNumber = U16(packet->sequenceNumber - fecIndex); queue->bufferLowestSequenceNumber = U16(packet->sequenceNumber - fecIndex);
queue->receivedBufferDataPackets = 0; queue->receivedBufferDataPackets = 0;
queue->bufferHighestSequenceNumber = packet->sequenceNumber;
queue->bufferDataPackets = (nvPacket->fecInfo & 0xFFC00000) >> 22; queue->bufferDataPackets = (nvPacket->fecInfo & 0xFFC00000) >> 22;
queue->fecPercentage = (nvPacket->fecInfo & 0xFF0) >> 4; queue->fecPercentage = (nvPacket->fecInfo & 0xFF0) >> 4;
queue->bufferParityPackets = (queue->bufferDataPackets * queue->fecPercentage + 99) / 100;
queue->bufferFirstParitySequenceNumber = U16(queue->bufferLowestSequenceNumber + queue->bufferDataPackets); queue->bufferFirstParitySequenceNumber = U16(queue->bufferLowestSequenceNumber + queue->bufferDataPackets);
} else if (isBefore16(queue->bufferHighestSequenceNumber, packet->sequenceNumber)) { queue->bufferHighestSequenceNumber = U16(queue->bufferFirstParitySequenceNumber + queue->bufferParityPackets);
queue->bufferHighestSequenceNumber = packet->sequenceNumber;
} }
LC_ASSERT(U16(packet->sequenceNumber - fecIndex) == queue->bufferLowestSequenceNumber); LC_ASSERT(!queue->fecPercentage || U16(packet->sequenceNumber - fecIndex) == queue->bufferLowestSequenceNumber);
LC_ASSERT(isBefore16(packet->sequenceNumber, queue->bufferHighestSequenceNumber) ||
packet->sequenceNumber == queue->bufferHighestSequenceNumber);
LC_ASSERT((nvPacket->fecInfo & 0xFF0) >> 4 == queue->fecPercentage); LC_ASSERT((nvPacket->fecInfo & 0xFF0) >> 4 == queue->fecPercentage);
LC_ASSERT((nvPacket->fecInfo & 0xFFC00000) >> 22 == queue->bufferDataPackets); LC_ASSERT((nvPacket->fecInfo & 0xFFC00000) >> 22 == queue->bufferDataPackets);

1
src/RtpFecQueue.h
View File

@@ -24,6 +24,7 @@ typedef struct _RTP_FEC_QUEUE {
int bufferHighestSequenceNumber; int bufferHighestSequenceNumber;
int bufferFirstParitySequenceNumber; int bufferFirstParitySequenceNumber;
int bufferDataPackets; int bufferDataPackets;
int bufferParityPackets;
int receivedBufferDataPackets; int receivedBufferDataPackets;
int fecPercentage; int fecPercentage;