diff options
| author | dkanada <dkanada@users.noreply.github.com> | 2020-02-21 12:32:54 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-21 12:32:54 +0900 |
| commit | 61015c1d0f1e3c8521f3cd107fb979eb1b47b008 (patch) | |
| tree | 10c35c884846f39cbe855e1f059da2b8be6eaf0f /Jellyfin.Server/Program.cs | |
| parent | 28cc210a5e8f6fc234178f2f667d8ce1f8596dec (diff) | |
| parent | a2490a7ae5c636d97085a0e950fbbe1a027bfdb0 (diff) | |
Merge pull request #2321 from Bond-009/images
Simplify image processing by removing image enhancers
Diffstat (limited to 'Jellyfin.Server/Program.cs')
| -rw-r--r-- | Jellyfin.Server/Program.cs | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/Jellyfin.Server/Program.cs b/Jellyfin.Server/Program.cs index 1b4280d82..1dd598236 100644 --- a/Jellyfin.Server/Program.cs +++ b/Jellyfin.Server/Program.cs @@ -168,7 +168,7 @@ namespace Jellyfin.Server _loggerFactory, options, new ManagedFileSystem(_loggerFactory.CreateLogger<ManagedFileSystem>(), appPaths), - new NullImageEncoder(), + GetImageEncoder(appPaths), new NetworkManager(_loggerFactory.CreateLogger<NetworkManager>()), appConfig); try @@ -192,8 +192,6 @@ namespace Jellyfin.Server throw; } - appHost.ImageProcessor.ImageEncoder = GetImageEncoder(appPaths, appHost.LocalizationManager); - await appHost.RunStartupTasksAsync().ConfigureAwait(false); stopWatch.Stop(); @@ -491,9 +489,7 @@ namespace Jellyfin.Server } } - private static IImageEncoder GetImageEncoder( - IApplicationPaths appPaths, - ILocalizationManager localizationManager) + private static IImageEncoder GetImageEncoder(IApplicationPaths appPaths) { try { @@ -502,8 +498,7 @@ namespace Jellyfin.Server return new SkiaEncoder( _loggerFactory.CreateLogger<SkiaEncoder>(), - appPaths, - localizationManager); + appPaths); } catch (Exception ex) { |