mediasoup 3.26.0 → 3.27.0

package/worker/src/RTC/RTP/Packet.cpp

@@ -348,8 +348,7 @@ namespace RTC
 					{
 						MS_DUMP_CLEAN(
 						  indentation + 1,
-						  "  absCaptureTime: id:%" PRIu8 ", absCaptureTimestamp:%" PRIu64
-						  ", estimatedCaptureClockOffset:%" PRId64,
+						  "  absCaptureTime: id:%" PRIu8 ", timestamp:%" PRIu64 ", clock offset:%" PRId64,
 						  this->headerExtensionIds.absCaptureTime,
 						  absCaptureTimestamp,
 						  estimatedCaptureClockOffset);
@@ -364,7 +363,7 @@ namespace RTC
 					{
 						MS_DUMP_CLEAN(
 						  indentation + 1,
-						  "  playoutDelay: id:%" PRIu8 ", minDelay:%" PRIu16 ", maxDelay:%" PRIu16,
+						  "  playoutDelay: id:%" PRIu8 ", min delay:%" PRIu16 ", max delay:%" PRIu16,
 						  this->headerExtensionIds.playoutDelay,
 						  minDelay,
 						  maxDelay);
@@ -378,7 +377,7 @@ namespace RTC
 					{
 						MS_DUMP_CLEAN(
 						  indentation + 1,
-						  "  mediasoupPacketId: id:%" PRIu8 ", mediasoupPacketId:%" PRIu32,
+						  "  mediasoupPacketId: id:%" PRIu8 ", value:%" PRIu32,
 						  this->headerExtensionIds.mediasoupPacketId,
 						  mediasoupPacketId);
 					}
@@ -391,9 +390,9 @@ namespace RTC
 			MS_DUMP_CLEAN(indentation, "  padding length: %" PRIu8, GetPaddingLength());
 			MS_DUMP_CLEAN(indentation, "  padded to 4 bytes: %s", IsPaddedTo4Bytes() ? "yes" : "no");
 
-			if (GetCaptureMs())
+			if (GetCaptureAtUs())
 			{
-				MS_DUMP_CLEAN(indentation, "  capture time (ms):%" PRIu64, GetCaptureMs().value());
+				MS_DUMP_CLEAN(indentation, "  capture time (us): %" PRIi64, GetCaptureAtUs().value());
 			}
 
 			if (this->payloadDescriptorHandler)
@@ -428,7 +427,7 @@ namespace RTC
 			clonedPacket->headerExtensionIds = this->headerExtensionIds;
 
 			// Clone capture time.
-			clonedPacket->captureMs = this->captureMs;
+			clonedPacket->captureAtUs = this->captureAtUs;
 
 			// Assign the payload descriptor handler.
 			clonedPacket->payloadDescriptorHandler = this->payloadDescriptorHandler;
@@ -486,7 +485,7 @@ namespace RTC
 			  rid.empty() ? nullptr : rid.c_str(),
 			  rrid.empty() ? nullptr : rrid.c_str(),
 			  wideSequenceNumberSet ? flatbuffers::Optional<uint16_t>(wideSequenceNumber)
-			                        : flatbuffers::nullopt);
+				                      : flatbuffers::nullopt);
 		}
 
 		void Packet::SetPayloadType(uint8_t payloadType)
@@ -963,7 +962,7 @@ namespace RTC
 			return true;
 		}
 
-		bool Packet::UpdateAbsSendTime(uint64_t ms) const
+		bool Packet::UpdateAbsSendTime(int64_t sentAtUs) const
 		{
 			MS_TRACE();
 
@@ -975,7 +974,7 @@ namespace RTC
 				return false;
 			}
 
-			auto absSendTime = Utils::Time::TimeMsToAbsSendTime(ms);
+			auto absSendTime = Utils::Time::TimeUsToAbsSendTime(sentAtUs);
 
 			Utils::Byte::Set3Bytes(extenValue, 0, absSendTime);
 

package/worker/src/RTC/RTP/RetransmissionBuffer.cpp

@@ -34,7 +34,7 @@ namespace RTC
 		/* Instance methods. */
 
 		RetransmissionBuffer::RetransmissionBuffer(
-		  uint16_t maxItems, uint32_t maxRetransmissionDelayMs, uint32_t clockRate)
+		  uint16_t maxItems, int64_t maxRetransmissionDelayMs, uint32_t clockRate)
 		  : maxItems(maxItems), maxRetransmissionDelayMs(maxRetransmissionDelayMs), clockRate(clockRate)
 		{
 			MS_TRACE();
@@ -589,11 +589,11 @@ namespace RTC
 			// would affect all copies of this SharedRtpPacket by removing their stored
 			// packet. We have to replace it entirely.
 			this->sharedPacket   = RTP::SharedPacket();
-			this->ssrc           = 0u;
-			this->sequenceNumber = 0u;
-			this->timestamp      = 0u;
-			this->resentAtMs     = 0u;
-			this->sentTimes      = 0u;
+			this->ssrc           = 0;
+			this->sequenceNumber = 0;
+			this->timestamp      = 0;
+			this->resentAtMs     = 0;
+			this->sentTimes      = 0;
 		}
 	} // namespace RTP
 } // namespace RTC

package/worker/src/RTC/RTP/RtpStream.cpp

@@ -64,14 +64,14 @@ namespace RTC
 		{
 			MS_TRACE();
 
-			const uint64_t nowMs = this->shared->GetTimeMs();
+			const int64_t nowMs  = this->shared->GetTimeMs();
 			const auto mediaKind = this->params.mimeType.type == RTC::RtpCodecMimeType::Type::AUDIO
 			                         ? FBS::RtpParameters::MediaKind::AUDIO
 			                         : FBS::RtpParameters::MediaKind::VIDEO;
 
 			auto baseStats = FBS::RtpStream::CreateBaseStatsDirect(
 			  builder,
-			  nowMs,
+			  static_cast<uint64_t>(nowMs),
 			  this->params.ssrc,
 			  mediaKind,
 			  this->params.mimeType.ToString().c_str(),
@@ -87,9 +87,9 @@ namespace RTC
 			  this->firCount,
 			  !this->params.rid.empty() ? this->params.rid.c_str() : nullptr,
 			  this->params.rtxSsrc ? flatbuffers::Optional<uint32_t>(this->params.rtxSsrc)
-			                       : flatbuffers::nullopt,
+				                     : flatbuffers::nullopt,
 			  this->rtxStream ? this->rtxStream->GetPacketsDiscarded() : 0,
-			  this->rtt > 0.0f ? this->rtt : 0,
+			  this->rttMs > 0.0f ? this->rttMs : 0,
 			  this->score);
 
 			return FBS::RtpStream::CreateStats(
@@ -137,11 +137,11 @@ namespace RTC
 			{
 				InitSeq(seq);
 
-				this->started            = true;
-				this->maxSeq             = seq - 1;
-				this->maxPacketTs        = packet->GetTimestamp();
-				this->maxPacketMs        = this->shared->GetTimeMs();
-				this->maxPacketCaptureMs = packet->GetCaptureMs();
+				this->started              = true;
+				this->maxSeq               = seq - 1;
+				this->maxPacketTs          = packet->GetTimestamp();
+				this->maxPacketAtUs        = this->shared->GetTimeUs();
+				this->maxPacketCaptureAtUs = packet->GetCaptureAtUs();
 			}
 
 			// If not a valid packet ignore it.
@@ -159,9 +159,9 @@ namespace RTC
 			// Update highest seen RTP timestamp.
 			if (Utils::Number::IsHigherThan<uint32_t>(packet->GetTimestamp(), this->maxPacketTs))
 			{
-				this->maxPacketTs        = packet->GetTimestamp();
-				this->maxPacketMs        = this->shared->GetTimeMs();
-				this->maxPacketCaptureMs = packet->GetCaptureMs();
+				this->maxPacketTs          = packet->GetTimestamp();
+				this->maxPacketAtUs        = this->shared->GetTimeUs();
+				this->maxPacketCaptureAtUs = packet->GetCaptureAtUs();
 			}
 
 			return true;
@@ -228,9 +228,9 @@ namespace RTC
 					  this->maxPacketTs,
 					  packet->GetTimestamp());
 
-					this->maxPacketTs        = packet->GetTimestamp();
-					this->maxPacketMs        = this->shared->GetTimeMs();
-					this->maxPacketCaptureMs = packet->GetCaptureMs();
+					this->maxPacketTs          = packet->GetTimestamp();
+					this->maxPacketAtUs        = this->shared->GetTimeUs();
+					this->maxPacketCaptureAtUs = packet->GetCaptureAtUs();
 				}
 			}
 			// Too old packet received (older than the allowed misorder).
@@ -251,9 +251,9 @@ namespace RTC
 
 					InitSeq(seq);
 
-					this->maxPacketTs        = packet->GetTimestamp();
-					this->maxPacketMs        = this->shared->GetTimeMs();
-					this->maxPacketCaptureMs = packet->GetCaptureMs();
+					this->maxPacketTs          = packet->GetTimestamp();
+					this->maxPacketAtUs        = this->shared->GetTimeUs();
+					this->maxPacketCaptureAtUs = packet->GetCaptureAtUs();
 
 					// Notify the subclass about it.
 					UserOnSequenceNumberReset();
@@ -399,7 +399,7 @@ namespace RTC
 			  this->cname.c_str(),
 			  this->rtxSsrc != 0 ? flatbuffers::Optional<uint32_t>(this->rtxSsrc) : flatbuffers::nullopt,
 			  this->rtxSsrc != 0 ? flatbuffers::Optional<uint8_t>(this->rtxPayloadType)
-			                     : flatbuffers::nullopt,
+				                   : flatbuffers::nullopt,
 			  this->useNack,
 			  this->usePli,
 			  this->useFir,