Merge pull request #22 from jimm98y/features/multiple-streams

F Added support for multiple streams

Author: jimm98y

src/Directory.Build.props

@@ -5,7 +5,7 @@
 		<Nullable>disable</Nullable>
 		<ImplicitUsings>disable</ImplicitUsings>
 		<Title>$(ProjectName)</Title>
-		<Version>0.1.5</Version>
+		<Version>0.2.0</Version>
 		<Authors>Lukas Volf</Authors>
 		<Copyright>MIT</Copyright>
 		<PackageProjectUrl>https://github.com/jimm98y/SharpRealTimeStreaming</PackageProjectUrl>

src/RTSPClientApp/appsettings.json

@@ -1,5 +1,5 @@
 {
-  "Uri": "rtsp://127.0.0.1:8554",
+  "Uri": "rtsp://127.0.0.1:8554/stream1",
   "UserName": "admin",
   "Password": "password"
 }

src/RTSPServerApp/RTSPServerWorker.cs

@@ -2,9 +2,22 @@
   "RTSPServerApp": {
     "HostName": "127.0.0.1",
     "Port": 8554,
-    "FilePath": "frag_bunny.mp4",
     "UserName": "admin",
-    "Password": "password"
+    "Password": "password",
+    "Media": [
+      {
+        "StreamID": "stream1",
+        "FilePath": "frag_bunny.mp4"
+      },
+      {
+        "StreamID": "stream2",
+        "FilePath": "testV300.mp4"
+      },
+      {
+        "StreamID": "stream3",
+        "FilePath": "Images"
+      }
+    ]
   },
   "Logging": {
     "LogLevel": {

src/RTSPServerApp/appsettings.json

@@ -60,33 +60,35 @@
 if (string.IsNullOrEmpty(videoUri) && string.IsNullOrEmpty(audioUri))
     throw new Exception("Invalid configuration! Either VideoUri, AudioUri or both must be specified!");
 
+const string STREAM_ID = "stream1";
+
 using (var server = new RTSPServer(port, userName, password))
 {
     using (CancellationTokenSource cts = new CancellationTokenSource())
     {
-        ProxyTrack videoTrack = null;
-        ProxyTrack audioTrack = null;
+        ProxyTrack rtspVideoTrack = null;
+        ProxyTrack rtspAudioTrack = null;
         Task videoTask = null;
         Task audioTask = null;
 
         if (!string.IsNullOrEmpty(videoUri))
         {
-            videoTrack = new ProxyTrack(TrackType.Video);
-            videoTask = RunUdpClient(videoTrack, new Uri(videoUri, UriKind.Absolute), cts.Token);
-            server.AddVideoTrack(videoTrack);
+            rtspVideoTrack = new ProxyTrack(TrackType.Video);
+            videoTask = RunUdpClient(rtspVideoTrack, new Uri(videoUri, UriKind.Absolute), cts.Token);
         }
 
         if (!string.IsNullOrEmpty(audioUri))
         {
-            audioTrack = new ProxyTrack(TrackType.Audio);
-            audioTask = RunUdpClient(audioTrack, new Uri(audioUri, UriKind.Absolute), cts.Token);
-            server.AddAudioTrack(audioTrack);
+            rtspAudioTrack = new ProxyTrack(TrackType.Audio);
+            audioTask = RunUdpClient(rtspAudioTrack, new Uri(audioUri, UriKind.Absolute), cts.Token);
         }
 
-        server.OverrideSDP(sdp, true);
+        var streamSource = new RTSPStreamSource(STREAM_ID, rtspVideoTrack, rtspAudioTrack);
+        streamSource.OverrideSDP(sdp, true);
+        server.AddStreamSource(streamSource);
 
-        videoTrack?.Start();
-        audioTrack?.Start();
+        rtspVideoTrack?.Start();
+        rtspAudioTrack?.Start();
 
         try
         {
@@ -97,7 +99,7 @@
             Console.WriteLine(ex.ToString());
         }
 
-        Console.WriteLine($"RTSP URL is rtsp://{userName}:{password}@{hostName}:{port}");
+        Console.WriteLine($"RTSP URL is rtsp://{userName}:{password}@{hostName}:{port}/{STREAM_ID}");
 
         Console.WriteLine("Press any key to exit");
         while (!Console.KeyAvailable)

src/RTSPServerFFmpeg/Program.cs

@@ -27,8 +27,8 @@
 
 bool _readNext = false;
 Stopwatch _stopwatch = new Stopwatch();
-ProxyTrack videoTrack = null;
-ProxyTrack audioTrack = null;
+ProxyTrack rtspVideoTrack = null;
+ProxyTrack rtspAudioTrack = null;
 var rtspProtocolParser = new RtspProtocolParser();
 
 var sdpTask = Task.Run(() =>
@@ -48,20 +48,21 @@
     }
 });
 
+const string STREAM_ID = "stream1";
+
 using (var server = new RTSPServer(port, userName, password))
 {
     await rtspProtocolParser.Sempahore.WaitAsync();
 
-    server.OverrideSDP(rtspProtocolParser.SDP, true);
-
-    videoTrack = new ProxyTrack(TrackType.Video);
-    server.AddVideoTrack(videoTrack);
+    rtspVideoTrack = new ProxyTrack(TrackType.Video);
+    rtspAudioTrack = new ProxyTrack(TrackType.Audio);
 
-    audioTrack = new ProxyTrack(TrackType.Audio);
-    server.AddAudioTrack(audioTrack);
+    var streamSource = new RTSPStreamSource(STREAM_ID, rtspVideoTrack, rtspAudioTrack);
+    streamSource.OverrideSDP(rtspProtocolParser.SDP, true);
+    server.AddStreamSource(streamSource);
 
-    videoTrack?.Start();
-    audioTrack?.Start();
+    rtspVideoTrack?.Start();
+    rtspAudioTrack?.Start();
 
     try
     {
@@ -72,7 +73,7 @@
         Console.WriteLine(ex.ToString());
     }
 
-    Console.WriteLine($"RTSP URL is rtsp://{userName}:{password}@{hostName}:{port}");
+    Console.WriteLine($"RTSP URL is rtsp://{userName}:{password}@{hostName}:{port}/{STREAM_ID}");
 
     Console.WriteLine("Press any key to exit");
     while (!Console.KeyAvailable)
@@ -132,7 +133,7 @@ void ParseData(byte[] data, object header, uint seconds, uint microseconds)
                 {
                     Thread.Sleep(sleep);
                 }
-                videoTrack?.FeedInRawSamples(RTPPacketUtil.ReadTS(data), new List<byte[]> { data });
+                rtspVideoTrack?.FeedInRawSamples(RTPPacketUtil.ReadTS(data), new List<byte[]> { data });
             }
             else if(rtspProtocolParser.Ports.Count > 1 && rtspProtocolParser.Ports[1].Contains(udp.SourcePort) && rtspProtocolParser.Ports[1].Contains(udp.DestinationPort))
             {
@@ -149,7 +150,7 @@ void ParseData(byte[] data, object header, uint seconds, uint microseconds)
                     Thread.Sleep(sleep);
                 }
 
-                audioTrack?.FeedInRawSamples(RTPPacketUtil.ReadTS(data), new List<byte[]> { data });
+                rtspAudioTrack?.FeedInRawSamples(RTPPacketUtil.ReadTS(data), new List<byte[]> { data });
             }
         }
     }

src/RTSPServerPcap/Program.cs

@@ -26,7 +26,7 @@ public class AV1Payload : IPayloadProcessor
         private DateTime _timestamp;
 
         // Constructor
-        public AV1Payload(ILogger<AV1Payload>? logger, MemoryPool<byte>? memoryPool = null)
+        public AV1Payload(ILogger<AV1Payload> logger, MemoryPool<byte> memoryPool = null)
         {
             _logger = logger as ILogger ?? NullLogger.Instance;
             _memoryPool = memoryPool ?? MemoryPool<byte>.Shared;

src/SharpRTSPClient/Payloads/AV1Payload.cs

@@ -33,7 +33,7 @@ public class H266Payload : IPayloadProcessor
         private DateTime _timestamp;
 
         // Constructor
-        public H266Payload(bool hasDonl, ILogger<H266Payload>? logger, MemoryPool<byte>? memoryPool = null)
+        public H266Payload(bool hasDonl, ILogger<H266Payload> logger, MemoryPool<byte> memoryPool = null)
         {
             this.hasDonl = hasDonl;
 

src/SharpRTSPClient/Payloads/H266Payload.cs

@@ -8,7 +8,7 @@ namespace Rtsp.Rtp
 
     public class OpusPayload : RawPayload
     {
-        public OpusPayload(MemoryPool<byte>? memoryPool = null)
+        public OpusPayload(MemoryPool<byte> memoryPool = null)
             : base(memoryPool)
         {
         }

src/SharpRTSPClient/Payloads/OpusPayload.cs

@@ -5,7 +5,7 @@ namespace SharpRTSPServer
 {
     public interface IRtpSender
     {
-        void FeedInRawRTP(int streamType, uint rtpTimestamp, List<Memory<byte>> rtpPackets);
-        bool CanAcceptNewSamples();
+        void FeedInRawRTP(string streamID, int streamType, uint rtpTimestamp, List<Memory<byte>> rtpPackets);
+        bool CanAcceptNewSamples(string streamID);
     }
 }