From 6270f4c912a959730cb302d979aa9fba8fa38ec2 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 10 Jul 2015 14:30:42 -0400 Subject: updated nuget --- MediaBrowser.Model/Dlna/StreamBuilder.cs | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'MediaBrowser.Model/Dlna') diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index 3c1c7ea6d4..5a9b3f1b1e 100644 --- a/MediaBrowser.Model/Dlna/StreamBuilder.cs +++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs @@ -148,6 +148,7 @@ namespace MediaBrowser.Model.Dlna { if (!conditionProcessor.IsAudioConditionSatisfied(c, audioChannels, audioBitrate)) { + LogConditionFailure(options.Profile, "AudioCodecProfile", c, item); all = false; break; } @@ -274,14 +275,21 @@ namespace MediaBrowser.Model.Dlna { playMethods.Add(PlayMethod.DirectStream); } - + // The profile describes what the device supports // If device requirements are satisfied then allow both direct stream and direct play - if (item.SupportsDirectPlay && IsAudioEligibleForDirectPlay(item, GetBitrateForDirectPlayCheck(item, options))) + if (item.SupportsDirectPlay && + IsAudioEligibleForDirectPlay(item, GetBitrateForDirectPlayCheck(item, options))) { playMethods.Add(PlayMethod.DirectPlay); } } + else + { + _logger.Debug("Profile: {0}, No direct play profiles found for Path: {1}", + options.Profile.Name ?? "Unknown Profile", + item.Path ?? "Unknown path"); + } return playMethods; } @@ -774,8 +782,13 @@ namespace MediaBrowser.Model.Dlna private bool IsAudioEligibleForDirectPlay(MediaSourceInfo item, int? maxBitrate) { - // Honor the max bitrate setting - return !maxBitrate.HasValue || (item.Bitrate.HasValue && item.Bitrate.Value <= maxBitrate.Value); + if (!maxBitrate.HasValue || (item.Bitrate.HasValue && item.Bitrate.Value <= maxBitrate.Value)) + { + return true; + } + + _logger.Debug("Audio Bitrate exceeds DirectPlay limit"); + return false; } private void ValidateInput(VideoOptions options) -- cgit v1.2.3 From fe7fd7cd266be0fe8c0cc2be095cc0b267931ea9 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 10 Jul 2015 22:23:28 -0400 Subject: 3.0.5666.5 --- MediaBrowser.Model/Dlna/StreamBuilder.cs | 8 +------- .../Photos/BaseDynamicImageProvider.cs | 2 +- SharedVersion.cs | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) (limited to 'MediaBrowser.Model/Dlna') diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index 5a9b3f1b1e..340af3ac1a 100644 --- a/MediaBrowser.Model/Dlna/StreamBuilder.cs +++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs @@ -753,10 +753,9 @@ namespace MediaBrowser.Model.Dlna } } + // Look for supported embedded subs that we can just mux into the output foreach (SubtitleProfile profile in subtitleProfiles) { - bool requiresConversion = !StringHelper.EqualsIgnoreCase(subtitleStream.Codec, profile.Format); - if (!profile.SupportsLanguage(subtitleStream.Language)) { continue; @@ -764,11 +763,6 @@ namespace MediaBrowser.Model.Dlna if (profile.Method == SubtitleDeliveryMethod.Embed && subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format)) { - if (!requiresConversion) - { - return profile; - } - return profile; } } diff --git a/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs b/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs index 79ebc67d99..ef12544bac 100644 --- a/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs +++ b/MediaBrowser.Server.Implementations/Photos/BaseDynamicImageProvider.cs @@ -205,7 +205,7 @@ namespace MediaBrowser.Server.Implementations.Photos if (item is UserView) { - return HasChanged(item, ImageType.Primary) || HasChanged(item, ImageType.Thumb); + return HasChanged(item, ImageType.Primary); } var items = GetItemsWithImages(item).Result; diff --git a/SharedVersion.cs b/SharedVersion.cs index f55070fd16..db9f1d8503 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5666.4")] +[assembly: AssemblyVersion("3.0.5666.5")] -- cgit v1.2.3