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

Remove length prefix on video buffers

Browse Source
This commit is contained in:
Cameron Gutman 2017-06-10 12:41:03 -07:00
parent af6f13c7fa
commit c386569754
5 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Limelight-internal.h
View File

@ -5,6 +5,7 @@
#include "PlatformSockets.h"
#include "PlatformThreads.h"
#include "Video.h"
#include "RtpFecQueue.h"
#include <enet/enet.h>
@ -45,7 +46,7 @@ int performRtspHandshake(void);
void initializeVideoDepacketizer(int pktSize);
void destroyVideoDepacketizer(void);
void processRtpPayload(PNV_VIDEO_PACKET videoPacket, int length);
void queueRtpPacket(PRTP_PACKET rtpPacket, int length);
void queueRtpPacket(PRTPFEC_QUEUE_ENTRY queueEntry);
void stopVideoDepacketizer(void);
void requestDecoderRefresh(void);

27
src/RtpFecQueue.c
View File

@ -28,7 +28,7 @@ void RtpfCleanupQueue(PRTP_FEC_QUEUE queue) {
}
// newEntry is contained within the packet buffer so we free the whole entry by freeing entry->packet
static int queuePacket(PRTP_FEC_QUEUE queue, PRTPFEC_QUEUE_ENTRY newEntry, int head, PRTP_PACKET packet) {
static int queuePacket(PRTP_FEC_QUEUE queue, PRTPFEC_QUEUE_ENTRY newEntry, int head, PRTP_PACKET packet, int length) {
PRTPFEC_QUEUE_ENTRY entry;
LC_ASSERT(!isBefore(packet->sequenceNumber, queue->nextRtpSequenceNumber));
@ -44,6 +44,7 @@ static int queuePacket(PRTP_FEC_QUEUE queue, PRTPFEC_QUEUE_ENTRY newEntry, int h
}
newEntry->packet = packet;
newEntry->length = length;
newEntry->prev = NULL;
newEntry->next = NULL;
@ -113,20 +114,17 @@ static int reconstructFrame(PRTP_FEC_QUEUE queue) {
memset(marks, 1, sizeof(char) * (totalPackets));
int receiveSize = StreamConfig.packetSize + MAX_RTP_HEADER_SIZE;
int packetBufferSize = receiveSize + sizeof(int) + sizeof(RTPFEC_QUEUE_ENTRY);
int packetBufferSize = receiveSize + sizeof(RTPFEC_QUEUE_ENTRY);
PRTPFEC_QUEUE_ENTRY entry = queue->bufferHead;
while (entry != NULL) {
int index = ushort(entry->packet->sequenceNumber - queue->bufferLowestSequenceNumber);
packets[index] = (unsigned char*) entry->packet;
marks[index] = 0;
int size;
memcpy(&size, &packets[index][StreamConfig.packetSize + MAX_RTP_HEADER_SIZE], sizeof(int));
//Set padding to zero
if (size < receiveSize) {
memset(&packets[index][size], 0, receiveSize - size);
if (entry->length < receiveSize) {
memset(&packets[index][entry->length], 0, receiveSize - entry->length);
}
entry = entry->next;
@ -154,7 +152,7 @@ cleanup_packets:
if (marks[i]) {
// Only submit frame data, not FEC packets
if (ret == 0 && i < queue->bufferDataPackets) {
PRTPFEC_QUEUE_ENTRY queueEntry = (PRTPFEC_QUEUE_ENTRY)&packets[i][receiveSize + sizeof(int)];
PRTPFEC_QUEUE_ENTRY queueEntry = (PRTPFEC_QUEUE_ENTRY)&packets[i][receiveSize];
PRTP_PACKET rtpPacket = (PRTP_PACKET) packets[i];
rtpPacket->sequenceNumber = ushort(i + queue->bufferLowestSequenceNumber);
rtpPacket->header = queue->bufferHead->packet->header;
@ -172,9 +170,7 @@ cleanup_packets:
// discarded by decoders. It's not safe to strip all zero padding because
// it may be a legitimate part of the H.264 bytestream.
int size = StreamConfig.packetSize + dataOffset;
memcpy(&packets[i][receiveSize], &size, sizeof(int));
queuePacket(queue, queueEntry, 0, rtpPacket);
queuePacket(queue, queueEntry, 0, rtpPacket, StreamConfig.packetSize + dataOffset);
} else if (packets[i] != NULL) {
free(packets[i]);
}
@ -215,7 +211,7 @@ static void removeEntry(PRTP_FEC_QUEUE queue, PRTPFEC_QUEUE_ENTRY entry) {
queue->queueSize--;
}
int RtpfAddPacket(PRTP_FEC_QUEUE queue, PRTP_PACKET packet, PRTPFEC_QUEUE_ENTRY packetEntry) {
int RtpfAddPacket(PRTP_FEC_QUEUE queue, PRTP_PACKET packet, int length, PRTPFEC_QUEUE_ENTRY packetEntry) {
if (isBefore(packet->sequenceNumber, queue->nextRtpSequenceNumber)) {
// Reject packets behind our current sequence number
return RTPF_RET_REJECTED;
@ -268,7 +264,7 @@ int RtpfAddPacket(PRTP_FEC_QUEUE queue, PRTP_PACKET packet, PRTPFEC_QUEUE_ENTRY
queue->bufferHighestSequenceNumber = packet->sequenceNumber;
}
if (!queuePacket(queue, packetEntry, 0, packet)) {
if (!queuePacket(queue, packetEntry, 0, packet, length)) {
return RTPF_RET_REJECTED;
}
else {
@ -302,7 +298,7 @@ int RtpfAddPacket(PRTP_FEC_QUEUE queue, PRTP_PACKET packet, PRTPFEC_QUEUE_ENTRY
}
}
PRTP_PACKET RtpfGetQueuedPacket(PRTP_FEC_QUEUE queue) {
PRTPFEC_QUEUE_ENTRY RtpfGetQueuedPacket(PRTP_FEC_QUEUE queue) {
PRTPFEC_QUEUE_ENTRY queuedEntry, entry;
// Find the next queued packet
@ -321,7 +317,8 @@ PRTP_PACKET RtpfGetQueuedPacket(PRTP_FEC_QUEUE queue) {
if (queuedEntry != NULL) {
removeEntry(queue, queuedEntry);
return queuedEntry->packet;
queuedEntry->prev = queuedEntry->next = NULL;
return queuedEntry;
} else {
return NULL;
}

5
src/RtpFecQueue.h
View File

@ -4,6 +4,7 @@
typedef struct _RTPFEC_QUEUE_ENTRY {
PRTP_PACKET packet;
int length;
struct _RTPFEC_QUEUE_ENTRY* next;
struct _RTPFEC_QUEUE_ENTRY* prev;
@ -34,5 +35,5 @@ typedef struct _RTP_FEC_QUEUE {
void RtpfInitializeQueue(PRTP_FEC_QUEUE queue);
void RtpfCleanupQueue(PRTP_FEC_QUEUE queue);
int RtpfAddPacket(PRTP_FEC_QUEUE queue, PRTP_PACKET packet, PRTPFEC_QUEUE_ENTRY packetEntry);
PRTP_PACKET RtpfGetQueuedPacket(PRTP_FEC_QUEUE queue);
int RtpfAddPacket(PRTP_FEC_QUEUE queue, PRTP_PACKET packet, int length, PRTPFEC_QUEUE_ENTRY packetEntry);
PRTPFEC_QUEUE_ENTRY RtpfGetQueuedPacket(PRTP_FEC_QUEUE queue);

9
src/VideoDepacketizer.c
View File

@ -574,13 +574,14 @@ void processRtpPayload(PNV_VIDEO_PACKET videoPacket, int length) {
}
// Add an RTP Packet to the queue
void queueRtpPacket(PRTP_PACKET rtpPacket, int length) {
void queueRtpPacket(PRTPFEC_QUEUE_ENTRY queueEntry) {
int dataOffset;
dataOffset = sizeof(*rtpPacket);
if (rtpPacket->header & FLAG_EXTENSION) {
dataOffset = sizeof(*queueEntry->packet);
if (queueEntry->packet->header & FLAG_EXTENSION) {
dataOffset += 4; // 2 additional fields
}
processRtpPayload((PNV_VIDEO_PACKET)(((char*)rtpPacket) + dataOffset), length - dataOffset);
processRtpPayload((PNV_VIDEO_PACKET)(((char*)queueEntry->packet) + dataOffset),
queueEntry->length - dataOffset);
}

16
src/VideoStream.c
View File

@ -65,9 +65,11 @@ static void ReceiveThreadProc(void* context) {
int bufferSize, receiveSize;
char* buffer;
int queueStatus;
int length;
PRTPFEC_QUEUE_ENTRY queueEntry;
receiveSize = StreamConfig.packetSize + MAX_RTP_HEADER_SIZE;
bufferSize = receiveSize + sizeof(int) + sizeof(RTPFEC_QUEUE_ENTRY);
bufferSize = receiveSize + sizeof(RTPFEC_QUEUE_ENTRY);
buffer = NULL;
while (!PltIsThreadInterrupted(&receiveThread)) {
@ -93,19 +95,17 @@ static void ReceiveThreadProc(void* context) {
continue;
}
memcpy(&buffer[receiveSize], &err, sizeof(int));
// RTP sequence number must be in host order for the RTP queue
packet = (PRTP_PACKET)&buffer[0];
packet->sequenceNumber = htons(packet->sequenceNumber);
queueStatus = RtpfAddPacket(&rtpQueue, packet, (PRTPFEC_QUEUE_ENTRY)&buffer[receiveSize + sizeof(int)]);
queueStatus = RtpfAddPacket(&rtpQueue, packet, err, (PRTPFEC_QUEUE_ENTRY)&buffer[receiveSize]);
if (queueStatus == RTPF_RET_QUEUED_PACKETS_READY) {
// The packet queue now has packets ready
while ((buffer = (char*)RtpfGetQueuedPacket(&rtpQueue)) != NULL) {
memcpy(&err, &buffer[receiveSize], sizeof(int));
queueRtpPacket((PRTP_PACKET)buffer, err);
free(buffer);
buffer = NULL;
while ((queueEntry = RtpfGetQueuedPacket(&rtpQueue)) != NULL) {
queueRtpPacket(queueEntry);
free(queueEntry->packet);
}
}
else if (queueStatus == RTPF_RET_QUEUED_NOTHING_READY) {