From 2ef30a3ba85190adb38ad7b2f360c2018cd0a5ff Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 21 Jan 2017 15:27:07 -0500 Subject: update program titles --- MediaBrowser.Controller/Entities/Audio/Audio.cs | 11 ++--------- MediaBrowser.Controller/Entities/InternalItemsQuery.cs | 2 +- MediaBrowser.Controller/Entities/Video.cs | 18 ++---------------- 3 files changed, 5 insertions(+), 26 deletions(-) (limited to 'MediaBrowser.Controller/Entities') diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs index 3a6a7765b1..4cc6a7c7e9 100644 --- a/MediaBrowser.Controller/Entities/Audio/Audio.cs +++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs @@ -267,15 +267,8 @@ namespace MediaBrowser.Controller.Entities.Audio } } - var bitrate = i.TotalBitrate ?? - info.MediaStreams.Where(m => m.Type == MediaStreamType.Audio) - .Select(m => m.BitRate ?? 0) - .Sum(); - - if (bitrate > 0) - { - info.Bitrate = bitrate; - } + info.Bitrate = i.TotalBitrate; + info.InferTotalBitrate(); return info; } diff --git a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs index 5cb9b9cee6..9c5730d05c 100644 --- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs +++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs @@ -197,7 +197,7 @@ namespace MediaBrowser.Controller.Entities public InternalItemsQuery() { - MinSimilarityScore = 1; + MinSimilarityScore = 20; GroupByPresentationUniqueKey = true; EnableTotalRecordCount = true; diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs index 47df12e1b6..fb9c3d2134 100644 --- a/MediaBrowser.Controller/Entities/Video.cs +++ b/MediaBrowser.Controller/Entities/Video.cs @@ -649,22 +649,8 @@ namespace MediaBrowser.Controller.Entities } } - try - { - var bitrate = i.TotalBitrate ?? - info.MediaStreams.Where(m => m.Type != MediaStreamType.Subtitle && !string.Equals(m.Codec, "mjpeg", StringComparison.OrdinalIgnoreCase)) - .Select(m => m.BitRate ?? 0) - .Sum(); - - if (bitrate > 0) - { - info.Bitrate = bitrate; - } - } - catch (OverflowException ex) - { - Logger.ErrorException("Error calculating total bitrate", ex); - } + info.Bitrate = i.TotalBitrate; + info.InferTotalBitrate(); return info; } -- cgit v1.2.3