Add sender report trace event

versatica · Dec 15, 2023 · e6b9762 · e6b9762
1 parent bc55f22
commit e6b9762
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 1 deletion.
diff --git a/node/src/Producer.ts b/node/src/Producer.ts
@@ -52,7 +52,7 @@ export type ProducerOptions<ProducerAppData extends AppData = AppData> =
 /**
  * Valid types for 'trace' event.
  */
-export type ProducerTraceEventType = 'rtp' | 'keyframe' | 'nack' | 'pli' | 'fir';
+export type ProducerTraceEventType = 'rtp' | 'keyframe' | 'nack' | 'pli' | 'fir' | 'sr';
 
 /**
  * 'trace' event data.
@@ -670,6 +670,8 @@ function producerTraceEventTypeToFbs(eventType: ProducerTraceEventType)
 			return FbsProducer.TraceEventType.PLI;
 		case 'rtp':
 			return FbsProducer.TraceEventType.RTP;
+		case 'sr':
+			return FbsProducer.TraceEventType.SR;
 		default:
 			throw new TypeError(`invalid ProducerTraceEventType: ${eventType}`);
 	}
@@ -690,6 +692,8 @@ function producerTraceEventTypeFromFbs(eventType: FbsProducer.TraceEventType)
 			return 'pli';
 		case FbsProducer.TraceEventType.RTP:
 			return 'rtp';
+		case FbsProducer.TraceEventType.SR:
+			return 'sr';
 	}
 }
 

diff --git a/worker/fbs/producer.fbs b/worker/fbs/producer.fbs
@@ -11,6 +11,7 @@ enum TraceEventType: uint8 {
     NACK,
     PLI,
     RTP,
+    SR,
 }
 
 table EnableTraceEventRequest {
@@ -60,6 +61,7 @@ union TraceInfo {
     FirTraceInfo,
     PliTraceInfo,
     RtpTraceInfo,
+    SRTraceInfo,
 }
 
 table KeyFrameTraceInfo {
@@ -80,6 +82,15 @@ table RtpTraceInfo {
     is_rtx: bool;
 }
 
+table SRTraceInfo {
+    ssrc: uint32;
+    ntp_sec: uint32;
+    ntp_frac: uint32;
+    rtp_ts: uint32;
+    packet_count: uint32;
+    octet_count: uint32;
+}
+
 table TraceNotification {
     type: TraceEventType;
     timestamp: uint64;

diff --git a/worker/include/RTC/Producer.hpp b/worker/include/RTC/Producer.hpp
@@ -89,6 +89,7 @@ namespace RTC
 			bool nack{ false };
 			bool pli{ false };
 			bool fir{ false };
+			bool sr{ false };
 		};
 
 	public:
@@ -160,6 +161,7 @@ namespace RTC
 		void EmitTraceEventPliType(uint32_t ssrc) const;
 		void EmitTraceEventFirType(uint32_t ssrc) const;
 		void EmitTraceEventNackType() const;
+		void EmitTraceEventSRType(RTC::RTCP::SenderReport* report) const;
 		void EmitTraceEvent(flatbuffers::Offset<FBS::Producer::TraceNotification>& notification) const;
 
 		/* Pure virtual methods inherited from RTC::RtpStreamRecv::Listener. */

diff --git a/worker/src/RTC/Producer.cpp b/worker/src/RTC/Producer.cpp
@@ -486,6 +486,12 @@ namespace RTC
 						{
 							newTraceEventTypes.rtp = true;
 
+							break;
+						}
+						case FBS::Producer::TraceEventType::SR:
+						{
+							newTraceEventTypes.sr = true;
+
 							break;
 						}
 					}
@@ -706,6 +712,8 @@ namespace RTC
 
 			this->listener->OnProducerRtcpSenderReport(this, rtpStream, first);
 
+			EmitTraceEventSRType(report);
+
 			return;
 		}
 
@@ -1576,6 +1584,35 @@ namespace RTC
 		EmitTraceEvent(notification);
 	}
 
+	inline void Producer::EmitTraceEventSRType(RTC::RTCP::SenderReport* report) const
+	{
+		MS_TRACE();
+
+		if (!this->traceEventTypes.sr)
+		{
+			return;
+		}
+
+		auto traceInfo = FBS::Producer::CreateSRTraceInfo(
+		  this->shared->channelNotifier->GetBufferBuilder(),
+		  report->GetSsrc(),
+		  report->GetNtpSec(),
+		  report->GetNtpFrac(),
+		  report->GetRtpTs(),
+		  report->GetPacketCount(),
+		  report->GetOctetCount());
+
+		auto notification = FBS::Producer::CreateTraceNotification(
+		  this->shared->channelNotifier->GetBufferBuilder(),
+		  FBS::Producer::TraceEventType::SR,
+		  DepLibUV::GetTimeMs(),
+		  FBS::Common::TraceDirection::DIRECTION_IN,
+		  FBS::Producer::TraceInfo::SRTraceInfo,
+		  traceInfo.Union());
+
+		EmitTraceEvent(notification);
+	}
+
 	inline void Producer::EmitTraceEvent(
 	  flatbuffers::Offset<FBS::Producer::TraceNotification>& notification) const
 	{