diff --git a/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj b/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
index 65a4394594..c71c76f08f 100644
--- a/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
+++ b/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
@@ -20,9 +20,8 @@
-
-
-
+
+
diff --git a/Jellyfin.Drawing.Skia/SkiaEncoder.cs b/Jellyfin.Drawing.Skia/SkiaEncoder.cs
index 1f7c43de81..a66ecc0813 100644
--- a/Jellyfin.Drawing.Skia/SkiaEncoder.cs
+++ b/Jellyfin.Drawing.Skia/SkiaEncoder.cs
@@ -395,6 +395,42 @@ namespace Jellyfin.Drawing.Skia
return rotated;
}
+ ///
+ /// Resizes an image on the CPU, by utilizing a surface and canvas.
+ ///
+ /// The source bitmap.
+ /// This specifies the target size and other information required to create the surface.
+ /// This enables anti-aliasing on the SKPaint instance.
+ /// This enables dithering on the SKPaint instance.
+ /// The resized image.
+ internal static SKImage ResizeImage(SKBitmap source, SKImageInfo targetInfo, bool isAntialias = false, bool isDither = false)
+ {
+ using var surface = SKSurface.Create(targetInfo);
+ using var canvas = surface.Canvas;
+ using var paint = new SKPaint();
+
+ paint.FilterQuality = SKFilterQuality.High;
+ paint.IsAntialias = isAntialias;
+ paint.IsDither = isDither;
+
+ var kernel = new float[9]
+ {
+ 0, -.1f, 0,
+ -.1f, 1.4f, -.1f,
+ 0, -.1f, 0,
+ };
+
+ var kernelSize = new SKSizeI(3, 3);
+ var kernelOffset = new SKPointI(1, 1);
+
+ paint.ImageFilter = SKImageFilter.CreateMatrixConvolution(
+ kernelSize, kernel, 1f, 0f, kernelOffset, SKShaderTileMode.Clamp, false);
+
+ canvas.DrawBitmap(source, SKRect.Create(0, 0, source.Width, source.Height), SKRect.Create(0, 0, targetInfo.Width, targetInfo.Height), paint);
+
+ return surface.Snapshot();
+ }
+
///
public string EncodeImage(string inputPath, DateTime dateModified, string outputPath, bool autoOrient, ImageOrientation? orientation, int quality, ImageProcessingOptions options, ImageFormat selectedOutputFormat)
{
@@ -436,9 +472,8 @@ namespace Jellyfin.Drawing.Skia
var width = newImageSize.Width;
var height = newImageSize.Height;
- using var resizedBitmap = new SKBitmap(width, height, bitmap.ColorType, bitmap.AlphaType);
- // scale image
- bitmap.ScalePixels(resizedBitmap, SKFilterQuality.High);
+ // scale image (the FromImage creates a copy)
+ using var resizedBitmap = SKBitmap.FromImage(ResizeImage(bitmap, new SKImageInfo(width, height, bitmap.ColorType, bitmap.AlphaType, bitmap.ColorSpace)));
// If all we're doing is resizing then we can stop now
if (!hasBackgroundColor && !hasForegroundColor && blur == 0 && !hasIndicator)
@@ -446,7 +481,7 @@ namespace Jellyfin.Drawing.Skia
Directory.CreateDirectory(Path.GetDirectoryName(outputPath));
using var outputStream = new SKFileWStream(outputPath);
using var pixmap = new SKPixmap(new SKImageInfo(width, height), resizedBitmap.GetPixels());
- pixmap.Encode(outputStream, skiaOutputFormat, quality);
+ resizedBitmap.Encode(outputStream, skiaOutputFormat, quality);
return outputPath;
}
diff --git a/Jellyfin.Drawing.Skia/StripCollageBuilder.cs b/Jellyfin.Drawing.Skia/StripCollageBuilder.cs
index e0ee4a342d..3b35594865 100644
--- a/Jellyfin.Drawing.Skia/StripCollageBuilder.cs
+++ b/Jellyfin.Drawing.Skia/StripCollageBuilder.cs
@@ -115,15 +115,13 @@ namespace Jellyfin.Drawing.Skia
// resize to the same aspect as the original
int iWidth = Math.Abs(iHeight * currentBitmap.Width / currentBitmap.Height);
- using var resizeBitmap = new SKBitmap(iWidth, iHeight, currentBitmap.ColorType, currentBitmap.AlphaType);
- currentBitmap.ScalePixels(resizeBitmap, SKFilterQuality.High);
+ using var resizedImage = SkiaEncoder.ResizeImage(bitmap, new SKImageInfo(iWidth, iHeight, currentBitmap.ColorType, currentBitmap.AlphaType, currentBitmap.ColorSpace));
// crop image
int ix = Math.Abs((iWidth - iSlice) / 2);
- using var image = SKImage.FromBitmap(resizeBitmap);
- using var subset = image.Subset(SKRectI.Create(ix, 0, iSlice, iHeight));
+ using var subset = resizedImage.Subset(SKRectI.Create(ix, 0, iSlice, iHeight));
// draw image onto canvas
- canvas.DrawImage(subset ?? image, iSlice * i, 0);
+ canvas.DrawImage(subset ?? resizedImage, iSlice * i, 0);
}
return bitmap;
@@ -177,9 +175,8 @@ namespace Jellyfin.Drawing.Skia
continue;
}
- using var resizedBitmap = new SKBitmap(cellWidth, cellHeight, currentBitmap.ColorType, currentBitmap.AlphaType);
- // scale image
- currentBitmap.ScalePixels(resizedBitmap, SKFilterQuality.High);
+ // Scale image. The FromBitmap creates a copy
+ using var resizedBitmap = SKBitmap.FromImage(SkiaEncoder.ResizeImage(bitmap, new SKImageInfo(cellWidth, cellHeight, currentBitmap.ColorType, currentBitmap.AlphaType, currentBitmap.ColorSpace)));
// draw this image into the strip at the next position
var xPos = x * cellWidth;