Correct some type for rtp value

ngraziano · Apr 11, 2024 · 70d9197 · 70d9197
1 parent ae9833d
commit 70d9197
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/RTSP/RTSP.csproj b/RTSP/RTSP.csproj
@@ -10,7 +10,7 @@
     <Authors>ngraziano</Authors>
     <Product>SharpRTSP</Product>
     <Description>Handle receive and send of Rtsp Messages</Description>
-    <VersionPrefix>1.4.0</VersionPrefix>
+    <VersionPrefix>1.4.1</VersionPrefix>
     <PackageProjectUrl>https://github.com/ngraziano/SharpRTSP</PackageProjectUrl>
     <RepositoryUrl>https://github.com/ngraziano/SharpRTSP</RepositoryUrl>
     <EnableNETAnalyzers>True</EnableNETAnalyzers>

diff --git a/RTSP/Rtp/AACPayload.cs b/RTSP/Rtp/AACPayload.cs
@@ -194,7 +194,7 @@ public RawMediaFrame ProcessPacket(RtpPacket packet)
             {
                 RtpTimestamp = packet.Timestamp,
                 ClockTimestamp = RtpPacketOnvifUtils.ProcessRTPTimestampExtension(packet.Extension, headerPosition: out _),
-        };
+            };
+        }
     }
 }
-}
diff --git a/RTSP/Rtp/RawMediaFrame.cs b/RTSP/Rtp/RawMediaFrame.cs
@@ -21,7 +21,7 @@ public IEnumerable<ReadOnlyMemory<byte>> Data
         }
 
         public required DateTime ClockTimestamp { get; init; }
-        public required ulong RtpTimestamp { get; init; }
+        public required uint RtpTimestamp { get; init; }
 
 
         public RawMediaFrame(IEnumerable<ReadOnlyMemory<byte>> data, IEnumerable<IMemoryOwner<byte>> owners)

diff --git a/RTSP/Rtp/RtpPacket.cs b/RTSP/Rtp/RtpPacket.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Buffers.Binary;
 
 namespace Rtsp.Rtp
 {
@@ -11,15 +12,17 @@ public RtpPacket(ReadOnlySpan<byte> rawData)
             this.rawData = rawData;
         }
 
+        public bool IsWellFormed => rawData.Length >= 12 && Version == 2 && PayloadSize >= 0;
+
         public int Version => (rawData[0] >> 6) & 0x03;
         public bool HasPadding => (rawData[0] & 0x20) > 0;
         public bool HasExtension => (rawData[0] & 0x10) > 0;
         public int CsrcCount => rawData[0] & 0x0F;
         public bool IsMarker => (rawData[1] & 0x80) > 0;
         public int PayloadType => rawData[1] & 0x7F;
-        public int SequenceNumber => (rawData[2] << 8) + rawData[3];
-        public ulong Timestamp => (ulong)(rawData[4] << 24) + (ulong)(rawData[5] << 16) + (ulong)(rawData[6] << 8) + (ulong)rawData[7];
-        public ulong Ssrc => (ulong)(rawData[8] << 24) + (ulong)(rawData[9] << 16) + (ulong)(rawData[10] << 8) + (ulong)rawData[11];
+        public int SequenceNumber => BinaryPrimitives.ReadUInt16BigEndian(rawData[2..]);
+        public uint Timestamp => BinaryPrimitives.ReadUInt32BigEndian(rawData[4..]);
+        public uint Ssrc => BinaryPrimitives.ReadUInt32BigEndian(rawData[8..]);
 
         public int? ExtensionHeaderId => HasExtension ? (rawData[HeaderSize] << 8) + rawData[HeaderSize + 1] : null;