lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to BlurHashSharp lib which should be faster

Browse Source
This commit is contained in:
Vasily 2020-05-19 13:46:00 +03:00
parent bfb644d5f5
commit f18293bf76
2 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
View File

@ -18,11 +18,11 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="BlurHashSharp" Version="1.0.0" />
<PackageReference Include="BlurHashSharp.SkiaSharp" Version="1.0.0" />
<PackageReference Include="SkiaSharp" Version="1.68.1" /> <PackageReference Include="SkiaSharp" Version="1.68.1" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="1.68.1" /> <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="1.68.1" />
<PackageReference Include="Jellyfin.SkiaSharp.NativeAssets.LinuxArm" Version="1.68.1" /> <PackageReference Include="Jellyfin.SkiaSharp.NativeAssets.LinuxArm" Version="1.68.1" />
<PackageReference Include="Blurhash.Core" Version="*" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

28
Jellyfin.Drawing.Skia/SkiaEncoder.cs
View File

@ -5,7 +5,7 @@ using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using Blurhash.Core; using BlurHashSharp.SkiaSharp;
using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Configuration;
using MediaBrowser.Controller.Drawing; using MediaBrowser.Controller.Drawing;
using MediaBrowser.Controller.Extensions; using MediaBrowser.Controller.Extensions;
@ -19,7 +19,7 @@ namespace Jellyfin.Drawing.Skia
/// <summary> /// <summary>
/// Image encoder that uses <see cref="SkiaSharp"/> to manipulate images. /// Image encoder that uses <see cref="SkiaSharp"/> to manipulate images.
/// </summary> /// </summary>
public class SkiaEncoder : CoreEncoder, IImageEncoder public class SkiaEncoder : IImageEncoder
{ {
private static readonly HashSet<string> _transparentImageTypes private static readonly HashSet<string> _transparentImageTypes
= new HashSet<string>(StringComparer.OrdinalIgnoreCase) { ".png", ".gif", ".webp" }; = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { ".png", ".gif", ".webp" };
@ -250,29 +250,7 @@ namespace Jellyfin.Drawing.Skia
throw new FileNotFoundException("File not found", path); throw new FileNotFoundException("File not found", path);
} }
using (var bitmap = GetBitmap(path, false, false, null)) return BlurHashSharp.SkiaSharp.BlurHashEncoder.Encode(4, 4, path);
{
if (bitmap == null)
{
throw new ArgumentOutOfRangeException($"Skia unable to read image {path}");
}
var width = bitmap.Width;
var height = bitmap.Height;
var pixels = new Pixel[width, height];
Parallel.ForEach(Enumerable.Range(0, height), y =>
{
for (var x = 0; x < width; x++)
{
var color = bitmap.GetPixel(x, y);
pixels[x, y].Red = MathUtils.SRgbToLinear(color.Red);
pixels[x, y].Green = MathUtils.SRgbToLinear(color.Green);
pixels[x, y].Blue = MathUtils.SRgbToLinear(color.Blue);
}
});
return CoreEncode(pixels, 4, 4);
}
} }
private static bool HasDiacritics(string text) private static bool HasDiacritics(string text)