diff options
Diffstat (limited to 'MediaBrowser.Model/Dlna/StreamInfo.cs')
| -rw-r--r-- | MediaBrowser.Model/Dlna/StreamInfo.cs | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/MediaBrowser.Model/Dlna/StreamInfo.cs b/MediaBrowser.Model/Dlna/StreamInfo.cs index f9aab2d67..13acd15a3 100644 --- a/MediaBrowser.Model/Dlna/StreamInfo.cs +++ b/MediaBrowser.Model/Dlna/StreamInfo.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; +using System.ComponentModel; using System.Globalization; using System.Linq; using System.Text; @@ -956,12 +957,10 @@ public class StreamInfo sb.Append(AudioStreamIndex.Value.ToString(CultureInfo.InvariantCulture)); } - if (SubtitleStreamIndex.HasValue && SubtitleDeliveryMethod != SubtitleDeliveryMethod.External && SubtitleStreamIndex != -1) + if (SubtitleStreamIndex.HasValue && (AlwaysBurnInSubtitleWhenTranscoding || SubtitleDeliveryMethod != SubtitleDeliveryMethod.External) && SubtitleStreamIndex != -1) { sb.Append("&SubtitleStreamIndex="); sb.Append(SubtitleStreamIndex.Value.ToString(CultureInfo.InvariantCulture)); - sb.Append("&SubtitleMethod="); - sb.Append(SubtitleDeliveryMethod.ToString()); } if (VideoBitrate.HasValue) @@ -1095,17 +1094,11 @@ public class StreamInfo sb.Append(CopyTimestamps.ToString(CultureInfo.InvariantCulture)); } - if (RequireAvc) - { - sb.Append("&RequireAvc="); - sb.Append(RequireAvc.ToString(CultureInfo.InvariantCulture)); - } + sb.Append("&RequireAvc="); + sb.Append(RequireAvc.ToString(CultureInfo.InvariantCulture).ToLowerInvariant()); - if (EnableAudioVbrEncoding) - { - sb.Append("EnableAudioVbrEncoding="); - sb.Append(EnableAudioVbrEncoding.ToString(CultureInfo.InvariantCulture).ToLowerInvariant()); - } + sb.Append("&EnableAudioVbrEncoding="); + sb.Append(EnableAudioVbrEncoding.ToString(CultureInfo.InvariantCulture).ToLowerInvariant()); } var etag = MediaSource?.ETag; @@ -1118,7 +1111,7 @@ public class StreamInfo if (SubtitleStreamIndex.HasValue && SubtitleDeliveryMethod != SubtitleDeliveryMethod.External) { sb.Append("&SubtitleMethod="); - sb.AppendJoin(',', SubtitleDeliveryMethod); + sb.Append(SubtitleDeliveryMethod); } if (SubtitleStreamIndex.HasValue && SubtitleDeliveryMethod == SubtitleDeliveryMethod.Embed && SubtitleCodecs.Count != 0) |