moonlight-stream/moonlight-common-c
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-common-c.git synced 2025-08-17 17:05:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs discovered by FEC state validation logic

Browse Source
This commit is contained in:
Cameron Gutman 2021-06-02 19:36:57 -05:00
parent 565b170e00
commit d0adb044cf
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/RtpAudioQueue.c
View File

@ -183,7 +183,7 @@ static PRTPA_FEC_BLOCK getFecBlockForRtpPacket(PRTP_AUDIO_QUEUE queue, PRTP_PACK
// If the block is completed, don't return it // If the block is completed, don't return it
return existingBlock->fullyReassembled ? NULL : existingBlock; return existingBlock->fullyReassembled ? NULL : existingBlock;
} }
else if (existingBlock->fecHeader.baseSequenceNumber > fecBlockBaseSeqNum) { else if (isBefore16(fecBlockBaseSeqNum, existingBlock->fecHeader.baseSequenceNumber)) {
// The new block goes right before this one // The new block goes right before this one
break; break;
} }
@ -428,14 +428,16 @@ int RtpaAddPacket(PRTP_AUDIO_QUEUE queue, PRTP_PACKET packet, uint16_t length) {
return 0; return 0;
} }
if ((queue->nextRtpSequenceNumber == UINT16_MAX && queue->oldestRtpBaseSequenceNumber == 0) && // Synchronize the nextRtpSequenceNumber and oldestRtpBaseSequenceNumber values
packet->sequenceNumber != fecBlock->fecHeader.baseSequenceNumber) { // when the connection begins. We want to always start on FEC block boundaries.
// Our first packet was not the start of an FEC block, so go ahead and queue it if (queue->nextRtpSequenceNumber == UINT16_MAX && queue->oldestRtpBaseSequenceNumber == 0) {
// but ensure nextRtpSequenceNumber is set to the start of the FEC block. queue->nextRtpSequenceNumber = queue->oldestRtpBaseSequenceNumber = fecBlock->fecHeader.baseSequenceNumber;
queue->nextRtpSequenceNumber = fecBlock->fecHeader.baseSequenceNumber; validateFecBlockState(queue);
} }
else if ((queue->nextRtpSequenceNumber == UINT16_MAX && queue->oldestRtpBaseSequenceNumber == 0) ||
packet->sequenceNumber == queue->nextRtpSequenceNumber) { // This is the common case - an in-order receive of the next data shard.
// We handle this quickly by telling the caller to immediately consume it.
if (packet->sequenceNumber == queue->nextRtpSequenceNumber) {
queue->nextRtpSequenceNumber = packet->sequenceNumber + 1; queue->nextRtpSequenceNumber = packet->sequenceNumber + 1;
// We are going to return this entry, so update the FEC block // We are going to return this entry, so update the FEC block