7 files changed, 63 insertions, 11 deletions
diff --git a/MediaBrowser.Model/Dlna/CodecType.cs b/MediaBrowser.Model/Dlna/CodecType.cs
index c9f090e4cc..12730a76fa 100644
--- a/MediaBrowser.Model/Dlna/CodecType.cs
+++ b/MediaBrowser.Model/Dlna/CodecType.cs
@@ -1,11 +1,23 @@
-#pragma warning disable CS1591
-
 namespace MediaBrowser.Model.Dlna
 {
+    /// <summary>
+    /// The codec type of a codec profile.
+    /// </summary>
     public enum CodecType
     {
+        /// <summary>
+        /// The profile applies to a video codec.
+        /// </summary>
         Video = 0,
+
+        /// <summary>
+        /// The profile applies to the audio codec of a video stream.
+        /// </summary>
         VideoAudio = 1,
+
+        /// <summary>
+        /// The profile applies to an audio codec.
+        /// </summary>
         Audio = 2
     }
 }
diff --git a/MediaBrowser.Model/Dlna/EncodingContext.cs b/MediaBrowser.Model/Dlna/EncodingContext.cs
index 79ca6366d7..1408333d2e 100644
--- a/MediaBrowser.Model/Dlna/EncodingContext.cs
+++ b/MediaBrowser.Model/Dlna/EncodingContext.cs
@@ -1,10 +1,18 @@
-#pragma warning disable CS1591
-
 namespace MediaBrowser.Model.Dlna
 {
+    /// <summary>
+    /// The encoding context.
+    /// </summary>
     public enum EncodingContext
     {
+        /// <summary>
+        /// The media is transcoded on the fly and delivered as a stream.
+        /// </summary>
         Streaming = 0,
+
+        /// <summary>
+        /// The media is transcoded to a static file.
+        /// </summary>
         Static = 1
     }
 }
diff --git a/MediaBrowser.Model/Dlna/PlaybackErrorCode.cs b/MediaBrowser.Model/Dlna/PlaybackErrorCode.cs
index 300fab5c50..a28f422a2b 100644
--- a/MediaBrowser.Model/Dlna/PlaybackErrorCode.cs
+++ b/MediaBrowser.Model/Dlna/PlaybackErrorCode.cs
@@ -1,11 +1,23 @@
-#pragma warning disable CS1591
-
 namespace MediaBrowser.Model.Dlna
 {
+    /// <summary>
+    /// The playback error code.
+    /// </summary>
     public enum PlaybackErrorCode
     {
+        /// <summary>
+        /// Playback of the item is not allowed.
+        /// </summary>
         NotAllowed = 0,
+
+        /// <summary>
+        /// No stream compatible with the device profile was found.
+        /// </summary>
         NoCompatibleStream = 1,
+
+        /// <summary>
+        /// The rate limit has been exceeded.
+        /// </summary>
         RateLimitExceeded = 2
     }
 }
diff --git a/MediaBrowser.Model/Dlna/ResolutionOptions.cs b/MediaBrowser.Model/Dlna/ResolutionOptions.cs
index 774592abc7..b161b4a1e4 100644
--- a/MediaBrowser.Model/Dlna/ResolutionOptions.cs
+++ b/MediaBrowser.Model/Dlna/ResolutionOptions.cs
@@ -1,11 +1,18 @@
-#pragma warning disable CS1591
-
 namespace MediaBrowser.Model.Dlna
 {
+    /// <summary>
+    /// The resolution constraints.
+    /// </summary>
     public class ResolutionOptions
     {
+        /// <summary>
+        /// Gets or sets the maximum width.
+        /// </summary>
         public int? MaxWidth { get; set; }
 
+        /// <summary>
+        /// Gets or sets the maximum height.
+        /// </summary>
         public int? MaxHeight { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs
index a9ab7d6db0..ab8d5dd5b2 100644
--- a/MediaBrowser.Model/Dlna/StreamBuilder.cs
+++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs
@@ -1582,7 +1582,11 @@ namespace MediaBrowser.Model.Dlna
                     continue;
                 }
 
-                if (!subtitleStream.IsExternal && playMethod == PlayMethod.Transcode && !transcoderSupport.CanExtractSubtitles(subtitleStream.Codec))
+                if (!subtitleStream.IsExternal
+                    && playMethod == PlayMethod.Transcode
+                    && !transcoderSupport.CanExtractSubtitles(subtitleStream.Codec)
+                    && !subtitleStream.IsPgsSubtitleStream
+                    && !subtitleStream.IsVobSubSubtitleStream)
                 {
                     continue;
                 }
diff --git a/MediaBrowser.Model/Dlna/TranscodeSeekInfo.cs b/MediaBrowser.Model/Dlna/TranscodeSeekInfo.cs
index cc0c6069bf..1563ffd17a 100644
--- a/MediaBrowser.Model/Dlna/TranscodeSeekInfo.cs
+++ b/MediaBrowser.Model/Dlna/TranscodeSeekInfo.cs
@@ -1,10 +1,18 @@
-#pragma warning disable CS1591
-
 namespace MediaBrowser.Model.Dlna
 {
+    /// <summary>
+    /// The transcode seek info.
+    /// </summary>
     public enum TranscodeSeekInfo
     {
+        /// <summary>
+        /// The seek method is chosen automatically.
+        /// </summary>
         Auto = 0,
+
+        /// <summary>
+        /// Seeking is performed by byte position.
+        /// </summary>
         Bytes = 1
     }
 }
diff --git a/MediaBrowser.Model/Dlna/TranscodingProfile.cs b/MediaBrowser.Model/Dlna/TranscodingProfile.cs
index f49b24976a..b5adee173b 100644
--- a/MediaBrowser.Model/Dlna/TranscodingProfile.cs
+++ b/MediaBrowser.Model/Dlna/TranscodingProfile.cs
@@ -141,6 +141,7 @@ public class TranscodingProfile
     /// Gets or sets a value indicating whether breaking the video stream on non-keyframes is supported.
     /// </summary>
     [DefaultValue(false)]
+    [XmlIgnore]
     [XmlAttribute("breakOnNonKeyFrames")]
     [Obsolete("This is always false")]
     public bool? BreakOnNonKeyFrames { get; set; }