Merge pull request #2893 from MediaBrowser/dev

Dev

Emby.Drawing/ImageProcessor.cs

@@ -810,7 +810,7 @@ namespace Emby.Drawing
             }
             catch (Exception ex)
             {
-                _logger.Error("Error enhancing image", ex);
+                _logger.ErrorException("Error enhancing image", ex);
             }
 
             return new Tuple<string, DateTime, bool>(originalImagePath, dateModified, inputImageSupportsTransparency);

Emby.Server.Implementations/ApplicationHost.cs

@@ -1853,7 +1853,31 @@ namespace Emby.Server.Implementations
                 "mbintros.dll",
                 "embytv.dll",
                 "Messenger.dll",
-                "MediaBrowser.Plugins.TvMazeProvider.dll"
+                "MediaBrowser.Plugins.TvMazeProvider.dll",
+                "MBBookshelf.dll",
+                "MediaBrowser.Channels.Adult.YouJizz.dll",
+                "MediaBrowser.Channels.Vine-co.dll",
+                "MediaBrowser.Plugins.Vimeo.dll",
+                "MediaBrowser.Channels.Vevo.dll",
+                "MediaBrowser.Plugins.Twitch.dll",
+                "MediaBrowser.Channels.SvtPlay.dll",
+                "MediaBrowser.Plugins.SoundCloud.dll",
+                "MediaBrowser.Plugins.SnesBox.dll",
+                "MediaBrowser.Plugins.RottenTomatoes.dll",
+                "MediaBrowser.Plugins.Revision3.dll",
+                "MediaBrowser.Plugins.NesBox.dll",
+                "MBChapters.dll",
+                "MediaBrowser.Channels.LeagueOfLegends.dll",
+                "MediaBrowser.Plugins.ADEProvider.dll",
+                "MediaBrowser.Channels.BallStreams.dll",
+                "MediaBrowser.Channels.Adult.Beeg.dll",
+                "ChannelDownloader.dll",
+                "Hamstercat.Emby.EmbyBands.dll",
+                "EmbyTV.dll",
+                "MediaBrowser.Channels.HitboxTV.dll",
+                "MediaBrowser.Channels.HockeyStreams.dll",
+                "MediaBrowser.Plugins.ITV.dll",
+                "MediaBrowser.Plugins.Lastfm.dll"
             };
 
             return !exclude.Contains(filename ?? string.Empty, StringComparer.OrdinalIgnoreCase);

Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs

@@ -185,11 +185,6 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
 
             if (_listener != null)
             {
-                foreach (var prefix in _listener.Prefixes.ToList())
-                {
-                    _listener.Prefixes.Remove(prefix);
-                }
-
                 _listener.Close();
             }
 

Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs

@@ -143,7 +143,7 @@ namespace Emby.Server.Implementations.LiveTv
                 stream = info.Item1;
                 directStreamProvider = info.Item2;
 
-                allowLiveStreamProbe = false;
+                //allowLiveStreamProbe = false;
             }
             else
             {

MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

@@ -1032,11 +1032,11 @@ namespace MediaBrowser.Controller.MediaEncoding
         {
             if (sourceBitrate <= 2000000)
             {
-                sourceBitrate *= 2;
+                sourceBitrate = Convert.ToInt32(sourceBitrate * 2.5);
             }
             else if (sourceBitrate <= 3000000)
             {
-                sourceBitrate = Convert.ToInt32(sourceBitrate * 1.5);
+                sourceBitrate = Convert.ToInt32(sourceBitrate * 2);
             }
 
             var bitrate = Math.Min(sourceBitrate, requestedBitrate);

SharedVersion.cs

@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.30.25")]
+[assembly: AssemblyVersion("3.2.30.26")]