diff options
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Dlna/StreamBuilder.cs | 7 | ||||
| -rw-r--r-- | MediaBrowser.Model/Extensions/ContainerHelper.cs | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index 6fc7f796d..bf122dcc7 100644 --- a/MediaBrowser.Model/Dlna/StreamBuilder.cs +++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs @@ -407,10 +407,9 @@ namespace MediaBrowser.Model.Dlna continue; } - var formatStr = format.ToString(); - if (directPlayProfile.SupportsContainer(formatStr)) + if (directPlayProfile.SupportsContainer(format)) { - return formatStr; + return format; } } } @@ -1317,6 +1316,7 @@ namespace MediaBrowser.Model.Dlna } var containerSupported = false; + TranscodeReason[] rankings = [TranscodeReason.VideoCodecNotSupported, VideoCodecReasons, TranscodeReason.AudioCodecNotSupported, AudioCodecReasons, ContainerReasons]; // Check DirectPlay profiles to see if it can be direct played var analyzedProfiles = profile.DirectPlayProfiles @@ -1382,7 +1382,6 @@ namespace MediaBrowser.Model.Dlna playMethod = PlayMethod.DirectStream; } - TranscodeReason[] rankings = [TranscodeReason.VideoCodecNotSupported, VideoCodecReasons, TranscodeReason.AudioCodecNotSupported, AudioCodecReasons, ContainerReasons]; var ranked = GetRank(ref failureReasons, rankings); return (Result: (Profile: directPlayProfile, PlayMethod: playMethod, AudioStreamIndex: selectedAudioStream?.Index, TranscodeReason: failureReasons), Order: order, Rank: ranked); diff --git a/MediaBrowser.Model/Extensions/ContainerHelper.cs b/MediaBrowser.Model/Extensions/ContainerHelper.cs index 4b75657ff..c86328ba6 100644 --- a/MediaBrowser.Model/Extensions/ContainerHelper.cs +++ b/MediaBrowser.Model/Extensions/ContainerHelper.cs @@ -91,7 +91,7 @@ public static class ContainerHelper { foreach (var profile in allProfileContainers) { - if (container.Equals(profile, StringComparison.OrdinalIgnoreCase)) + if (!profile.IsEmpty && container.Equals(profile, StringComparison.OrdinalIgnoreCase)) { return !isNegativeList; } @@ -118,7 +118,7 @@ public static class ContainerHelper return true; } - var allInputContainers = inputContainer.Split(','); + var allInputContainers = Split(inputContainer); foreach (var container in allInputContainers) { foreach (var profile in profileContainers) |