starred/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-01-23 23:20:51 +01:00
Code Issues 725 Projects Packages Wiki Activity Actions 2

Merge pull request #391 from EraYaN/remove-old-imageencoders

Browse source 
Remove old ImageEncoders (ImageMagick & Drawing.Net).

Skia should be enough.
This commit is contained in:
Vasily 2019-01-05 03:07:00 +03:00 • committed by GitHub
commit 80c3832610
21 changed files with 32 additions and 2164 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Jellyfin.Server/Jellyfin.Server.csproj
View file

@ -35,7 +35,6 @@
<ItemGroup>
<ProjectReference Include="..\Emby.Drawing\Emby.Drawing.csproj" />
<ProjectReference Include="..\Emby.Drawing.ImageMagick\Emby.Drawing.ImageMagick.csproj" />
<ProjectReference Include="..\Emby.Drawing.Skia\Emby.Drawing.Skia.csproj" />
<ProjectReference Include="..\Emby.IsoMounting\IsoMounter\IsoMounter.csproj" />
<ProjectReference Include="..\Emby.Server.Implementations\Emby.Server.Implementations.csproj" />

28
Jellyfin.Server/Program.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using System.Diagnostics;
using System.IO;
using System.Linq;
@ -8,7 +8,6 @@ using System.Reflection;
using System.Runtime.InteropServices;
using System.Threading.Tasks;
using Emby.Drawing;
using Emby.Drawing.ImageMagick;
using Emby.Drawing.Skia;
using Emby.Server.Implementations;
using Emby.Server.Implementations.EnvironmentInfo;
@ -194,26 +193,13 @@ namespace Jellyfin.Server
IEnvironmentInfo environment,
ILocalizationManager localizationManager)
{
if (!startupOptions.ContainsOption("-enablegdi"))
try
{
try
{
return new SkiaEncoder(logger, appPaths, httpClient, fileSystem, localizationManager);
}
catch (Exception ex)
{
logger.LogInformation(ex, "Skia not available. Will try next image processor. {0}");
}
try
{
return new ImageMagickEncoder(logger, appPaths, httpClient, fileSystem, environment);
}
catch (Exception ex)
{
logger.LogInformation(ex, "ImageMagick not available. Will try next image processor.");
}
_logger.LogInformation("Falling back on NullImageEncoder");
return new SkiaEncoder(logger, appPaths, httpClient, fileSystem, localizationManager);
}
catch (Exception ex)
{
logger.LogInformation(ex, "Skia not available. Will fallback to NullIMageEncoder. {0}");
}
return new NullImageEncoder();