Sdp audio fix (#1334)

* fix stream retrieval bug
RTC updates

* add translations for tray app and installer

* fix for ptz serialization
use wyze camera name from url

* fix bug in g722 codec

* Only get stream format once
Add timeout to ice gathering
Add prefer H264 flag for compatible formats

* revert

* Optimise SendVideo and SendAudio (only get SendingFormat once)
Add sanity check for ICE Gathering timeout

* Optimise SendVideo and SendAudio (only get SendingFormat once)
Add sanity check for ICE Gathering timeout
Fix bug in g722 codec

* remove turn folder

* Remove turn folder

* Move gather timeout to config

* Fix rounding bug in SendAudioFrame
Fix bug where duplicate durations were being added to local track timestamp in SendAudioFrame
Ignore H264 formats that use unsupported packetization modes
Clean up logic in AreMatch

* Remove comment marker

* remove comment marker

* Check for null

* Fix bug with HasVideo and HasAudio

* Fix audio parsing with multiple ports

* Add unit test

Author: ispysoftware

src/net/SDP/SDP.cs

@@ -309,13 +309,27 @@ public static SDP ParseSDPDescription(string sdpDescription)
                                 break;
 
                             case var l when l.StartsWith("m="):
-                                Match mediaMatch = Regex.Match(sdpLineTrimmed.Substring(2), @"(?<type>\w+)\s+(?<port>\d+)\s+(?<transport>\S+)(\s*)(?<formats>.*)$");
+                                Match mediaMatch = Regex.Match(
+                                        sdpLineTrimmed.Substring(2),
+                                        @"(?<type>\w+)\s+(?<port>\d+)(?:\/(?<portCount>\d+))?\s+(?<transport>\S+)\s*(?<formats>.*)$"
+                                    );
                                 if (mediaMatch.Success)
                                 {
                                     SDPMediaAnnouncement announcement = new SDPMediaAnnouncement();
                                     announcement.MLineIndex = mLineIndex;
                                     announcement.Media = SDPMediaTypes.GetSDPMediaType(mediaMatch.Result("${type}"));
-                                    Int32.TryParse(mediaMatch.Result("${port}"), out announcement.Port);
+
+                                    // Parse the primary port.
+                                    int.TryParse(mediaMatch.Result("${port}"), out announcement.Port);
+                                    if (mediaMatch.Groups["portCount"].Success)
+                                    {
+                                        int portCount;
+                                        if (Int32.TryParse(mediaMatch.Result("${portCount}"), out portCount))
+                                        {
+                                            announcement.PortCount = portCount;
+                                        }
+                                    }
+
                                     announcement.Transport = mediaMatch.Result("${transport}");
                                     announcement.ParseMediaFormats(mediaMatch.Result("${formats}"));
                                     if (announcement.Media == SDPMediaTypesEnum.audio || announcement.Media == SDPMediaTypesEnum.video)

src/net/SDP/SDPMediaAnnouncement.cs

@@ -92,6 +92,12 @@ public class SDPMediaAnnouncement
         // Media Announcement fields.
         public SDPMediaTypesEnum Media = SDPMediaTypesEnum.audio;   // Media type for the stream.
         public int Port;                        // For UDP transports should be in the range 1024 to 65535 and for RTP compliance should be even (only even ports used for data).
+        /// <summary>
+        /// Gets or sets the number of consecutive ports specified for the media stream in the SDP.
+        /// When the SDP media line includes a port range (e.g., "30000/2"), this property holds the count of ports.
+        /// Typically, a value of 2 indicates that two ports are allocated: one for RTP and the following port for RTCP.
+        /// </summary>
+        public int PortCount { get; set; }
         public string Transport = "RTP/AVP";    // Defined types RTP/AVP (RTP Audio Visual Profile) and udp.
         public string IceUfrag;                 // If ICE is being used the username for the STUN requests.
         public string IcePwd;                   // If ICE is being used the password for the STUN requests.

test/unit/net/SDP/SDPUnitTests.cs

@@ -1310,5 +1310,39 @@ public void Media_Formats_Order_Test()
 
             Assert.Equal(8, sdpParsed.Media.Where(x => x.Media == SDPMediaTypesEnum.audio).First().MediaFormats.First().Key);
         }
+
+        /// <summary>
+        /// Tests that parsing the number of ports parameter works correctly.
+        /// </summary>
+        /// <remarks>
+        /// https://datatracker.ietf.org/doc/html/rfc4566#section-5.14
+        /// </remarks>
+        [Fact]
+        public void Parse_Number_Of_Ports_Unit_Test()
+        {
+            logger.LogDebug("--> " + System.Reflection.MethodBase.GetCurrentMethod().Name);
+            logger.BeginScope(System.Reflection.MethodBase.GetCurrentMethod().Name);
+
+            string sdpStr =
+                "v=0" + m_CRLF +
+                "o=root 3285 3285 IN IP4 10.0.0.4" + m_CRLF +
+                "s=session" + m_CRLF +
+                "c=IN IP4 10.0.0.4" + m_CRLF +
+                "t=0 0" + m_CRLF +
+                "m=audio 12228/2 RTP/AVP 0 101" + m_CRLF +
+                "a=rtpmap:0 PCMU/8000" + m_CRLF +
+                "a=rtpmap:101 telephone-event/8000" + m_CRLF +
+                "a=fmtp:101 0-16" + m_CRLF +
+                "a=silenceSupp:off - - - -" + m_CRLF +
+                "a=ptime:20" + m_CRLF +
+                "a=sendrecv";
+
+            SDP sdp = SDP.ParseSDPDescription(sdpStr);
+
+            logger.LogDebug(sdp.ToString());
+
+            Assert.True(sdp.Media[0].Port == 12228, "The connection port was not parsed correctly.");
+            Assert.True(sdp.Media[0].PortCount == 2, "The port count was not parsed correctly.");
+        }
     }
 }