F Added ProxyTrack disposal, refactoring, cleanup

Author: jimm98y

src/RTSPServerFFmpeg/Program.cs

@@ -59,10 +59,10 @@
 using (var server = new RTSPServer(port, userName, password))
 {
     if (!string.IsNullOrEmpty(videoUri))
-        server.AddVideoTrack(new ProxyTrack(ProxyTrackType.Video, videoUri));
+        server.AddVideoTrack(new ProxyTrack(TrackType.Video, videoUri));
 
     if (!string.IsNullOrEmpty(audioUri))
-        server.AddAudioTrack(new ProxyTrack(ProxyTrackType.Audio, audioUri));
+        server.AddAudioTrack(new ProxyTrack(TrackType.Audio, audioUri));
 
     server.OverrideSDP(sdp, true);
 

src/SharpRTSPServer/ProxyTrack.cs

@@ -9,20 +9,16 @@
 
 namespace SharpRTSPServer
 {
-    public enum ProxyTrackType : int
-    {
-        Video = 0, 
-        Audio = 1
-    }
-
-    public class ProxyTrack : TrackBase
+    public class ProxyTrack : TrackBase, IDisposable
     {
         public override string Codec => "PROXY";
 
         public override int ID { get; set; }
         public override int PayloadType { get; set; }
 
         private bool _isReady = false;
+        private bool _disposedValue;
+
         public override bool IsReady
         { 
             get 
@@ -33,7 +29,7 @@ public override bool IsReady
 
         public Uri Uri { get; }
 
-        public ProxyTrack(ProxyTrackType type, string uri)
+        public ProxyTrack(TrackType type, string uri)
         {
             this.ID = (int)type;
             this.Uri = new Uri(uri, UriKind.Absolute);
@@ -59,25 +55,53 @@ private async void Connect(Uri uri)
         {
             await Task.Run(() =>
             {
-                UdpClient udpClient = new UdpClient(uri.Port);
-                IPEndPoint remoteEndPoint = new IPEndPoint(IPAddress.Parse(uri.Host), 0);
-                _isReady = true;
-
-                while (true)
+                try
                 {
-                    try
+                    using (UdpClient udpClient = new UdpClient(uri.Port))
                     {
-                        byte[] rtp = udpClient.Receive(ref remoteEndPoint);
-                        uint rtpTimestamp = RTPPacketUtil.ReadRtpTimestamp(rtp);
-                        Sink.FeedInRawRTP(ID, rtpTimestamp, new List<Memory<byte>>() { rtp });
-                        //Debug.WriteLine($"This message was sent from {remoteEndPoint.Address} on their port number {remoteEndPoint.Port}");
-                    }
-                    catch (Exception e)
-                    {
-                        Debug.WriteLine(e.ToString());
+                        IPEndPoint remoteEndPoint = new IPEndPoint(IPAddress.Parse(uri.Host), 0);
+                        _isReady = true;
+
+                        while (_isReady)
+                        {
+                            try
+                            {
+                                byte[] rtp = udpClient.Receive(ref remoteEndPoint);
+                                uint rtpTimestamp = RTPPacketUtil.ReadTS(rtp);
+                                Sink.FeedInRawRTP(ID, rtpTimestamp, new List<Memory<byte>>() { rtp });
+                            }
+                            catch (Exception e)
+                            {
+                                Debug.WriteLine(e.ToString());
+                            }
+                        }
                     }
                 }
+                catch(Exception ee)
+                {
+                    Debug.WriteLine(ee.ToString());
+                    _isReady = false;
+                }
             });
         }
+
+        protected virtual void Dispose(bool disposing)
+        {
+            if (!_disposedValue)
+            {
+                if(disposing)
+                {
+                    _isReady = false;
+                }
+
+                _disposedValue = true;
+            }
+        }
+
+        public void Dispose()
+        {
+            Dispose(disposing: true);
+            GC.SuppressFinalize(this);
+        }
     }
 }

src/SharpRTSPServer/RTPPacketUtil.cs

@@ -7,12 +7,6 @@ public static class RTPPacketUtil
     {
         public const int RTP_VERSION = 2;
 
-        public static uint ReadRtpTimestamp(byte[] data)
-        {
-            uint rtpTimestamp = ((uint)data[4] << 24) + (uint)(data[5] << 16) + (uint)(data[6] << 8) + data[7];
-            return rtpTimestamp;
-        }
-
         public static void WriteHeader(
             Span<byte> rtpPacket,
             int rtpVersion,
@@ -31,14 +25,20 @@ public static void WriteSequenceNumber(Span<byte> rtpPacket, ushort sequenceId)
             BinaryPrimitives.WriteUInt16BigEndian(rtpPacket.Slice(2), sequenceId);
         }
 
-        public static void WriteTS(Span<byte> rtp_packet, uint ts)
+        public static void WriteSSRC(Span<byte> rtp_packet, uint ssrc)
         {
-            BinaryPrimitives.WriteUInt32BigEndian(rtp_packet.Slice(4), ts);
+            BinaryPrimitives.WriteUInt32BigEndian(rtp_packet.Slice(8), ssrc);
         }
 
-        public static void WriteSSRC(Span<byte> rtp_packet, uint ssrc)
+        public static uint ReadTS(byte[] data)
         {
-            BinaryPrimitives.WriteUInt32BigEndian(rtp_packet.Slice(8), ssrc);
+            uint rtpTimestamp = ((uint)data[4] << 24) + (uint)(data[5] << 16) + (uint)(data[6] << 8) + data[7];
+            return rtpTimestamp;
+        }
+
+        public static void WriteTS(Span<byte> rtp_packet, uint ts)
+        {
+            BinaryPrimitives.WriteUInt32BigEndian(rtp_packet.Slice(4), ts);
         }
     }
 }

src/SharpRTSPServer/RTSPServer.cs

@@ -513,7 +513,7 @@ private string GenerateSDP()
             sdp.Append("c=IN IP4 0.0.0.0\n");
 
             // VIDEO
-            VideoTrack.BuildSDP(sdp);
+            VideoTrack?.BuildSDP(sdp);
 
             // AUDIO
             AudioTrack?.BuildSDP(sdp);
@@ -745,6 +745,18 @@ protected virtual void Dispose(bool disposing)
             {
                 StopListen();
                 _stopping?.Dispose();
+
+                if(VideoTrack is IDisposable disposableVideoTrack)
+                {
+                    disposableVideoTrack.Dispose();
+                    VideoTrack = null;
+                }
+
+                if (AudioTrack is IDisposable disposableAudioTrack)
+                {
+                    disposableAudioTrack.Dispose();
+                    AudioTrack = null;
+                }
             }
         }
 
@@ -826,9 +838,6 @@ public class RTPStream
         /// </summary>
         public class RTSPConnection
         {
-            public const int VIDEO = 0;
-            public const int AUDIO = 1;
-
             /// <summary>
             /// RTSP conneciton listener.
             /// </summary>
@@ -855,12 +864,12 @@ public class RTSPConnection
             /// <summary>
             /// Video stream.
             /// </summary>
-            public RTPStream Video { get { return Streams[0]; } }
+            public RTPStream Video { get { return Streams[(int)TrackType.Video]; } }
 
             /// <summary>
             /// Audio stream.
             /// </summary>
-            public RTPStream Audio { get { return Streams[1]; } }
+            public RTPStream Audio { get { return Streams[(int)TrackType.Audio]; } }
 
             public RTPStream[] Streams { get; } = new RTPStream[]
             {
@@ -1046,4 +1055,10 @@ public static string ToHexString(byte[] data)
 #endif
         }
     }
+
+    public enum TrackType : int
+    {
+        Video = 0,
+        Audio = 1
+    }
 }

src/SharpRTSPServer/TrackBase.cs

@@ -32,7 +32,7 @@ public virtual void FeedInRawSamples(uint rtpTimestamp, List<byte[]> samples)
             if (!Sink.CanAcceptNewSamples())
                 return;
 
-            if (ID != 0 && ID != 1)
+            if (ID != (int)TrackType.Video && ID != (int)TrackType.Audio)
                 throw new ArgumentOutOfRangeException("ID must be 0 for video or 1 for audio");
 
             (List<Memory<byte>> rtpPackets, List<IMemoryOwner<byte>> memoryOwners) = CreateRtpPackets(samples, rtpTimestamp);