Code style

ngraziano · Nov 19, 2024 · 9f190fa · 9f190fa
1 parent 62f553a
commit 9f190fa
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 98 deletions.
diff --git a/RTSP/Sdp/H264Parameters.cs b/RTSP/Sdp/H264Parameters.cs
@@ -7,22 +7,13 @@ namespace Rtsp.Sdp
 {
     public class H264Parameters : IDictionary<string, string>
     {
+        private const string HeaderName = "sprop-parameter-sets";
         private readonly Dictionary<string, string> parameters = [];
 
-        public IList<byte[]> SpropParameterSets
-        {
-            get
-            {
-                List<byte[]> result = [];
-
-                if (ContainsKey("sprop-parameter-sets") && this["sprop-parameter-sets"] != null)
-                {
-                    result.AddRange(this["sprop-parameter-sets"].Split(',').Select(x => Convert.FromBase64String(x)));
-                }
-
-                return result;
-            }
-        }
+        public IList<byte[]> SpropParameterSets =>
+            TryGetValue(HeaderName, out var value)
+                ? value.Split(',').Select(Convert.FromBase64String).ToList()
+                : [];
 
         public static H264Parameters Parse(string parameterString)
         {
@@ -32,12 +23,14 @@ public static H264Parameters Parse(string parameterString)
                 if (!string.IsNullOrWhiteSpace(pair[0]))
                     result[pair[0]] = pair.Length > 1 ? pair[1] : string.Empty;
             }
+
             return result;
         }
 
         public override string ToString()
         {
-            return parameters.Select(p => p.Key + (p.Value != null ? "=" + p.Value : string.Empty)).Aggregate((x, y) => x + ";" + y);
+            return parameters.Select(p => p.Key + (p.Value != null ? "=" + p.Value : string.Empty))
+                .Aggregate((x, y) => x + ";" + y);
         }
 
         public string this[string index]
@@ -60,13 +53,16 @@ public string this[string index]
 
         public void Clear() => parameters.Clear();
 
-        public bool Contains(KeyValuePair<string, string> item) => ((IDictionary<string, string>)parameters).Contains(item);
+        public bool Contains(KeyValuePair<string, string> item) =>
+            ((IDictionary<string, string>)parameters).Contains(item);
 
         public bool ContainsKey(string key) => parameters.ContainsKey(key);
 
-        public void CopyTo(KeyValuePair<string, string>[] array, int arrayIndex) => ((IDictionary<string, string>)parameters).CopyTo(array, arrayIndex);
+        public void CopyTo(KeyValuePair<string, string>[] array, int arrayIndex) =>
+            ((IDictionary<string, string>)parameters).CopyTo(array, arrayIndex);
 
-        public IEnumerator<KeyValuePair<string, string>> GetEnumerator() => ((IDictionary<string, string>)parameters).GetEnumerator();
+        public IEnumerator<KeyValuePair<string, string>> GetEnumerator() =>
+            ((IDictionary<string, string>)parameters).GetEnumerator();
 
         public bool Remove(KeyValuePair<string, string> item) => ((IDictionary<string, string>)parameters).Remove(item);
 
@@ -76,4 +72,4 @@ public string this[string index]
 
         IEnumerator IEnumerable.GetEnumerator() => ((IDictionary<string, string>)parameters).GetEnumerator();
     }
-}
+}
diff --git a/RTSP/Sdp/H265Parameters.cs b/RTSP/Sdp/H265Parameters.cs
@@ -33,6 +33,7 @@ public IList<byte[]> SpropParameterSets
                 {
                     result.AddRange(this["sprop-pps"].Split(',').Select(x => Convert.FromBase64String(x)));
                 }
+
                 return result;
             }
         }
@@ -45,105 +46,51 @@ public static H265Parameters Parse(string parameterString)
                 if (!string.IsNullOrWhiteSpace(pair[0]))
                     result[pair[0]] = pair.Length > 1 ? pair[1] : string.Empty;
             }
+
             return result;
         }
 
-        public override string ToString()
-        {
-            return parameters.Select(p => p.Key + (p.Value != null ? "=" + p.Value : string.Empty)).Aggregate((x, y) => x + ";" + y);
-        }
+        public override string ToString() =>
+            parameters.Select(p => p.Key + (p.Value != null ? "=" + p.Value : string.Empty))
+                .Aggregate((x, y) => x + ";" + y);
 
         public string this[string index]
         {
-            get { return parameters[index]; }
-            set { parameters[index] = value; }
+            get => parameters[index];
+            set => parameters[index] = value;
         }
 
-        public int Count
-        {
-            get
-            {
-                return parameters.Count;
-            }
-        }
+        public int Count => parameters.Count;
 
-        public bool IsReadOnly
-        {
-            get
-            {
-                return ((IDictionary<string, string>)parameters).IsReadOnly;
-            }
-        }
+        public bool IsReadOnly => ((IDictionary<string, string>)parameters).IsReadOnly;
 
-        public ICollection<string> Keys
-        {
-            get
-            {
-                return ((IDictionary<string, string>)parameters).Keys;
-            }
-        }
+        public ICollection<string> Keys => ((IDictionary<string, string>)parameters).Keys;
 
-        public ICollection<string> Values
-        {
-            get
-            {
-                return ((IDictionary<string, string>)parameters).Values;
-            }
-        }
+        public ICollection<string> Values => ((IDictionary<string, string>)parameters).Values;
 
-        public void Add(KeyValuePair<string, string> item)
-        {
-            ((IDictionary<string, string>)parameters).Add(item);
-        }
+        public void Add(KeyValuePair<string, string> item) => ((IDictionary<string, string>)parameters).Add(item);
 
-        public void Add(string key, string value)
-        {
-            parameters.Add(key, value);
-        }
+        public void Add(string key, string value) => parameters.Add(key, value);
 
-        public void Clear()
-        {
-            parameters.Clear();
-        }
+        public void Clear() => parameters.Clear();
 
-        public bool Contains(KeyValuePair<string, string> item)
-        {
-            return ((IDictionary<string, string>)parameters).Contains(item);
-        }
+        public bool Contains(KeyValuePair<string, string> item) =>
+            ((IDictionary<string, string>)parameters).Contains(item);
 
-        public bool ContainsKey(string key)
-        {
-            return parameters.ContainsKey(key);
-        }
+        public bool ContainsKey(string key) => parameters.ContainsKey(key);
 
-        public void CopyTo(KeyValuePair<string, string>[] array, int arrayIndex)
-        {
+        public void CopyTo(KeyValuePair<string, string>[] array, int arrayIndex) =>
             ((IDictionary<string, string>)parameters).CopyTo(array, arrayIndex);
-        }
 
-        public IEnumerator<KeyValuePair<string, string>> GetEnumerator()
-        {
-            return ((IDictionary<string, string>)parameters).GetEnumerator();
-        }
+        public IEnumerator<KeyValuePair<string, string>> GetEnumerator() =>
+            ((IDictionary<string, string>)parameters).GetEnumerator();
 
-        public bool Remove(KeyValuePair<string, string> item)
-        {
-            return ((IDictionary<string, string>)parameters).Remove(item);
-        }
+        public bool Remove(KeyValuePair<string, string> item) => ((IDictionary<string, string>)parameters).Remove(item);
 
-        public bool Remove(string key)
-        {
-            return parameters.Remove(key);
-        }
+        public bool Remove(string key) => parameters.Remove(key);
 
-        public bool TryGetValue(string key, out string value)
-        {
-            return parameters.TryGetValue(key, out value!);
-        }
+        public bool TryGetValue(string key, out string value) => parameters.TryGetValue(key, out value!);
 
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return ((IDictionary<string, string>)parameters).GetEnumerator();
-        }
+        IEnumerator IEnumerable.GetEnumerator() => ((IDictionary<string, string>)parameters).GetEnumerator();
     }
-}
+}
diff --git a/RTSP/Sdp/Origin.cs b/RTSP/Sdp/Origin.cs
@@ -3,7 +3,7 @@
 namespace Rtsp.Sdp
 {
     /// <summary>
-    /// Object ot represent orgin in an Session Description Protocol
+    /// Object ot represent origin in a Session Description Protocol
     /// </summary>
     public class Origin
     {