diff --git a/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs b/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs index c806273408..8c041a178c 100644 --- a/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs +++ b/MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs @@ -229,7 +229,7 @@ namespace MediaBrowser.Api.DefaultTheme var movies = items.OfType() .ToList(); - var hdMovies = movies.Where(i => i.IsHd).ToList(); + var hdMovies = movies.Where(i => i.IsHD).ToList(); var familyGenres = request.FamilyGenre.Split(',').ToDictionary(i => i, StringComparer.OrdinalIgnoreCase); diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index c782c243d0..b002d556b0 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -5,6 +5,7 @@ using MediaBrowser.Common.MediaInfo; using MediaBrowser.Controller; using MediaBrowser.Controller.Dto; using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.MediaInfo; using MediaBrowser.Model.Drawing; @@ -442,7 +443,23 @@ namespace MediaBrowser.Api.Playback /// System.String. protected string GetProbeSizeArgument(BaseItem item) { - return MediaEncoder.GetProbeSizeArgument(MediaEncoderHelpers.GetInputType(item)); + var type = InputType.AudioFile; + + if (item is Audio) + { + type = MediaEncoderHelpers.GetInputType(item.Path, null, null); + } + else + { + var video = item as Video; + + if (video != null) + { + type = MediaEncoderHelpers.GetInputType(item.Path, video.VideoType, video.IsoType); + } + } + + return MediaEncoder.GetProbeSizeArgument(type); } /// diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs index 3437cdd5ab..413c683deb 100644 --- a/MediaBrowser.Api/UserLibrary/ItemsService.cs +++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs @@ -756,7 +756,7 @@ namespace MediaBrowser.Api.UserLibrary if (request.IsHD.HasValue) { - items = items.OfType