R Moved FeedInRawSamples into the tracks

jimm98y · jimm98y · commit bfe25badd23b · 2024-08-05T01:26:35.000+02:00
diff --git a/src/RTSPServerApp/Program.cs b/src/RTSPServerApp/Program.cs
@@ -23,6 +23,9 @@
     TrakBox videoTrackBox = null;
     double videoFrameRate = 0;
 
+    ITrack rtspVideoTrack = null;
+    ITrack rtspAudioTrack = null;
+
     // frag_bunny.mp4 audio is not playable in VLC on Windows 11 (works on MacOS)
     using (Stream fs = new BufferedStream(new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.Read)))
     {
@@ -42,14 +45,16 @@
                 if (h264VisualSample != null)
                 {
                     var avcC = (h264VisualSample.Children.First(x => x.Type == AvcConfigurationBox.TYPE) as AvcConfigurationBox).AvcDecoderConfigurationRecord;
-                    server.VideoTrack = new SharpRTSPServer.H264Track(avcC.AvcProfileIndication, 0, avcC.AvcLevelIndication);
+                    rtspVideoTrack = new SharpRTSPServer.H264Track(avcC.AvcProfileIndication, 0, avcC.AvcLevelIndication);
+                    server.AddVideoTrack(rtspVideoTrack);
                 }
                 else
                 {
                     var h265VisualSample = videoTrackBox.GetMdia().GetMinf().GetStbl().GetStsd().Children.FirstOrDefault(x => x.Type == VisualSampleEntryBox.TYPE6 || x.Type == VisualSampleEntryBox.TYPE7) as VisualSampleEntryBox;
                     if(h265VisualSample != null)
                     {
-                        server.VideoTrack = new SharpRTSPServer.H265Track();
+                        rtspVideoTrack = new SharpRTSPServer.H265Track();
+                        server.AddVideoTrack(rtspVideoTrack);
                     }
                     else
                     {
@@ -67,7 +72,8 @@
                 {
                     var audioConfigDescriptor = audioSampleEntry.GetAudioSpecificConfigDescriptor();
                     int audioSamplingRate = audioConfigDescriptor.GetSamplingFrequency();
-                    server.AudioTrack = new SharpRTSPServer.AACTrack(await audioConfigDescriptor.ToBytes(), audioSamplingRate, audioConfigDescriptor.ChannelConfiguration);
+                    rtspAudioTrack = new SharpRTSPServer.AACTrack(await audioConfigDescriptor.ToBytes(), audioSamplingRate, audioConfigDescriptor.ChannelConfiguration);
+                    server.AddAudioTrack(rtspAudioTrack);
                 }
                 else
                 { 
@@ -92,18 +98,18 @@
         {
             if (videoIndex == 0)
             {
-                if (server.VideoTrack is SharpRTSPServer.H264Track h264VideoTrack)
+                if (rtspVideoTrack is SharpRTSPServer.H264Track h264VideoTrack)
                 {
                     h264VideoTrack.SetParameterSets(videoTrack[0][0], videoTrack[0][1]);
                 }
-                else if (server.VideoTrack is SharpRTSPServer.H265Track h265VideoTrack)
+                else if (rtspVideoTrack is SharpRTSPServer.H265Track h265VideoTrack)
                 {
                     h265VideoTrack.SetParameterSets(videoTrack[0][0], videoTrack[0][1], videoTrack[0][2]);
                 }
                 videoIndex++;
             }
 
-            server.FeedInRawVideoSamples((uint)(videoIndex * videoSampleDuration), (List<byte[]>)videoTrack[videoIndex++ % videoTrack.Count]);
+            rtspVideoTrack.FeedInRawSamples((uint)(videoIndex * videoSampleDuration), (List<byte[]>)videoTrack[videoIndex++ % videoTrack.Count]);
 
             if (videoIndex % videoTrack.Count == 0)
             {
@@ -116,10 +122,10 @@
     {
         var audioSampleDuration = SharpMp4.AACTrack.AAC_SAMPLE_SIZE;
         var audioTrack = parsedMDAT[audioTrackId];
-        audioTimer = new Timer(audioSampleDuration * 1000 / (server.AudioTrack as SharpRTSPServer.AACTrack).SamplingRate);
+        audioTimer = new Timer(audioSampleDuration * 1000 / (rtspAudioTrack as SharpRTSPServer.AACTrack).SamplingRate);
         audioTimer.Elapsed += (s, e) =>
         {
-            server.FeedInRawAudioSamples((uint)(audioIndex * audioSampleDuration), new List<byte[]>() { audioTrack[0][audioIndex++ % audioTrack[0].Count] });
+            rtspAudioTrack.FeedInRawSamples((uint)(audioIndex * audioSampleDuration), new List<byte[]>() { audioTrack[0][audioIndex++ % audioTrack[0].Count] });
 
             if (audioIndex % audioTrack[0].Count == 0)
             {
diff --git a/src/SharpRTSPServer/AACTrack.cs b/src/SharpRTSPServer/AACTrack.cs
@@ -9,17 +9,17 @@ namespace SharpRTSPServer
     /// <summary>
     /// AAC track.
     /// </summary>
-    public class AACTrack : ITrack
+    public class AACTrack : TrackBase
     {
         /// <summary>
         /// AAC Audio Codec name.
         /// </summary>
-        public string Codec => "mpeg4-generic";
+        public override string Codec => "mpeg4-generic";
 
         /// <summary>
         /// Track ID. Used to identify the track in the SDP.
         /// </summary>
-        public int ID { get; set; } = 1;
+        public override int ID { get; set; } = 1;
 
         /// <summary>
         /// Sampling rate.
@@ -39,14 +39,14 @@ public class AACTrack : ITrack
         /// <summary>
         /// Is the track ready?
         /// </summary>
-        public bool IsReady { get { return ConfigDescriptor != null && ConfigDescriptor.Length > 0; } }
+        public override bool IsReady { get { return ConfigDescriptor != null && ConfigDescriptor.Length > 0; } }
 
         private int _payloadType = -1;
 
         /// <summary>
         /// Payload type. AAC uses a dynamic payload type, which by default we calculate as 96 + track ID.
         /// </summary>
-        public int PayloadType
+        public override int PayloadType
         {
             get
             {
@@ -101,7 +101,7 @@ public void SetConfigDescriptor(byte[] configDescriptor)
         /// </summary>
         /// <param name="sdp">SDP <see cref="StringBuilder"/>.</param>
         /// <returns><see cref="StringBuilder"/>.</returns>
-        public StringBuilder BuildSDP(StringBuilder sdp)
+        public override StringBuilder BuildSDP(StringBuilder sdp)
         {
             sdp.Append($"m=audio 0 RTP/AVP {PayloadType}\n"); // <---- Payload Type 0 means G711 ULAW, 96+ means dynamic payload type
             sdp.Append($"a=control:trackID={ID}\n");
@@ -117,7 +117,7 @@ public StringBuilder BuildSDP(StringBuilder sdp)
         /// <param name="samples">An array of AAC fragments. By default single fragment is expected.</param>
         /// <param name="rtpTimestamp">RTP timestamp in the timescale of the track.</param>
         /// <returns>RTP packets.</returns>
-        public (List<Memory<byte>>, List<IMemoryOwner<byte>>) CreateRtpPackets(List<byte[]> samples, uint rtpTimestamp)
+        public override (List<Memory<byte>>, List<IMemoryOwner<byte>>) CreateRtpPackets(List<byte[]> samples, uint rtpTimestamp)
         {
             List<Memory<byte>> rtpPackets = new List<Memory<byte>>();
             List<IMemoryOwner<byte>> memoryOwners = new List<IMemoryOwner<byte>>();
diff --git a/src/SharpRTSPServer/G711Track.cs b/src/SharpRTSPServer/G711Track.cs
@@ -8,17 +8,17 @@ namespace SharpRTSPServer
     /// <summary>
     /// G711 PCMU (U-LAW) track.
     /// </summary>
-    public class PCMUTrack : ITrack
+    public class PCMUTrack : TrackBase
     {
         /// <summary>
         /// PCMU Audio Codec name.
         /// </summary>
-        public string Codec => "PCMU";
+        public override string Codec => "PCMU";
 
         /// <summary>
         /// Track ID. Used to identify the track in the SDP.
         /// </summary>
-        public int ID { get; set; } = 1;
+        public override int ID { get; set; } = 1;
 
         /// <summary>
         /// Sampling rate.
@@ -33,19 +33,19 @@ public class PCMUTrack : ITrack
         /// <summary>
         /// Is the track ready?
         /// </summary>
-        public bool IsReady { get { return true; } }
+        public override bool IsReady { get { return true; } }
 
         /// <summary>
         /// Payload type. PCMU uses static payload type 0.
         /// </summary>
-        public int PayloadType { get; set; } = 0;
+        public override int PayloadType { get; set; } = 0;
 
         /// <summary>
         /// Build the SDP for this track.
         /// </summary>
         /// <param name="sdp">SDP <see cref="StringBuilder"/>.</param>
         /// <returns><see cref="StringBuilder"/>.</returns>
-        public StringBuilder BuildSDP(StringBuilder sdp)
+        public override StringBuilder BuildSDP(StringBuilder sdp)
         {
             sdp.Append($"m=audio 0 RTP/AVP {PayloadType}\n");
             sdp.Append($"a=control:trackID={ID}\n");
@@ -59,7 +59,7 @@ public StringBuilder BuildSDP(StringBuilder sdp)
         /// <param name="samples">An array of PCMU fragments. By default single fragment is expected.</param>
         /// <param name="rtpTimestamp">RTP timestamp in the timescale of the track.</param>
         /// <returns>RTP packets.</returns>
-        public (List<Memory<byte>>, List<IMemoryOwner<byte>>) CreateRtpPackets(List<byte[]> samples, uint rtpTimestamp)
+        public override (List<Memory<byte>>, List<IMemoryOwner<byte>>) CreateRtpPackets(List<byte[]> samples, uint rtpTimestamp)
         {
             List<Memory<byte>> rtpPackets = new List<Memory<byte>>();
             List<IMemoryOwner<byte>> memoryOwners = new List<IMemoryOwner<byte>>();
@@ -93,17 +93,17 @@ public StringBuilder BuildSDP(StringBuilder sdp)
     /// <summary>
     /// G711 PCMA (A-LAW) track.
     /// </summary>
-    public class PCMATrack : ITrack
+    public class PCMATrack : TrackBase
     {
         /// <summary>
         /// PCMA Audio Codec name.
         /// </summary>
-        public string Codec => "PCMA";
+        public override string Codec => "PCMA";
 
         /// <summary>
         /// Track ID. Used to identify the track in the SDP.
         /// </summary>
-        public int ID { get; set; } = 1;
+        public override int ID { get; set; } = 1;
 
         /// <summary>
         /// Sampling rate.
@@ -118,19 +118,19 @@ public class PCMATrack : ITrack
         /// <summary>
         /// Is the track ready?
         /// </summary>
-        public bool IsReady { get { return true; } }
+        public override bool IsReady { get { return true; } }
 
         /// <summary>
         /// Payload type. PCMA uses static payload type 8.
         /// </summary>
-        public int PayloadType { get; set; } = 8;
+        public override int PayloadType { get; set; } = 8;
 
         /// <summary>
         /// Build the SDP for this track.
         /// </summary>
         /// <param name="sdp">SDP <see cref="StringBuilder"/>.</param>
         /// <returns><see cref="StringBuilder"/>.</returns>
-        public StringBuilder BuildSDP(StringBuilder sdp)
+        public override StringBuilder BuildSDP(StringBuilder sdp)
         {
             sdp.Append($"m=audio 0 RTP/AVP {PayloadType}\n");
             sdp.Append($"a=control:trackID={ID}\n");
@@ -144,7 +144,7 @@ public StringBuilder BuildSDP(StringBuilder sdp)
         /// <param name="samples">An array of PCMA fragments. By default single fragment is expected.</param>
         /// <param name="rtpTimestamp">RTP timestamp in the timescale of the track.</param>
         /// <returns>RTP packets.</returns>
-        public (List<Memory<byte>>, List<IMemoryOwner<byte>>) CreateRtpPackets(List<byte[]> samples, uint rtpTimestamp)
+        public override (List<Memory<byte>>, List<IMemoryOwner<byte>>) CreateRtpPackets(List<byte[]> samples, uint rtpTimestamp)
         {
             List<Memory<byte>> rtpPackets = new List<Memory<byte>>();
             List<IMemoryOwner<byte>> memoryOwners = new List<IMemoryOwner<byte>>();
diff --git a/src/SharpRTSPServer/H264Track.cs b/src/SharpRTSPServer/H264Track.cs
@@ -8,12 +8,12 @@ namespace SharpRTSPServer
     /// <summary>
     /// H264 video track.
     /// </summary>
-    public class H264Track : ITrack
+    public class H264Track : TrackBase
     {
         /// <summary>
         /// H264 Video Codec name.
         /// </summary>
-        public string Codec => "H264";
+        public override string Codec => "H264";
 
         /// <summary>
         /// Default video track clock rate.
@@ -23,7 +23,7 @@ public class H264Track : ITrack
         /// <summary>
         /// Track ID. Used to identify the track in the SDP.
         /// </summary>
-        public int ID { get; set; } = 0;
+        public override int ID { get; set; } = 0;
 
         /// <summary>
         /// H264 Profile IDC. Default value is 77 (Main Profile).
@@ -63,14 +63,14 @@ public class H264Track : ITrack
         /// <summary>
         /// Is the track ready?
         /// </summary>
-        public bool IsReady { get { return SPS != null && PPS != null; } }
+        public override bool IsReady { get { return SPS != null && PPS != null; } }
 
         private int _payloadType = -1;
 
         /// <summary>
         /// Payload type. H264 uses a dynamic payload type, which by default we calculate as 96 + track ID.
         /// </summary>
-        public int PayloadType
+        public override int PayloadType
         {
             get 
             {
@@ -134,7 +134,7 @@ public void SetParameterSets(byte[] sps, byte[] pps)
         /// </summary>
         /// <param name="sdp">SDP <see cref="StringBuilder"/>.</param>
         /// <returns><see cref="StringBuilder"/>.</returns>
-        public StringBuilder BuildSDP(StringBuilder sdp)
+        public override StringBuilder BuildSDP(StringBuilder sdp)
         {
             // Make the profile-level-id
             // Eg a string of profile-level-id=42A01E is
@@ -160,7 +160,7 @@ public StringBuilder BuildSDP(StringBuilder sdp)
         /// <param name="samples">An array of H264 NALUs.</param>
         /// <param name="rtpTimestamp">RTP timestamp in the timescale of the track.</param>
         /// <returns>RTP packets.</returns>
-        public (List<Memory<byte>>, List<IMemoryOwner<byte>>) CreateRtpPackets(List<byte[]> samples, uint rtpTimestamp)
+        public override (List<Memory<byte>>, List<IMemoryOwner<byte>>) CreateRtpPackets(List<byte[]> samples, uint rtpTimestamp)
         {
             List<Memory<byte>> rtpPackets = new List<Memory<byte>>();
             List<IMemoryOwner<byte>> memoryOwners = new List<IMemoryOwner<byte>>();
diff --git a/src/SharpRTSPServer/H265Track.cs b/src/SharpRTSPServer/H265Track.cs
@@ -8,12 +8,12 @@ namespace SharpRTSPServer
     /// <summary>
     /// H265 video track.
     /// </summary>
-    public class H265Track : ITrack
+    public class H265Track : TrackBase
     {
         /// <summary>
         /// H265 Video Codec name.
         /// </summary>
-        public string Codec => "H265";
+        public override string Codec => "H265";
 
         /// <summary>
         /// Default video track clock rate.
@@ -23,7 +23,7 @@ public class H265Track : ITrack
         /// <summary>
         /// Track ID. Used to identify the track in the SDP.
         /// </summary>
-        public int ID { get; set; } = 0;
+        public override int ID { get; set; } = 0;
 
         /// <summary>
         /// Video clock rate. Default value is 90000.
@@ -53,14 +53,14 @@ public class H265Track : ITrack
         /// <summary>
         /// Is the track ready?
         /// </summary>
-        public bool IsReady { get { return VPS != null && SPS != null && PPS != null; } }
+        public override bool IsReady { get { return VPS != null && SPS != null && PPS != null; } }
 
         private int _payloadType = -1;
 
         /// <summary>
         /// Payload type. H264 uses a dynamic payload type, which by default we calculate as 96 + track ID.
         /// </summary>
-        public int PayloadType
+        public override int PayloadType
         {
             get
             {
@@ -113,7 +113,7 @@ public void SetParameterSets(byte[] vps, byte[] sps, byte[] pps)
             this.PPS = pps;
         }
 
-        public StringBuilder BuildSDP(StringBuilder sdp)
+        public override StringBuilder BuildSDP(StringBuilder sdp)
         {
             string vps_str = Convert.ToBase64String(VPS);
             string sps_str = Convert.ToBase64String(SPS);
@@ -132,7 +132,7 @@ public StringBuilder BuildSDP(StringBuilder sdp)
         /// <param name="samples">An array of H265 NALUs.</param>
         /// <param name="rtpTimestamp">RTP timestamp in the timescale of the track.</param>
         /// <returns>RTP packets.</returns>
-        public (List<Memory<byte>>, List<IMemoryOwner<byte>>) CreateRtpPackets(List<byte[]> samples, uint rtpTimestamp)
+        public override (List<Memory<byte>>, List<IMemoryOwner<byte>>) CreateRtpPackets(List<byte[]> samples, uint rtpTimestamp)
         {
             List<Memory<byte>> rtpPackets = new List<Memory<byte>>();
             List<IMemoryOwner<byte>> memoryOwners = new List<IMemoryOwner<byte>>();
diff --git a/src/SharpRTSPServer/RTSPServer.cs b/src/SharpRTSPServer/RTSPServer.cs
diff --git a/src/SharpRTSPServer/TrackBase.cs b/src/SharpRTSPServer/TrackBase.cs

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,9 @@`
`23`	`23`	`TrakBox videoTrackBox = null;`
`24`	`24`	`double videoFrameRate = 0;`
`25`	`25`
	`26`	`+ ITrack rtspVideoTrack = null;`
	`27`	`+ ITrack rtspAudioTrack = null;`
	`28`	`+`
`26`	`29`	`// frag_bunny.mp4 audio is not playable in VLC on Windows 11 (works on MacOS)`
`27`	`30`	`using (Stream fs = new BufferedStream(new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.Read)))`
`28`	`31`	`{`
`@@ -42,14 +45,16 @@`
`42`	`45`	`if (h264VisualSample != null)`
`43`	`46`	`{`
`44`	`47`	`var avcC = (h264VisualSample.Children.First(x => x.Type == AvcConfigurationBox.TYPE) as AvcConfigurationBox).AvcDecoderConfigurationRecord;`
`45`		`- server.VideoTrack = new SharpRTSPServer.H264Track(avcC.AvcProfileIndication, 0, avcC.AvcLevelIndication);`
	`48`	`+ rtspVideoTrack = new SharpRTSPServer.H264Track(avcC.AvcProfileIndication, 0, avcC.AvcLevelIndication);`
	`49`	`+ server.AddVideoTrack(rtspVideoTrack);`
`46`	`50`	`}`
`47`	`51`	`else`
`48`	`52`	`{`
`49`	`53`	`var h265VisualSample = videoTrackBox.GetMdia().GetMinf().GetStbl().GetStsd().Children.FirstOrDefault(x => x.Type == VisualSampleEntryBox.TYPE6 \|\| x.Type == VisualSampleEntryBox.TYPE7) as VisualSampleEntryBox;`
`50`	`54`	`if(h265VisualSample != null)`
`51`	`55`	`{`
`52`		`- server.VideoTrack = new SharpRTSPServer.H265Track();`
	`56`	`+ rtspVideoTrack = new SharpRTSPServer.H265Track();`
	`57`	`+ server.AddVideoTrack(rtspVideoTrack);`
`53`	`58`	`}`
`54`	`59`	`else`
`55`	`60`	`{`
`@@ -67,7 +72,8 @@`
`67`	`72`	`{`
`68`	`73`	`var audioConfigDescriptor = audioSampleEntry.GetAudioSpecificConfigDescriptor();`
`69`	`74`	`int audioSamplingRate = audioConfigDescriptor.GetSamplingFrequency();`
`70`		`- server.AudioTrack = new SharpRTSPServer.AACTrack(await audioConfigDescriptor.ToBytes(), audioSamplingRate, audioConfigDescriptor.ChannelConfiguration);`
	`75`	`+ rtspAudioTrack = new SharpRTSPServer.AACTrack(await audioConfigDescriptor.ToBytes(), audioSamplingRate, audioConfigDescriptor.ChannelConfiguration);`
	`76`	`+ server.AddAudioTrack(rtspAudioTrack);`
`71`	`77`	`}`
`72`	`78`	`else`
`73`	`79`	`{`
`@@ -92,18 +98,18 @@`
`92`	`98`	`{`
`93`	`99`	`if (videoIndex == 0)`
`94`	`100`	`{`
`95`		`- if (server.VideoTrack is SharpRTSPServer.H264Track h264VideoTrack)`
	`101`	`+ if (rtspVideoTrack is SharpRTSPServer.H264Track h264VideoTrack)`
`96`	`102`	`{`
`97`	`103`	`h264VideoTrack.SetParameterSets(videoTrack[0][0], videoTrack[0][1]);`
`98`	`104`	`}`
`99`		`- else if (server.VideoTrack is SharpRTSPServer.H265Track h265VideoTrack)`
	`105`	`+ else if (rtspVideoTrack is SharpRTSPServer.H265Track h265VideoTrack)`
`100`	`106`	`{`
`101`	`107`	`h265VideoTrack.SetParameterSets(videoTrack[0][0], videoTrack[0][1], videoTrack[0][2]);`
`102`	`108`	`}`
`103`	`109`	`videoIndex++;`
`104`	`110`	`}`
`105`	`111`
`106`		`- server.FeedInRawVideoSamples((uint)(videoIndex * videoSampleDuration), (List<byte[]>)videoTrack[videoIndex++ % videoTrack.Count]);`
	`112`	`+ rtspVideoTrack.FeedInRawSamples((uint)(videoIndex * videoSampleDuration), (List<byte[]>)videoTrack[videoIndex++ % videoTrack.Count]);`
`107`	`113`
`108`	`114`	`if (videoIndex % videoTrack.Count == 0)`
`109`	`115`	`{`
`@@ -116,10 +122,10 @@`
`116`	`122`	`{`
`117`	`123`	`var audioSampleDuration = SharpMp4.AACTrack.AAC_SAMPLE_SIZE;`
`118`	`124`	`var audioTrack = parsedMDAT[audioTrackId];`
`119`		`- audioTimer = new Timer(audioSampleDuration * 1000 / (server.AudioTrack as SharpRTSPServer.AACTrack).SamplingRate);`
	`125`	`+ audioTimer = new Timer(audioSampleDuration * 1000 / (rtspAudioTrack as SharpRTSPServer.AACTrack).SamplingRate);`
`120`	`126`	`audioTimer.Elapsed += (s, e) =>`
`121`	`127`	`{`
`122`		`- server.FeedInRawAudioSamples((uint)(audioIndex * audioSampleDuration), new List<byte[]>() { audioTrack[0][audioIndex++ % audioTrack[0].Count] });`
	`128`	`+ rtspAudioTrack.FeedInRawSamples((uint)(audioIndex * audioSampleDuration), new List<byte[]>() { audioTrack[0][audioIndex++ % audioTrack[0].Count] });`
`123`	`129`
`124`	`130`	`if (audioIndex % audioTrack[0].Count == 0)`
`125`	`131`	`{`