Small tweaks and fixes

worker/src/RTC/RtpStreamSend.cpp

@@ -45,7 +45,7 @@ namespace RTC
 	{
 		auto idx{ static_cast<uint16_t>(seq - this->startSeq) };
 
-		if (this->buffer.empty() || idx >= static_cast<uint16_t>(this->buffer.size()))
+		if (this->buffer.empty() || idx > static_cast<uint16_t>(this->buffer.size() - 1))
 			return nullptr;
 
 		return this->buffer.at(idx);
@@ -61,14 +61,18 @@ namespace RTC
 			return true;
 		}
 
-		auto idx{ static_cast<uint16_t>(seq - this->startSeq) };
-
-		if (idx < static_cast<uint16_t>(this->buffer.size()))
+		if (seq > this->startSeq)
 		{
-			MS_ASSERT(this->buffer[idx] == nullptr, "Must insert into empty slot");
-			this->buffer[idx] = storageItem;
+			auto idx{ static_cast<uint16_t>(seq - this->startSeq) };
 
-			return true;
+			// Packet arrived out of order, so we already have a slot allocated for it.
+			if (idx <= static_cast<uint16_t>(this->buffer.size() - 1))
+			{
+				MS_ASSERT(this->buffer[idx] == nullptr, "Must insert into empty slot");
+				this->buffer[idx] = storageItem;
+
+				return true;
+			}
 		}
 
 		// Calculate how many elements would it be necessary to add when pushing new item to the back of
@@ -442,7 +446,7 @@ namespace RTC
 
 			// Go through all buffer items starting with the first and free all storage
 			// items that contain packets older than `MaxRetransmissionDelay`.
-			for (uint16_t i{ 0 }; i <= MaxSeq; ++i)
+			for (uint32_t i{ 0 }; i <= static_cast<uint32_t>(MaxSeq); ++i)
 			{
 				auto* checkedStorageItem = this->storageItemBuffer.GetFirst();