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

Improve audio FEC queue timeout logic

Browse Source
This commit is contained in:
Cameron Gutman 2021-06-09 00:46:14 -05:00
parent ca7a6e7bbe
commit 7b838dd692
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/RtpAudioQueue.c
View File

@ -17,7 +17,6 @@
void RtpaInitializeQueue(PRTP_AUDIO_QUEUE queue) { void RtpaInitializeQueue(PRTP_AUDIO_QUEUE queue) {
memset(queue, 0, sizeof(*queue)); memset(queue, 0, sizeof(*queue));
queue->maxQueueTimeMs = RTPQ_DEFAULT_QUEUE_TIME;
queue->nextRtpSequenceNumber = UINT16_MAX; queue->nextRtpSequenceNumber = UINT16_MAX;
reed_solomon_init(); reed_solomon_init();
@ -394,8 +393,9 @@ static bool enforceQueueConstraints(PRTP_AUDIO_QUEUE queue) {
return false; return false;
} }
// Check that the queue's time constraint is satisfied // We will consider the FEC block irrecoverably lost if the entire duration of the
if (PltGetMillis() - queue->blockHead->queueTimeMs > queue->maxQueueTimeMs) { // audio in the FEC block has elapsed (plus a little bit) without completing the block.
if (PltGetMillis() - queue->blockHead->queueTimeMs > (AudioPacketDuration * RTPA_DATA_SHARDS) + RTPQ_OOS_WAIT_TIME_MS) {
Limelog("Unable to recover audio data block %u to %u (%u+%u=%u received < %u needed)\n", Limelog("Unable to recover audio data block %u to %u (%u+%u=%u received < %u needed)\n",
queue->blockHead->fecHeader.baseSequenceNumber, queue->blockHead->fecHeader.baseSequenceNumber,
queue->blockHead->fecHeader.baseSequenceNumber + RTPA_DATA_SHARDS - 1, queue->blockHead->fecHeader.baseSequenceNumber + RTPA_DATA_SHARDS - 1,
@ -490,8 +490,11 @@ int RtpaAddPacket(PRTP_AUDIO_QUEUE queue, PRTP_PACKET packet, uint16_t length) {
} }
// We don't have enough to proceed. Let's ensure we haven't // We don't have enough to proceed. Let's ensure we haven't
// violated queue constraints with this FEC block. // violated queue constraints with this FEC block. We will only
if (enforceQueueConstraints(queue)) { // enforce the queue time limit if we have received a packet
// from the next FEC block to ensure we don't needlessly time out
// a block if we aren't getting any other audio data in the meantime.
if (fecBlock != queue->blockHead && enforceQueueConstraints(queue)) {
// Return all available audio data even if there are discontinuities // Return all available audio data even if there are discontinuities
queue->blockHead->allowDiscontinuity = true; queue->blockHead->allowDiscontinuity = true;

6
src/RtpAudioQueue.h
View File

@ -4,7 +4,9 @@
#include "rs.h" #include "rs.h"
#define RTPQ_DEFAULT_QUEUE_TIME 40 // Maximum time to wait for an OOS data/FEC shard
// after the entire FEC block should have been received
#define RTPQ_OOS_WAIT_TIME_MS 10
#define RTPA_DATA_SHARDS 4 #define RTPA_DATA_SHARDS 4
#define RTPA_FEC_SHARDS 2 #define RTPA_FEC_SHARDS 2
@ -48,8 +50,6 @@ typedef struct _RTP_AUDIO_QUEUE {
reed_solomon* rs; reed_solomon* rs;
uint32_t maxQueueTimeMs;
uint16_t nextRtpSequenceNumber; uint16_t nextRtpSequenceNumber;
uint16_t oldestRtpBaseSequenceNumber; uint16_t oldestRtpBaseSequenceNumber;
} RTP_AUDIO_QUEUE, *PRTP_AUDIO_QUEUE; } RTP_AUDIO_QUEUE, *PRTP_AUDIO_QUEUE;