jyapayne/moonlight-common-c
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Report frames to the control stream code before FEC reconstruction

Browse source
This commit is contained in:
Cameron Gutman 2020-12-24 11:05:08 -06:00
commit 97ca7b099f
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ControlStream.c
View file

@ -282,6 +282,8 @@ void connectionReceivedCompleteFrame(int frameIndex) {
} }
void connectionSawFrame(int frameIndex) { void connectionSawFrame(int frameIndex) {
LC_ASSERT(!isBefore16(frameIndex, lastSeenFrame));
uint64_t now = PltGetMillis(); uint64_t now = PltGetMillis();
if (now - intervalStartTimeMs >= CONN_STATUS_SAMPLE_PERIOD) { if (now - intervalStartTimeMs >= CONN_STATUS_SAMPLE_PERIOD) {
if (intervalTotalFrameCount != 0) { if (intervalTotalFrameCount != 0) {

4
src/RtpFecQueue.c
View file

@ -434,6 +434,10 @@ int RtpfAddPacket(PRTP_FEC_QUEUE queue, PRTP_PACKET packet, int length, PRTPFEC_
queue->currentFrameNumber = nvPacket->frameIndex; queue->currentFrameNumber = nvPacket->frameIndex;
// Tell the control stream logic about this frame, even if we don't end up
// being able to reconstruct a full frame from it.
connectionSawFrame(queue->currentFrameNumber);
// Discard any unsubmitted buffers from the previous frame // Discard any unsubmitted buffers from the previous frame
while (queue->bufferHead != NULL) { while (queue->bufferHead != NULL) {
PRTPFEC_QUEUE_ENTRY entry = queue->bufferHead; PRTPFEC_QUEUE_ENTRY entry = queue->bufferHead;

3
src/VideoDepacketizer.c
View file

@ -531,9 +531,6 @@ static void processRtpPayload(PNV_VIDEO_PACKET videoPacket, int length,
return; return;
} }
// Notify the listener of the latest frame we've seen from the PC
connectionSawFrame(frameIndex);
// Verify that we didn't receive an incomplete frame // Verify that we didn't receive an incomplete frame
LC_ASSERT(firstPacket ^ decodingFrame); LC_ASSERT(firstPacket ^ decodingFrame);