diff options
| -rw-r--r-- | MediaBrowser.Model/Dlna/StreamBuilder.cs | 29 | ||||
| -rw-r--r-- | MediaBrowser.Model/Entities/MediaStream.cs | 18 |
2 files changed, 32 insertions, 15 deletions
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index 721da54a8..117d738f3 100644 --- a/MediaBrowser.Model/Dlna/StreamBuilder.cs +++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs @@ -10,8 +10,6 @@ namespace MediaBrowser.Model.Dlna { public class StreamBuilder { - private readonly string[] _serverTextSubtitleOutputs = { "srt", "vtt", "ttml" }; - public StreamInfo BuildAudioItem(AudioOptions options) { ValidateAudioInput(options); @@ -544,16 +542,18 @@ namespace MediaBrowser.Model.Dlna private SubtitleProfile GetSubtitleProfile(MediaStream subtitleStream, VideoOptions options) { - if (subtitleStream.IsTextSubtitleStream) + // Look for an external profile that matches the stream type (text/graphical) + foreach (SubtitleProfile profile in options.Profile.SubtitleProfiles) { - SubtitleProfile externalProfile = GetSubtitleProfile(options.Profile.SubtitleProfiles, SubtitleDeliveryMethod.External, _serverTextSubtitleOutputs); - - if (externalProfile != null) + if (profile.Method == SubtitleDeliveryMethod.External && subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format)) { - return externalProfile; + return profile; } + } - SubtitleProfile embedProfile = GetSubtitleProfile(options.Profile.SubtitleProfiles, SubtitleDeliveryMethod.Embed, _serverTextSubtitleOutputs); + if (subtitleStream.IsTextSubtitleStream) + { + SubtitleProfile embedProfile = GetSubtitleProfile(options.Profile.SubtitleProfiles, SubtitleDeliveryMethod.Embed); if (embedProfile != null) { @@ -581,6 +581,19 @@ namespace MediaBrowser.Model.Dlna return null; } + private SubtitleProfile GetSubtitleProfile(SubtitleProfile[] profiles, SubtitleDeliveryMethod method) + { + foreach (SubtitleProfile profile in profiles) + { + if (method == profile.Method) + { + return profile; + } + } + + return null; + } + private bool IsAudioEligibleForDirectPlay(MediaSourceInfo item, int? maxBitrate) { // Honor the max bitrate setting diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs index 4a9b765c2..db4a68cff 100644 --- a/MediaBrowser.Model/Entities/MediaStream.cs +++ b/MediaBrowser.Model/Entities/MediaStream.cs @@ -141,16 +141,20 @@ namespace MediaBrowser.Model.Entities { if (Type != MediaStreamType.Subtitle) return false; - string codec = Codec ?? string.Empty; - - // sub = external .sub file - - return StringHelper.IndexOfIgnoreCase(codec, "pgs") == -1 && - StringHelper.IndexOfIgnoreCase(codec, "dvd") == -1 && - !StringHelper.EqualsIgnoreCase(codec, "sub"); + return IsTextFormat(Codec); } } + public static bool IsTextFormat(string format) + { + string codec = format ?? string.Empty; + + // sub = external .sub file + + return StringHelper.IndexOfIgnoreCase(codec, "pgs") == -1 && + StringHelper.IndexOfIgnoreCase(codec, "dvd") == -1 && + !StringHelper.EqualsIgnoreCase(codec, "sub"); + } /// <summary> /// Gets or sets the filename. |