From 941ffef2cac4e9e4ae5a8598bc242b96dd30215e Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sat, 5 Dec 2020 23:45:49 -0600 Subject: [PATCH] Fix final GCC sign warnings --- src/RtpFecQueue.c | 8 ++++---- src/RtpFecQueue.h | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/RtpFecQueue.c b/src/RtpFecQueue.c index 203be7e..f2ee55d 100644 --- a/src/RtpFecQueue.c +++ b/src/RtpFecQueue.c @@ -92,7 +92,7 @@ static bool queuePacket(PRTP_FEC_QUEUE queue, PRTPFEC_QUEUE_ENTRY newEntry, bool // Returns 0 if the frame is completely constructed static int reconstructFrame(PRTP_FEC_QUEUE queue) { - int totalPackets = U16(queue->bufferHighestSequenceNumber - queue->bufferLowestSequenceNumber) + 1; + unsigned int totalPackets = U16(queue->bufferHighestSequenceNumber - queue->bufferLowestSequenceNumber) + 1; int ret; #ifdef FEC_VALIDATION_MODE @@ -150,14 +150,14 @@ static int reconstructFrame(PRTP_FEC_QUEUE queue) { #ifdef FEC_VALIDATION_MODE // Choose a packet to drop - int dropIndex = rand() % queue->bufferDataPackets; + unsigned int dropIndex = rand() % queue->bufferDataPackets; PRTP_PACKET droppedRtpPacket = NULL; int droppedRtpPacketLength = 0; #endif PRTPFEC_QUEUE_ENTRY entry = queue->bufferHead; while (entry != NULL) { - int index = U16(entry->packet->sequenceNumber - queue->bufferLowestSequenceNumber); + unsigned int index = U16(entry->packet->sequenceNumber - queue->bufferLowestSequenceNumber); #ifdef FEC_VALIDATION_MODE if (index == dropIndex) { @@ -181,7 +181,7 @@ static int reconstructFrame(PRTP_FEC_QUEUE queue) { entry = entry->next; } - int i; + unsigned int i; for (i = 0; i < totalPackets; i++) { if (marks[i]) { packets[i] = malloc(packetBufferSize); diff --git a/src/RtpFecQueue.h b/src/RtpFecQueue.h index c9f34a3..92ca3e1 100644 --- a/src/RtpFecQueue.h +++ b/src/RtpFecQueue.h @@ -7,7 +7,7 @@ typedef struct _RTPFEC_QUEUE_ENTRY { int length; bool isParity; uint64_t receiveTimeMs; - unsigned int presentationTimeMs; + uint32_t presentationTimeMs; struct _RTPFEC_QUEUE_ENTRY* next; struct _RTPFEC_QUEUE_ENTRY* prev; @@ -17,17 +17,17 @@ typedef struct _RTP_FEC_QUEUE { PRTPFEC_QUEUE_ENTRY bufferHead; PRTPFEC_QUEUE_ENTRY bufferTail; uint64_t bufferFirstRecvTimeMs; - int bufferSize; - int bufferLowestSequenceNumber; - int bufferHighestSequenceNumber; - int bufferFirstParitySequenceNumber; - int bufferDataPackets; - int bufferParityPackets; - int receivedBufferDataPackets; - int fecPercentage; - int nextContiguousSequenceNumber; + uint32_t bufferSize; + uint32_t bufferLowestSequenceNumber; + uint32_t bufferHighestSequenceNumber; + uint32_t bufferFirstParitySequenceNumber; + uint32_t bufferDataPackets; + uint32_t bufferParityPackets; + uint32_t receivedBufferDataPackets; + uint32_t fecPercentage; + uint32_t nextContiguousSequenceNumber; - unsigned int currentFrameNumber; + uint32_t currentFrameNumber; } RTP_FEC_QUEUE, *PRTP_FEC_QUEUE; #define RTPF_RET_QUEUED 0