Keep up with master

paulomorgado · paulomorgado · commit 1817b385dd3c · 2025-03-18T08:23:32.000Z
diff --git a/src/app/Media/MediaLoggingExtensions.cs b/src/app/Media/MediaLoggingExtensions.cs
@@ -36,10 +36,23 @@ public static partial void LogSendingAudioSteamLength(
 
         [LoggerMessage(
             EventId = 0,
-            EventName = "RtpMediaPacketReceived",
+            EventName = "RtpAudioPacketReceived",
             Level = LogLevel.Trace,
             Message = "audio RTP packet received from {RemoteEndPoint} ssrc {SyncSource} seqnum {SequenceNumber} timestamp {Timestamp} payload type {PayloadType}.")]
-        public static partial void LogRtpMediaPacketReceived(
+        public static partial void LogRtpAudioPacketReceived(
+            this ILogger logger,
+            IPEndPoint remoteEndPoint,
+            uint syncSource,
+            ushort sequenceNumber,
+            uint timestamp,
+            int payloadType);
+
+        [LoggerMessage(
+            EventId = 0,
+            EventName = "RtpTextPacketReceived",
+            Level = LogLevel.Trace,
+            Message = "RtpMediaPacketReceived text RTP packet received from {RemoteEndPoint} ssrc {SyncSource} seqnum {SequenceNumber} timestamp {Timestamp} payload type {PayloadType}.")]
+        public static partial void LogRtpTextPacketReceived(
             this ILogger logger,
             IPEndPoint remoteEndPoint,
             uint syncSource,
@@ -77,6 +90,16 @@ public static partial void LogSettingVideoFormat(
             int videoFormatID,
             VideoCodecsEnum videoCodec);
 
+        [LoggerMessage(
+            EventId = 0,
+            EventName = "TextFormatNegotiated",
+            Level = LogLevel.Debug,
+            Message = "Setting text sink and source format to {TextFormatID}:{TextCodec}")]
+        public static partial void LogTextFormatNegotiated(
+            this ILogger logger,
+            int textFormatID,
+            TextCodecsEnum textCodec);
+
         [LoggerMessage(
             EventId = 0,
             EventName = "AudioTrackDtmfNegotiated",
diff --git a/src/app/Media/VoIPMediaSession.cs b/src/app/Media/VoIPMediaSession.cs
@@ -225,7 +225,7 @@ private void VideoFormatsNegotiated(List<VideoFormat> videoFormats)
         private void TextFormatsNegotiated(List<TextFormat> textFormats)
         {
             var textFormat = textFormats.First();
-            logger.LogDebug("Setting text sink and source format to {TextFormatID}:{TextCodec}.", textFormat.FormatID, textFormat.Codec);
+            logger.LogTextFormatNegotiated(textFormat.FormatID, textFormat.Codec);
             Media.TextSource?.SetTextSourceFormat(textFormat);
         }
 
@@ -336,13 +336,13 @@ protected void RtpMediaPacketReceived(IPEndPoint remoteEndPoint, SDPMediaTypesEn
 
             if (mediaType == SDPMediaTypesEnum.audio && Media.AudioSink != null)
             {
-                logger.LogRtpMediaPacketReceived(remoteEndPoint, hdr.SyncSource, hdr.SequenceNumber, hdr.Timestamp, hdr.PayloadType);
+                logger.LogRtpAudioPacketReceived(remoteEndPoint, hdr.SyncSource, hdr.SequenceNumber, hdr.Timestamp, hdr.PayloadType);
 
                 Media.AudioSink.GotAudioRtp(remoteEndPoint, hdr.SyncSource, hdr.SequenceNumber, hdr.Timestamp, hdr.PayloadType, marker, rtpPacket.Payload);
             }
             else if (mediaType == SDPMediaTypesEnum.text && Media.TextSink != null)
             {
-                logger.LogTrace(nameof(RtpMediaPacketReceived) + " text RTP packet received from {RemoteEndPoint} ssrc {SyncSource} seqnum {SequenceNumber} timestamp {Timestamp} payload type {PayloadType}.", remoteEndPoint, hdr.SyncSource, hdr.SequenceNumber, hdr.Timestamp, hdr.PayloadType);
+                logger.LogRtpTextPacketReceived(remoteEndPoint, hdr.SyncSource, hdr.SequenceNumber, hdr.Timestamp, hdr.PayloadType);
 
                 Media.TextSink.GotTextRtp(remoteEndPoint, hdr.SyncSource, hdr.SequenceNumber, hdr.Timestamp, hdr.PayloadType, hdr.MarkerBit, rtpPacket.Payload);
             }
diff --git a/src/app/SIPUserAgents/SIPUserAgent.cs b/src/app/SIPUserAgents/SIPUserAgent.cs
@@ -1210,15 +1210,15 @@ static bool IsTwoWayStream(SDPMediaAnnouncement m, SDPMediaTypesEnum type) =>
 
             if (offerHasStream && !mediaSessionHasStream)
             {
-                logger.LogDebug("Re-INVITE remote party added {Type} stream.", type);
+                logger.LogReInviteRemotePartyStreamAdded(type);
                 if (OnRemoteMediaStreamAdded?.Invoke(type) ?? false)
                 {
                     streamAdded = true;
                 }
             }
             else if (!offerHasStream && mediaSessionHasStream)
             {
-                logger.LogDebug("Re-INVITE remote party removed {Type} stream.", type);
+                logger.LogReInviteRemotePartyStreamRemoved(type);
                 OnRemoteMediaStreamRemoved?.Invoke(type);
             }
         }
diff --git a/src/app/SIPUserAgents/SipUserAgentsLoggingExtensions.cs b/src/app/SIPUserAgents/SipUserAgentsLoggingExtensions.cs
@@ -1564,5 +1564,23 @@ public static partial void LogUserAgentStart(
         public static partial void LogUserAgentStop(
             this ILogger logger,
             string id);
+
+        [LoggerMessage(
+            EventId = 1,
+            EventName = "ReInviteRemotePartyStreamAdded", 
+            Level = LogLevel.Debug,
+            Message = "Re-INVITE remote party added {Type} stream.")]
+        public static partial void LogReInviteRemotePartyStreamAdded(
+            this ILogger logger,
+            SDPMediaTypesEnum type);
+
+        [LoggerMessage(
+            EventId = 2,
+            EventName = "ReInviteRemotePartyStreamRemoved", 
+            Level = LogLevel.Debug,
+            Message = "Re-INVITE remote party removed {Type} stream.")]
+        public static partial void LogReInviteRemotePartyStreamRemoved(
+            this ILogger logger,
+            SDPMediaTypesEnum type);
     }
 }
diff --git a/src/net/RTP/NetRtpLoggingExtensions.cs b/src/net/RTP/NetRtpLoggingExtensions.cs
@@ -376,7 +376,7 @@ public static partial void LogRtpSrtpRtcpUnprotectFailed(
             EventId = 0,
             EventName = "RtpSrtpRtcpProtectFailed",
             Level = LogLevel.Warning,
-            Message = "SRTP RTCP packet protection failed, result {rtpError}.")] 
+            Message = "SRTP RTCP packet protection failed, result {rtpError}.")]
         public static partial void LogRtpSrtpRtcpProtectFailed(
             this ILogger logger,
             int rtpError);
@@ -390,7 +390,7 @@ public static partial void LogRtpSrtpReportNotReady(
             this ILogger logger);
 
         [LoggerMessage(
-            EventId = 0, 
+            EventId = 0,
             EventName = "RtpInvalidPortNumber",
             Level = LogLevel.Warning,
             Message = "Remote {sdpMediaType} announcement contained an invalid port number {port}.")]
@@ -457,7 +457,7 @@ public static partial void LogRtpSecureMediaInvalidTransport(
 
         [LoggerMessage(
             EventId = 0,
-            EventName = "RtpSecureMediaIncompatibleCrypto", 
+            EventName = "RtpSecureMediaIncompatibleCrypto",
             Level = LogLevel.Error,
             Message = "Error negotiating secure media for type {mediaType}. Incompatible crypto parameter.")]
         public static partial void LogRtpSecureMediaIncompatibleCrypto(
@@ -467,7 +467,7 @@ public static partial void LogRtpSecureMediaIncompatibleCrypto(
         [LoggerMessage(
             EventId = 0,
             EventName = "RtpSecureMediaNoCompatibleCrypto",
-            Level = LogLevel.Error, 
+            Level = LogLevel.Error,
             Message = "Error negotiating secure media. No compatible crypto suite.")]
         public static partial void LogRtpSecureMediaNoCompatibleCrypto(
             this ILogger logger);
@@ -531,7 +531,7 @@ public static partial void LogRtpEndReceiveFromWarning(
 
         [LoggerMessage(
             EventId = 0,
-            EventName = "RtpEndReceiveFromError",  
+            EventName = "RtpEndReceiveFromError",
             Level = LogLevel.Error,
             Message = "Exception UdpReceiver.EndReceiveFrom. {errorMessage}")]
         public static partial void LogRtpEndReceiveFromError(
@@ -547,8 +547,36 @@ public static partial void LogRtpEndReceiveFromError(
         public static partial void LogRtpUnknownVideo(
             this ILogger logger,
             ushort sequenceNumber,
-            uint timestamp, 
+            uint timestamp,
             int markerBit,
             int payloadLength);
+
+        [LoggerMessage(
+            EventId = 0,
+            EventName = "RtpEventInProgress",
+            Level = LogLevel.Warning,
+            Message = "An RTPEvent is in progress.")]
+        public static partial void LogRtpEventInProgress(
+            this ILogger logger);
+
+        [LoggerMessage(
+            EventId = 2,
+            EventName = "SendT140FrameSocketError",
+            Level = LogLevel.Error,
+            Message = "SocketException SendT140Frame. {ErrorMessage}")]
+        public static partial void LogSendT140FrameSocketError(
+            this ILogger logger,
+            string errorMessage,
+            Exception ex);
+
+        [LoggerMessage(
+            EventId = 2,
+            EventName = "SendMJEPGFrameSocketError",
+            Level = LogLevel.Error,
+            Message = "SocketException SendMJEPGFrame. {ErrorMessage}")]
+        public static partial void LogSendMJEPGFrameSocketError(
+            this ILogger logger,
+            string errorMessage,
+            Exception ex);
     }
 }
diff --git a/src/net/RTP/TextStream.cs b/src/net/RTP/TextStream.cs
@@ -53,7 +53,7 @@ private void SendTextFrame(int payloadTypeID, byte[] buffer)
             {
                 if (rtpEventInProgress)
                 {
-                    logger.LogWarning("An RTPEvent is in progress.");
+                    logger.LogRtpEventInProgress();
                     return;
                 }
 
@@ -93,7 +93,7 @@ private void SendTextFrame(int payloadTypeID, byte[] buffer)
                 }
                 catch (SocketException sockExcp)
                 {
-                    logger.LogError(sockExcp, "SocketException SendT140Frame. {ErrorMessage}", sockExcp.Message);
+                    logger.LogSendT140FrameSocketError(sockExcp.Message, sockExcp);
                 }
             }
         }
diff --git a/src/net/RTP/VideoStream.cs b/src/net/RTP/VideoStream.cs
@@ -288,7 +288,7 @@ public void SendMJPEGFrame(uint durationRtpUnits, int payloadID, byte[] sample)
                 }
                 catch (SocketException sockExcp)
                 {
-                    logger.LogError("SocketException SendMJEPGFrame. " + sockExcp.Message);
+                    logger.LogSendMJEPGFrameSocketError(sockExcp.Message, sockExcp);
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -225,7 +225,7 @@ private void VideoFormatsNegotiated(List<VideoFormat> videoFormats)`
`225`	`225`	`private void TextFormatsNegotiated(List<TextFormat> textFormats)`
`226`	`226`	`{`
`227`	`227`	`var textFormat = textFormats.First();`
`228`		`- logger.LogDebug("Setting text sink and source format to {TextFormatID}:{TextCodec}.", textFormat.FormatID, textFormat.Codec);`
	`228`	`+ logger.LogTextFormatNegotiated(textFormat.FormatID, textFormat.Codec);`
`229`	`229`	`Media.TextSource?.SetTextSourceFormat(textFormat);`
`230`	`230`	`}`
`231`	`231`
`@@ -336,13 +336,13 @@ protected void RtpMediaPacketReceived(IPEndPoint remoteEndPoint, SDPMediaTypesEn`
`336`	`336`
`337`	`337`	`if (mediaType == SDPMediaTypesEnum.audio && Media.AudioSink != null)`
`338`	`338`	`{`
`339`		`- logger.LogRtpMediaPacketReceived(remoteEndPoint, hdr.SyncSource, hdr.SequenceNumber, hdr.Timestamp, hdr.PayloadType);`
	`339`	`+ logger.LogRtpAudioPacketReceived(remoteEndPoint, hdr.SyncSource, hdr.SequenceNumber, hdr.Timestamp, hdr.PayloadType);`
`340`	`340`
`341`	`341`	`Media.AudioSink.GotAudioRtp(remoteEndPoint, hdr.SyncSource, hdr.SequenceNumber, hdr.Timestamp, hdr.PayloadType, marker, rtpPacket.Payload);`
`342`	`342`	`}`
`343`	`343`	`else if (mediaType == SDPMediaTypesEnum.text && Media.TextSink != null)`
`344`	`344`	`{`
`345`		`- logger.LogTrace(nameof(RtpMediaPacketReceived) + " text RTP packet received from {RemoteEndPoint} ssrc {SyncSource} seqnum {SequenceNumber} timestamp {Timestamp} payload type {PayloadType}.", remoteEndPoint, hdr.SyncSource, hdr.SequenceNumber, hdr.Timestamp, hdr.PayloadType);`
	`345`	`+ logger.LogRtpTextPacketReceived(remoteEndPoint, hdr.SyncSource, hdr.SequenceNumber, hdr.Timestamp, hdr.PayloadType);`
`346`	`346`
`347`	`347`	`Media.TextSink.GotTextRtp(remoteEndPoint, hdr.SyncSource, hdr.SequenceNumber, hdr.Timestamp, hdr.PayloadType, hdr.MarkerBit, rtpPacket.Payload);`
`348`	`348`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1210,15 +1210,15 @@ static bool IsTwoWayStream(SDPMediaAnnouncement m, SDPMediaTypesEnum type) =>`
`1210`	`1210`
`1211`	`1211`	`if (offerHasStream && !mediaSessionHasStream)`
`1212`	`1212`	`{`
`1213`		`- logger.LogDebug("Re-INVITE remote party added {Type} stream.", type);`
	`1213`	`+ logger.LogReInviteRemotePartyStreamAdded(type);`
`1214`	`1214`	`if (OnRemoteMediaStreamAdded?.Invoke(type) ?? false)`
`1215`	`1215`	`{`
`1216`	`1216`	`streamAdded = true;`
`1217`	`1217`	`}`
`1218`	`1218`	`}`
`1219`	`1219`	`else if (!offerHasStream && mediaSessionHasStream)`
`1220`	`1220`	`{`
`1221`		`- logger.LogDebug("Re-INVITE remote party removed {Type} stream.", type);`
	`1221`	`+ logger.LogReInviteRemotePartyStreamRemoved(type);`
`1222`	`1222`	`OnRemoteMediaStreamRemoved?.Invoke(type);`
`1223`	`1223`	`}`
`1224`	`1224`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ private void SendTextFrame(int payloadTypeID, byte[] buffer)`
`53`	`53`	`{`
`54`	`54`	`if (rtpEventInProgress)`
`55`	`55`	`{`
`56`		`- logger.LogWarning("An RTPEvent is in progress.");`
	`56`	`+ logger.LogRtpEventInProgress();`
`57`	`57`	`return;`
`58`	`58`	`}`
`59`	`59`
`@@ -93,7 +93,7 @@ private void SendTextFrame(int payloadTypeID, byte[] buffer)`
`93`	`93`	`}`
`94`	`94`	`catch (SocketException sockExcp)`
`95`	`95`	`{`
`96`		`- logger.LogError(sockExcp, "SocketException SendT140Frame. {ErrorMessage}", sockExcp.Message);`
	`96`	`+ logger.LogSendT140FrameSocketError(sockExcp.Message, sockExcp);`
`97`	`97`	`}`
`98`	`98`	`}`
`99`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ public void SendMJPEGFrame(uint durationRtpUnits, int payloadID, byte[] sample)`
`288`	`288`	`}`
`289`	`289`	`catch (SocketException sockExcp)`
`290`	`290`	`{`
`291`		`- logger.LogError("SocketException SendMJEPGFrame. " + sockExcp.Message);`
	`291`	`+ logger.LogSendMJEPGFrameSocketError(sockExcp.Message, sockExcp);`
`292`	`292`	`}`
`293`	`293`	`}`
`294`	`294`	`}`