diff --git a/src/Jellyfin.Drawing.Skia/PercentPlayedDrawer.cs b/src/Jellyfin.Drawing.Skia/PercentPlayedDrawer.cs
index 6136a2ff98..e2e90be475 100644
--- a/src/Jellyfin.Drawing.Skia/PercentPlayedDrawer.cs
+++ b/src/Jellyfin.Drawing.Skia/PercentPlayedDrawer.cs
@@ -2,35 +2,34 @@ using System;
using MediaBrowser.Model.Drawing;
using SkiaSharp;
-namespace Jellyfin.Drawing.Skia
+namespace Jellyfin.Drawing.Skia;
+
+///
+/// Static helper class used to draw percentage-played indicators on images.
+///
+public static class PercentPlayedDrawer
{
+ private const int IndicatorHeight = 8;
+
///
- /// Static helper class used to draw percentage-played indicators on images.
+ /// Draw a percentage played indicator on a canvas.
///
- public static class PercentPlayedDrawer
+ /// The canvas to draw the indicator on.
+ /// The size of the image being drawn on.
+ /// The percentage played to display with the indicator.
+ public static void Process(SKCanvas canvas, ImageDimensions imageSize, double percent)
{
- private const int IndicatorHeight = 8;
-
- ///
- /// Draw a percentage played indicator on a canvas.
- ///
- /// The canvas to draw the indicator on.
- /// The size of the image being drawn on.
- /// The percentage played to display with the indicator.
- public static void Process(SKCanvas canvas, ImageDimensions imageSize, double percent)
- {
- using var paint = new SKPaint();
- var endX = imageSize.Width - 1;
- var endY = imageSize.Height - 1;
+ using var paint = new SKPaint();
+ var endX = imageSize.Width - 1;
+ var endY = imageSize.Height - 1;
- paint.Color = SKColor.Parse("#99000000");
- paint.Style = SKPaintStyle.Fill;
- canvas.DrawRect(SKRect.Create(0, (float)endY - IndicatorHeight, endX, endY), paint);
+ paint.Color = SKColor.Parse("#99000000");
+ paint.Style = SKPaintStyle.Fill;
+ canvas.DrawRect(SKRect.Create(0, (float)endY - IndicatorHeight, endX, endY), paint);
- double foregroundWidth = (endX * percent) / 100;
+ double foregroundWidth = (endX * percent) / 100;
- paint.Color = SKColor.Parse("#FF00A4DC");
- canvas.DrawRect(SKRect.Create(0, (float)endY - IndicatorHeight, Convert.ToInt32(foregroundWidth), endY), paint);
- }
+ paint.Color = SKColor.Parse("#FF00A4DC");
+ canvas.DrawRect(SKRect.Create(0, (float)endY - IndicatorHeight, Convert.ToInt32(foregroundWidth), endY), paint);
}
}
diff --git a/src/Jellyfin.Drawing.Skia/PlayedIndicatorDrawer.cs b/src/Jellyfin.Drawing.Skia/PlayedIndicatorDrawer.cs
index 2a37299428..5bb42fb99e 100644
--- a/src/Jellyfin.Drawing.Skia/PlayedIndicatorDrawer.cs
+++ b/src/Jellyfin.Drawing.Skia/PlayedIndicatorDrawer.cs
@@ -1,48 +1,47 @@
using MediaBrowser.Model.Drawing;
using SkiaSharp;
-namespace Jellyfin.Drawing.Skia
+namespace Jellyfin.Drawing.Skia;
+
+///
+/// Static helper class for drawing 'played' indicators.
+///
+public static class PlayedIndicatorDrawer
{
+ private const int OffsetFromTopRightCorner = 38;
+
///
- /// Static helper class for drawing 'played' indicators.
+ /// Draw a 'played' indicator in the top right corner of a canvas.
///
- public static class PlayedIndicatorDrawer
+ /// The canvas to draw the indicator on.
+ ///
+ /// The dimensions of the image to draw the indicator on. The width is used to determine the x-position of the
+ /// indicator.
+ ///
+ public static void DrawPlayedIndicator(SKCanvas canvas, ImageDimensions imageSize)
{
- private const int OffsetFromTopRightCorner = 38;
-
- ///
- /// Draw a 'played' indicator in the top right corner of a canvas.
- ///
- /// The canvas to draw the indicator on.
- ///
- /// The dimensions of the image to draw the indicator on. The width is used to determine the x-position of the
- /// indicator.
- ///
- public static void DrawPlayedIndicator(SKCanvas canvas, ImageDimensions imageSize)
- {
- var x = imageSize.Width - OffsetFromTopRightCorner;
+ var x = imageSize.Width - OffsetFromTopRightCorner;
- using var paint = new SKPaint
- {
- Color = SKColor.Parse("#CC00A4DC"),
- Style = SKPaintStyle.Fill
- };
+ using var paint = new SKPaint
+ {
+ Color = SKColor.Parse("#CC00A4DC"),
+ Style = SKPaintStyle.Fill
+ };
- canvas.DrawCircle(x, OffsetFromTopRightCorner, 20, paint);
+ canvas.DrawCircle(x, OffsetFromTopRightCorner, 20, paint);
- paint.Color = new SKColor(255, 255, 255, 255);
- paint.TextSize = 30;
- paint.IsAntialias = true;
+ paint.Color = new SKColor(255, 255, 255, 255);
+ paint.TextSize = 30;
+ paint.IsAntialias = true;
- // or:
- // var emojiChar = 0x1F680;
- const string Text = "✔️";
- var emojiChar = StringUtilities.GetUnicodeCharacterCode(Text, SKTextEncoding.Utf32);
+ // or:
+ // var emojiChar = 0x1F680;
+ const string Text = "✔️";
+ var emojiChar = StringUtilities.GetUnicodeCharacterCode(Text, SKTextEncoding.Utf32);
- // ask the font manager for a font with that character
- paint.Typeface = SKFontManager.Default.MatchCharacter(emojiChar);
+ // ask the font manager for a font with that character
+ paint.Typeface = SKFontManager.Default.MatchCharacter(emojiChar);
- canvas.DrawText(Text, (float)x - 12, OffsetFromTopRightCorner + 12, paint);
- }
+ canvas.DrawText(Text, (float)x - 12, OffsetFromTopRightCorner + 12, paint);
}
}
diff --git a/src/Jellyfin.Drawing.Skia/SkiaCodecException.cs b/src/Jellyfin.Drawing.Skia/SkiaCodecException.cs
index 9a50a4d62e..581fa000dc 100644
--- a/src/Jellyfin.Drawing.Skia/SkiaCodecException.cs
+++ b/src/Jellyfin.Drawing.Skia/SkiaCodecException.cs
@@ -1,45 +1,44 @@
using System.Globalization;
using SkiaSharp;
-namespace Jellyfin.Drawing.Skia
+namespace Jellyfin.Drawing.Skia;
+
+///
+/// Represents errors that occur during interaction with Skia codecs.
+///
+public class SkiaCodecException : SkiaException
{
///
- /// Represents errors that occur during interaction with Skia codecs.
+ /// Initializes a new instance of the class.
///
- public class SkiaCodecException : SkiaException
+ /// The non-successful codec result returned by Skia.
+ public SkiaCodecException(SKCodecResult result)
{
- ///
- /// Initializes a new instance of the class.
- ///
- /// The non-successful codec result returned by Skia.
- public SkiaCodecException(SKCodecResult result)
- {
- CodecResult = result;
- }
+ CodecResult = result;
+ }
- ///
- /// Initializes a new instance of the class
- /// with a specified error message.
- ///
- /// The non-successful codec result returned by Skia.
- /// The message that describes the error.
- public SkiaCodecException(SKCodecResult result, string message)
- : base(message)
- {
- CodecResult = result;
- }
+ ///
+ /// Initializes a new instance of the class
+ /// with a specified error message.
+ ///
+ /// The non-successful codec result returned by Skia.
+ /// The message that describes the error.
+ public SkiaCodecException(SKCodecResult result, string message)
+ : base(message)
+ {
+ CodecResult = result;
+ }
- ///
- /// Gets the non-successful codec result returned by Skia.
- ///
- public SKCodecResult CodecResult { get; }
+ ///
+ /// Gets the non-successful codec result returned by Skia.
+ ///
+ public SKCodecResult CodecResult { get; }
- ///
- public override string ToString()
- => string.Format(
- CultureInfo.InvariantCulture,
- "Non-success codec result: {0}\n{1}",
- CodecResult,
- base.ToString());
- }
+ ///
+ public override string ToString()
+ => string.Format(
+ CultureInfo.InvariantCulture,
+ "Non-success codec result: {0}\n{1}",
+ CodecResult,
+ base.ToString());
}
diff --git a/src/Jellyfin.Drawing.Skia/SkiaEncoder.cs b/src/Jellyfin.Drawing.Skia/SkiaEncoder.cs
index 9171c4d6e6..ddb8a98d4d 100644
--- a/src/Jellyfin.Drawing.Skia/SkiaEncoder.cs
+++ b/src/Jellyfin.Drawing.Skia/SkiaEncoder.cs
@@ -12,534 +12,533 @@ using Microsoft.Extensions.Logging;
using SkiaSharp;
using SKSvg = SkiaSharp.Extended.Svg.SKSvg;
-namespace Jellyfin.Drawing.Skia
+namespace Jellyfin.Drawing.Skia;
+
+///
+/// Image encoder that uses to manipulate images.
+///
+public class SkiaEncoder : IImageEncoder
{
+ private static readonly HashSet _transparentImageTypes = new(StringComparer.OrdinalIgnoreCase) { ".png", ".gif", ".webp" };
+
+ private readonly ILogger _logger;
+ private readonly IApplicationPaths _appPaths;
+
///
- /// Image encoder that uses to manipulate images.
+ /// Initializes a new instance of the class.
///
- public class SkiaEncoder : IImageEncoder
+ /// The application logger.
+ /// The application paths.
+ public SkiaEncoder(ILogger logger, IApplicationPaths appPaths)
{
- private static readonly HashSet _transparentImageTypes = new(StringComparer.OrdinalIgnoreCase) { ".png", ".gif", ".webp" };
+ _logger = logger;
+ _appPaths = appPaths;
+ }
- private readonly ILogger _logger;
- private readonly IApplicationPaths _appPaths;
+ ///
+ public string Name => "Skia";
- ///
- /// Initializes a new instance of the class.
- ///
- /// The application logger.
- /// The application paths.
- public SkiaEncoder(ILogger logger, IApplicationPaths appPaths)
- {
- _logger = logger;
- _appPaths = appPaths;
- }
+ ///
+ public bool SupportsImageCollageCreation => true;
- ///
- public string Name => "Skia";
+ ///
+ public bool SupportsImageEncoding => true;
- ///
- public bool SupportsImageCollageCreation => true;
-
- ///
- public bool SupportsImageEncoding => true;
+ ///
+ public IReadOnlyCollection SupportedInputFormats =>
+ new HashSet(StringComparer.OrdinalIgnoreCase)
+ {
+ "jpeg",
+ "jpg",
+ "png",
+ "dng",
+ "webp",
+ "gif",
+ "bmp",
+ "ico",
+ "astc",
+ "ktx",
+ "pkm",
+ "wbmp",
+ // TODO: check if these are supported on multiple platforms
+ // https://github.com/google/skia/blob/master/infra/bots/recipes/test.py#L454
+ // working on windows at least
+ "cr2",
+ "nef",
+ "arw"
+ };
+
+ ///
+ public IReadOnlyCollection SupportedOutputFormats
+ => new HashSet { ImageFormat.Webp, ImageFormat.Jpg, ImageFormat.Png };
- ///
- public IReadOnlyCollection SupportedInputFormats =>
- new HashSet(StringComparer.OrdinalIgnoreCase)
- {
- "jpeg",
- "jpg",
- "png",
- "dng",
- "webp",
- "gif",
- "bmp",
- "ico",
- "astc",
- "ktx",
- "pkm",
- "wbmp",
- // TODO: check if these are supported on multiple platforms
- // https://github.com/google/skia/blob/master/infra/bots/recipes/test.py#L454
- // working on windows at least
- "cr2",
- "nef",
- "arw"
- };
-
- ///
- public IReadOnlyCollection SupportedOutputFormats
- => new HashSet { ImageFormat.Webp, ImageFormat.Jpg, ImageFormat.Png };
-
- ///
- /// Check if the native lib is available.
- ///
- /// True if the native lib is available, otherwise false.
- public static bool IsNativeLibAvailable()
- {
- try
- {
- // test an operation that requires the native library
- SKPMColor.PreMultiply(SKColors.Black);
- return true;
- }
- catch (Exception)
- {
- return false;
- }
+ ///
+ /// Check if the native lib is available.
+ ///
+ /// True if the native lib is available, otherwise false.
+ public static bool IsNativeLibAvailable()
+ {
+ try
+ {
+ // test an operation that requires the native library
+ SKPMColor.PreMultiply(SKColors.Black);
+ return true;
}
-
- ///
- /// Convert a to a .
- ///
- /// The format to convert.
- /// The converted format.
- public static SKEncodedImageFormat GetImageFormat(ImageFormat selectedFormat)
+ catch (Exception)
{
- return selectedFormat switch
- {
- ImageFormat.Bmp => SKEncodedImageFormat.Bmp,
- ImageFormat.Jpg => SKEncodedImageFormat.Jpeg,
- ImageFormat.Gif => SKEncodedImageFormat.Gif,
- ImageFormat.Webp => SKEncodedImageFormat.Webp,
- _ => SKEncodedImageFormat.Png
- };
+ return false;
}
+ }
- ///
- /// The path is not valid.
- public ImageDimensions GetImageSize(string path)
+ ///
+ /// Convert a to a .
+ ///
+ /// The format to convert.
+ /// The converted format.
+ public static SKEncodedImageFormat GetImageFormat(ImageFormat selectedFormat)
+ {
+ return selectedFormat switch
{
- if (!File.Exists(path))
- {
- throw new FileNotFoundException("File not found", path);
- }
+ ImageFormat.Bmp => SKEncodedImageFormat.Bmp,
+ ImageFormat.Jpg => SKEncodedImageFormat.Jpeg,
+ ImageFormat.Gif => SKEncodedImageFormat.Gif,
+ ImageFormat.Webp => SKEncodedImageFormat.Webp,
+ _ => SKEncodedImageFormat.Png
+ };
+ }
- var extension = Path.GetExtension(path.AsSpan());
- if (extension.Equals(".svg", StringComparison.OrdinalIgnoreCase))
- {
- var svg = new SKSvg();
- svg.Load(path);
- return new ImageDimensions(Convert.ToInt32(svg.Picture.CullRect.Width), Convert.ToInt32(svg.Picture.CullRect.Height));
- }
+ ///
+ /// The path is not valid.
+ public ImageDimensions GetImageSize(string path)
+ {
+ if (!File.Exists(path))
+ {
+ throw new FileNotFoundException("File not found", path);
+ }
- using var codec = SKCodec.Create(path, out SKCodecResult result);
- switch (result)
- {
- case SKCodecResult.Success:
- var info = codec.Info;
- return new ImageDimensions(info.Width, info.Height);
- case SKCodecResult.Unimplemented:
- _logger.LogDebug("Image format not supported: {FilePath}", path);
- return new ImageDimensions(0, 0);
- default:
- _logger.LogError("Unable to determine image dimensions for {FilePath}: {SkCodecResult}", path, result);
- return new ImageDimensions(0, 0);
- }
+ var extension = Path.GetExtension(path.AsSpan());
+ if (extension.Equals(".svg", StringComparison.OrdinalIgnoreCase))
+ {
+ var svg = new SKSvg();
+ svg.Load(path);
+ return new ImageDimensions(Convert.ToInt32(svg.Picture.CullRect.Width), Convert.ToInt32(svg.Picture.CullRect.Height));
}
- ///
- /// The path is null.
- /// The path is not valid.
- /// The file at the specified path could not be used to generate a codec.
- public string GetImageBlurHash(int xComp, int yComp, string path)
+ using var codec = SKCodec.Create(path, out SKCodecResult result);
+ switch (result)
{
- ArgumentException.ThrowIfNullOrEmpty(path);
+ case SKCodecResult.Success:
+ var info = codec.Info;
+ return new ImageDimensions(info.Width, info.Height);
+ case SKCodecResult.Unimplemented:
+ _logger.LogDebug("Image format not supported: {FilePath}", path);
+ return new ImageDimensions(0, 0);
+ default:
+ _logger.LogError("Unable to determine image dimensions for {FilePath}: {SkCodecResult}", path, result);
+ return new ImageDimensions(0, 0);
+ }
+ }
- var extension = Path.GetExtension(path.AsSpan()).TrimStart('.');
- if (!SupportedInputFormats.Contains(extension, StringComparison.OrdinalIgnoreCase))
- {
- _logger.LogDebug("Unable to compute blur hash due to unsupported format: {ImagePath}", path);
- return string.Empty;
- }
+ ///
+ /// The path is null.
+ /// The path is not valid.
+ /// The file at the specified path could not be used to generate a codec.
+ public string GetImageBlurHash(int xComp, int yComp, string path)
+ {
+ ArgumentException.ThrowIfNullOrEmpty(path);
- // Any larger than 128x128 is too slow and there's no visually discernible difference
- return BlurHashEncoder.Encode(xComp, yComp, path, 128, 128);
+ var extension = Path.GetExtension(path.AsSpan()).TrimStart('.');
+ if (!SupportedInputFormats.Contains(extension, StringComparison.OrdinalIgnoreCase))
+ {
+ _logger.LogDebug("Unable to compute blur hash due to unsupported format: {ImagePath}", path);
+ return string.Empty;
}
- private bool RequiresSpecialCharacterHack(string path)
+ // Any larger than 128x128 is too slow and there's no visually discernible difference
+ return BlurHashEncoder.Encode(xComp, yComp, path, 128, 128);
+ }
+
+ private bool RequiresSpecialCharacterHack(string path)
+ {
+ for (int i = 0; i < path.Length; i++)
{
- for (int i = 0; i < path.Length; i++)
+ if (char.GetUnicodeCategory(path[i]) == UnicodeCategory.OtherLetter)
{
- if (char.GetUnicodeCategory(path[i]) == UnicodeCategory.OtherLetter)
- {
- return true;
- }
+ return true;
}
-
- return path.HasDiacritics();
}
- private string NormalizePath(string path)
+ return path.HasDiacritics();
+ }
+
+ private string NormalizePath(string path)
+ {
+ if (!RequiresSpecialCharacterHack(path))
{
- if (!RequiresSpecialCharacterHack(path))
- {
- return path;
- }
+ return path;
+ }
+
+ var tempPath = Path.Combine(_appPaths.TempDirectory, Guid.NewGuid() + Path.GetExtension(path));
+ var directory = Path.GetDirectoryName(tempPath) ?? throw new ResourceNotFoundException($"Provided path ({tempPath}) is not valid.");
+ Directory.CreateDirectory(directory);
+ File.Copy(path, tempPath, true);
- var tempPath = Path.Combine(_appPaths.TempDirectory, Guid.NewGuid() + Path.GetExtension(path));
- var directory = Path.GetDirectoryName(tempPath) ?? throw new ResourceNotFoundException($"Provided path ({tempPath}) is not valid.");
- Directory.CreateDirectory(directory);
- File.Copy(path, tempPath, true);
+ return tempPath;
+ }
- return tempPath;
+ private static SKEncodedOrigin GetSKEncodedOrigin(ImageOrientation? orientation)
+ {
+ if (!orientation.HasValue)
+ {
+ return SKEncodedOrigin.TopLeft;
}
- private static SKEncodedOrigin GetSKEncodedOrigin(ImageOrientation? orientation)
+ return orientation.Value switch
{
- if (!orientation.HasValue)
- {
- return SKEncodedOrigin.TopLeft;
- }
+ ImageOrientation.TopRight => SKEncodedOrigin.TopRight,
+ ImageOrientation.RightTop => SKEncodedOrigin.RightTop,
+ ImageOrientation.RightBottom => SKEncodedOrigin.RightBottom,
+ ImageOrientation.LeftTop => SKEncodedOrigin.LeftTop,
+ ImageOrientation.LeftBottom => SKEncodedOrigin.LeftBottom,
+ ImageOrientation.BottomRight => SKEncodedOrigin.BottomRight,
+ ImageOrientation.BottomLeft => SKEncodedOrigin.BottomLeft,
+ _ => SKEncodedOrigin.TopLeft
+ };
+ }
- return orientation.Value switch
- {
- ImageOrientation.TopRight => SKEncodedOrigin.TopRight,
- ImageOrientation.RightTop => SKEncodedOrigin.RightTop,
- ImageOrientation.RightBottom => SKEncodedOrigin.RightBottom,
- ImageOrientation.LeftTop => SKEncodedOrigin.LeftTop,
- ImageOrientation.LeftBottom => SKEncodedOrigin.LeftBottom,
- ImageOrientation.BottomRight => SKEncodedOrigin.BottomRight,
- ImageOrientation.BottomLeft => SKEncodedOrigin.BottomLeft,
- _ => SKEncodedOrigin.TopLeft
- };
+ ///
+ /// Decode an image.
+ ///
+ /// The filepath of the image to decode.
+ /// Whether to force clean the bitmap.
+ /// The orientation of the image.
+ /// The detected origin of the image.
+ /// The resulting bitmap of the image.
+ internal SKBitmap? Decode(string path, bool forceCleanBitmap, ImageOrientation? orientation, out SKEncodedOrigin origin)
+ {
+ if (!File.Exists(path))
+ {
+ throw new FileNotFoundException("File not found", path);
}
- ///
- /// Decode an image.
- ///
- /// The filepath of the image to decode.
- /// Whether to force clean the bitmap.
- /// The orientation of the image.
- /// The detected origin of the image.
- /// The resulting bitmap of the image.
- internal SKBitmap? Decode(string path, bool forceCleanBitmap, ImageOrientation? orientation, out SKEncodedOrigin origin)
- {
- if (!File.Exists(path))
+ var requiresTransparencyHack = _transparentImageTypes.Contains(Path.GetExtension(path));
+
+ if (requiresTransparencyHack || forceCleanBitmap)
+ {
+ using SKCodec codec = SKCodec.Create(NormalizePath(path), out SKCodecResult res);
+ if (res != SKCodecResult.Success)
{
- throw new FileNotFoundException("File not found", path);
+ origin = GetSKEncodedOrigin(orientation);
+ return null;
}
- var requiresTransparencyHack = _transparentImageTypes.Contains(Path.GetExtension(path));
-
- if (requiresTransparencyHack || forceCleanBitmap)
- {
- using SKCodec codec = SKCodec.Create(NormalizePath(path), out SKCodecResult res);
- if (res != SKCodecResult.Success)
- {
- origin = GetSKEncodedOrigin(orientation);
- return null;
- }
+ // create the bitmap
+ var bitmap = new SKBitmap(codec.Info.Width, codec.Info.Height, !requiresTransparencyHack);
- // create the bitmap
- var bitmap = new SKBitmap(codec.Info.Width, codec.Info.Height, !requiresTransparencyHack);
+ // decode
+ _ = codec.GetPixels(bitmap.Info, bitmap.GetPixels());
- // decode
- _ = codec.GetPixels(bitmap.Info, bitmap.GetPixels());
+ origin = codec.EncodedOrigin;
- origin = codec.EncodedOrigin;
+ return bitmap;
+ }
- return bitmap;
- }
+ var resultBitmap = SKBitmap.Decode(NormalizePath(path));
- var resultBitmap = SKBitmap.Decode(NormalizePath(path));
+ if (resultBitmap is null)
+ {
+ return Decode(path, true, orientation, out origin);
+ }
- if (resultBitmap is null)
+ // If we have to resize these they often end up distorted
+ if (resultBitmap.ColorType == SKColorType.Gray8)
+ {
+ using (resultBitmap)
{
return Decode(path, true, orientation, out origin);
}
+ }
+
+ origin = SKEncodedOrigin.TopLeft;
+ return resultBitmap;
+ }
+
+ private SKBitmap? GetBitmap(string path, bool autoOrient, ImageOrientation? orientation)
+ {
+ if (autoOrient)
+ {
+ var bitmap = Decode(path, true, orientation, out var origin);
- // If we have to resize these they often end up distorted
- if (resultBitmap.ColorType == SKColorType.Gray8)
+ if (bitmap is not null && origin != SKEncodedOrigin.TopLeft)
{
- using (resultBitmap)
+ using (bitmap)
{
- return Decode(path, true, orientation, out origin);
+ return OrientImage(bitmap, origin);
}
}
- origin = SKEncodedOrigin.TopLeft;
- return resultBitmap;
+ return bitmap;
}
- private SKBitmap? GetBitmap(string path, bool autoOrient, ImageOrientation? orientation)
- {
- if (autoOrient)
- {
- var bitmap = Decode(path, true, orientation, out var origin);
+ return Decode(path, false, orientation, out _);
+ }
- if (bitmap is not null && origin != SKEncodedOrigin.TopLeft)
- {
- using (bitmap)
- {
- return OrientImage(bitmap, origin);
- }
- }
+ private SKBitmap OrientImage(SKBitmap bitmap, SKEncodedOrigin origin)
+ {
+ var needsFlip = origin == SKEncodedOrigin.LeftBottom
+ || origin == SKEncodedOrigin.LeftTop
+ || origin == SKEncodedOrigin.RightBottom
+ || origin == SKEncodedOrigin.RightTop;
+ var rotated = needsFlip
+ ? new SKBitmap(bitmap.Height, bitmap.Width)
+ : new SKBitmap(bitmap.Width, bitmap.Height);
+ using var surface = new SKCanvas(rotated);
+ var midX = (float)rotated.Width / 2;
+ var midY = (float)rotated.Height / 2;
+
+ switch (origin)
+ {
+ case SKEncodedOrigin.TopRight:
+ surface.Scale(-1, 1, midX, midY);
+ break;
+ case SKEncodedOrigin.BottomRight:
+ surface.RotateDegrees(180, midX, midY);
+ break;
+ case SKEncodedOrigin.BottomLeft:
+ surface.Scale(1, -1, midX, midY);
+ break;
+ case SKEncodedOrigin.LeftTop:
+ surface.Translate(0, -rotated.Height);
+ surface.Scale(1, -1, midX, midY);
+ surface.RotateDegrees(-90);
+ break;
+ case SKEncodedOrigin.RightTop:
+ surface.Translate(rotated.Width, 0);
+ surface.RotateDegrees(90);
+ break;
+ case SKEncodedOrigin.RightBottom:
+ surface.Translate(rotated.Width, 0);
+ surface.Scale(1, -1, midX, midY);
+ surface.RotateDegrees(90);
+ break;
+ case SKEncodedOrigin.LeftBottom:
+ surface.Translate(0, rotated.Height);
+ surface.RotateDegrees(-90);
+ break;
+ }
- return bitmap;
- }
+ surface.DrawBitmap(bitmap, 0, 0);
+ return rotated;
+ }
- return Decode(path, false, orientation, out _);
- }
+ ///
+ /// Resizes an image on the CPU, by utilizing a surface and canvas.
+ ///
+ /// The convolutional matrix kernel used in this resize function gives a (light) sharpening effect.
+ /// This technique is similar to effect that can be created using for example the [Convolution matrix filter in GIMP](https://docs.gimp.org/2.10/en/gimp-filter-convolution-matrix.html).
+ ///
+ /// 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
+ {
+ FilterQuality = SKFilterQuality.High,
+ IsAntialias = isAntialias,
+ IsDither = isDither
+ };
- private SKBitmap OrientImage(SKBitmap bitmap, SKEncodedOrigin origin)
+ var kernel = new float[9]
{
- var needsFlip = origin == SKEncodedOrigin.LeftBottom
- || origin == SKEncodedOrigin.LeftTop
- || origin == SKEncodedOrigin.RightBottom
- || origin == SKEncodedOrigin.RightTop;
- var rotated = needsFlip
- ? new SKBitmap(bitmap.Height, bitmap.Width)
- : new SKBitmap(bitmap.Width, bitmap.Height);
- using var surface = new SKCanvas(rotated);
- var midX = (float)rotated.Width / 2;
- var midY = (float)rotated.Height / 2;
+ 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,
+ true);
+
+ canvas.DrawBitmap(
+ source,
+ SKRect.Create(0, 0, source.Width, source.Height),
+ SKRect.Create(0, 0, targetInfo.Width, targetInfo.Height),
+ paint);
+
+ return surface.Snapshot();
+ }
- switch (origin)
- {
- case SKEncodedOrigin.TopRight:
- surface.Scale(-1, 1, midX, midY);
- break;
- case SKEncodedOrigin.BottomRight:
- surface.RotateDegrees(180, midX, midY);
- break;
- case SKEncodedOrigin.BottomLeft:
- surface.Scale(1, -1, midX, midY);
- break;
- case SKEncodedOrigin.LeftTop:
- surface.Translate(0, -rotated.Height);
- surface.Scale(1, -1, midX, midY);
- surface.RotateDegrees(-90);
- break;
- case SKEncodedOrigin.RightTop:
- surface.Translate(rotated.Width, 0);
- surface.RotateDegrees(90);
- break;
- case SKEncodedOrigin.RightBottom:
- surface.Translate(rotated.Width, 0);
- surface.Scale(1, -1, midX, midY);
- surface.RotateDegrees(90);
- break;
- case SKEncodedOrigin.LeftBottom:
- surface.Translate(0, rotated.Height);
- surface.RotateDegrees(-90);
- break;
- }
+ ///
+ public string EncodeImage(string inputPath, DateTime dateModified, string outputPath, bool autoOrient, ImageOrientation? orientation, int quality, ImageProcessingOptions options, ImageFormat outputFormat)
+ {
+ ArgumentException.ThrowIfNullOrEmpty(inputPath);
+ ArgumentException.ThrowIfNullOrEmpty(outputPath);
- surface.DrawBitmap(bitmap, 0, 0);
- return rotated;
+ var inputFormat = Path.GetExtension(inputPath.AsSpan()).TrimStart('.');
+ if (!SupportedInputFormats.Contains(inputFormat, StringComparison.OrdinalIgnoreCase))
+ {
+ _logger.LogDebug("Unable to encode image due to unsupported format: {ImagePath}", inputPath);
+ return inputPath;
}
- ///
- /// Resizes an image on the CPU, by utilizing a surface and canvas.
- ///
- /// The convolutional matrix kernel used in this resize function gives a (light) sharpening effect.
- /// This technique is similar to effect that can be created using for example the [Convolution matrix filter in GIMP](https://docs.gimp.org/2.10/en/gimp-filter-convolution-matrix.html).
- ///
- /// 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
- {
- FilterQuality = SKFilterQuality.High,
- IsAntialias = isAntialias,
- IsDither = isDither
- };
+ var skiaOutputFormat = GetImageFormat(outputFormat);
- 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,
- true);
-
- canvas.DrawBitmap(
- source,
- SKRect.Create(0, 0, source.Width, source.Height),
- SKRect.Create(0, 0, targetInfo.Width, targetInfo.Height),
- paint);
-
- return surface.Snapshot();
- }
+ var hasBackgroundColor = !string.IsNullOrWhiteSpace(options.BackgroundColor);
+ var hasForegroundColor = !string.IsNullOrWhiteSpace(options.ForegroundLayer);
+ var blur = options.Blur ?? 0;
+ var hasIndicator = options.AddPlayedIndicator || options.UnplayedCount.HasValue || !options.PercentPlayed.Equals(0);
- ///
- public string EncodeImage(string inputPath, DateTime dateModified, string outputPath, bool autoOrient, ImageOrientation? orientation, int quality, ImageProcessingOptions options, ImageFormat outputFormat)
+ using var bitmap = GetBitmap(inputPath, autoOrient, orientation);
+ if (bitmap is null)
{
- ArgumentException.ThrowIfNullOrEmpty(inputPath);
- ArgumentException.ThrowIfNullOrEmpty(outputPath);
-
- var inputFormat = Path.GetExtension(inputPath.AsSpan()).TrimStart('.');
- if (!SupportedInputFormats.Contains(inputFormat, StringComparison.OrdinalIgnoreCase))
- {
- _logger.LogDebug("Unable to encode image due to unsupported format: {ImagePath}", inputPath);
- return inputPath;
- }
+ throw new InvalidDataException($"Skia unable to read image {inputPath}");
+ }
- var skiaOutputFormat = GetImageFormat(outputFormat);
+ var originalImageSize = new ImageDimensions(bitmap.Width, bitmap.Height);
- var hasBackgroundColor = !string.IsNullOrWhiteSpace(options.BackgroundColor);
- var hasForegroundColor = !string.IsNullOrWhiteSpace(options.ForegroundLayer);
- var blur = options.Blur ?? 0;
- var hasIndicator = options.AddPlayedIndicator || options.UnplayedCount.HasValue || !options.PercentPlayed.Equals(0);
+ if (options.HasDefaultOptions(inputPath, originalImageSize) && !autoOrient)
+ {
+ // Just spit out the original file if all the options are default
+ return inputPath;
+ }
- using var bitmap = GetBitmap(inputPath, autoOrient, orientation);
- if (bitmap is null)
- {
- throw new InvalidDataException($"Skia unable to read image {inputPath}");
- }
+ var newImageSize = ImageHelper.GetNewImageSize(options, originalImageSize);
- var originalImageSize = new ImageDimensions(bitmap.Width, bitmap.Height);
+ var width = newImageSize.Width;
+ var height = newImageSize.Height;
- if (options.HasDefaultOptions(inputPath, originalImageSize) && !autoOrient)
- {
- // Just spit out the original file if all the options are default
- return inputPath;
- }
+ // scale image (the FromImage creates a copy)
+ var imageInfo = new SKImageInfo(width, height, bitmap.ColorType, bitmap.AlphaType, bitmap.ColorSpace);
+ using var resizedBitmap = SKBitmap.FromImage(ResizeImage(bitmap, imageInfo));
- var newImageSize = ImageHelper.GetNewImageSize(options, originalImageSize);
+ // If all we're doing is resizing then we can stop now
+ if (!hasBackgroundColor && !hasForegroundColor && blur == 0 && !hasIndicator)
+ {
+ var outputDirectory = Path.GetDirectoryName(outputPath) ?? throw new ArgumentException($"Provided path ({outputPath}) is not valid.", nameof(outputPath));
+ Directory.CreateDirectory(outputDirectory);
+ using var outputStream = new SKFileWStream(outputPath);
+ using var pixmap = new SKPixmap(new SKImageInfo(width, height), resizedBitmap.GetPixels());
+ resizedBitmap.Encode(outputStream, skiaOutputFormat, quality);
+ return outputPath;
+ }
- var width = newImageSize.Width;
- var height = newImageSize.Height;
+ // create bitmap to use for canvas drawing used to draw into bitmap
+ using var saveBitmap = new SKBitmap(width, height);
+ using var canvas = new SKCanvas(saveBitmap);
+ // set background color if present
+ if (hasBackgroundColor)
+ {
+ canvas.Clear(SKColor.Parse(options.BackgroundColor));
+ }
- // scale image (the FromImage creates a copy)
- var imageInfo = new SKImageInfo(width, height, bitmap.ColorType, bitmap.AlphaType, bitmap.ColorSpace);
- using var resizedBitmap = SKBitmap.FromImage(ResizeImage(bitmap, imageInfo));
+ // Add blur if option is present
+ if (blur > 0)
+ {
+ // create image from resized bitmap to apply blur
+ using var paint = new SKPaint();
+ using var filter = SKImageFilter.CreateBlur(blur, blur);
+ paint.ImageFilter = filter;
+ canvas.DrawBitmap(resizedBitmap, SKRect.Create(width, height), paint);
+ }
+ else
+ {
+ // draw resized bitmap onto canvas
+ canvas.DrawBitmap(resizedBitmap, SKRect.Create(width, height));
+ }
- // If all we're doing is resizing then we can stop now
- if (!hasBackgroundColor && !hasForegroundColor && blur == 0 && !hasIndicator)
+ // If foreground layer present then draw
+ if (hasForegroundColor)
+ {
+ if (!double.TryParse(options.ForegroundLayer, out double opacity))
{
- var outputDirectory = Path.GetDirectoryName(outputPath) ?? throw new ArgumentException($"Provided path ({outputPath}) is not valid.", nameof(outputPath));
- Directory.CreateDirectory(outputDirectory);
- using var outputStream = new SKFileWStream(outputPath);
- using var pixmap = new SKPixmap(new SKImageInfo(width, height), resizedBitmap.GetPixels());
- resizedBitmap.Encode(outputStream, skiaOutputFormat, quality);
- return outputPath;
+ opacity = .4;
}
- // create bitmap to use for canvas drawing used to draw into bitmap
- using var saveBitmap = new SKBitmap(width, height);
- using var canvas = new SKCanvas(saveBitmap);
- // set background color if present
- if (hasBackgroundColor)
- {
- canvas.Clear(SKColor.Parse(options.BackgroundColor));
- }
+ canvas.DrawColor(new SKColor(0, 0, 0, (byte)((1 - opacity) * 0xFF)), SKBlendMode.SrcOver);
+ }
- // Add blur if option is present
- if (blur > 0)
- {
- // create image from resized bitmap to apply blur
- using var paint = new SKPaint();
- using var filter = SKImageFilter.CreateBlur(blur, blur);
- paint.ImageFilter = filter;
- canvas.DrawBitmap(resizedBitmap, SKRect.Create(width, height), paint);
- }
- else
- {
- // draw resized bitmap onto canvas
- canvas.DrawBitmap(resizedBitmap, SKRect.Create(width, height));
- }
+ if (hasIndicator)
+ {
+ DrawIndicator(canvas, width, height, options);
+ }
- // If foreground layer present then draw
- if (hasForegroundColor)
+ var directory = Path.GetDirectoryName(outputPath) ?? throw new ArgumentException($"Provided path ({outputPath}) is not valid.", nameof(outputPath));
+ Directory.CreateDirectory(directory);
+ using (var outputStream = new SKFileWStream(outputPath))
+ {
+ using (var pixmap = new SKPixmap(new SKImageInfo(width, height), saveBitmap.GetPixels()))
{
- if (!double.TryParse(options.ForegroundLayer, out double opacity))
- {
- opacity = .4;
- }
-
- canvas.DrawColor(new SKColor(0, 0, 0, (byte)((1 - opacity) * 0xFF)), SKBlendMode.SrcOver);
+ pixmap.Encode(outputStream, skiaOutputFormat, quality);
}
+ }
- if (hasIndicator)
- {
- DrawIndicator(canvas, width, height, options);
- }
+ return outputPath;
+ }
- var directory = Path.GetDirectoryName(outputPath) ?? throw new ArgumentException($"Provided path ({outputPath}) is not valid.", nameof(outputPath));
- Directory.CreateDirectory(directory);
- using (var outputStream = new SKFileWStream(outputPath))
- {
- using (var pixmap = new SKPixmap(new SKImageInfo(width, height), saveBitmap.GetPixels()))
- {
- pixmap.Encode(outputStream, skiaOutputFormat, quality);
- }
- }
+ ///
+ public void CreateImageCollage(ImageCollageOptions options, string? libraryName)
+ {
+ double ratio = (double)options.Width / options.Height;
- return outputPath;
+ if (ratio >= 1.4)
+ {
+ new StripCollageBuilder(this).BuildThumbCollage(options.InputPaths, options.OutputPath, options.Width, options.Height, libraryName);
+ }
+ else if (ratio >= .9)
+ {
+ new StripCollageBuilder(this).BuildSquareCollage(options.InputPaths, options.OutputPath, options.Width, options.Height);
+ }
+ else
+ {
+ // TODO: Create Poster collage capability
+ new StripCollageBuilder(this).BuildSquareCollage(options.InputPaths, options.OutputPath, options.Width, options.Height);
}
+ }
+
+ ///
+ public void CreateSplashscreen(IReadOnlyList posters, IReadOnlyList backdrops)
+ {
+ var splashBuilder = new SplashscreenBuilder(this);
+ var outputPath = Path.Combine(_appPaths.DataPath, "splashscreen.png");
+ splashBuilder.GenerateSplash(posters, backdrops, outputPath);
+ }
- ///
- public void CreateImageCollage(ImageCollageOptions options, string? libraryName)
+ private void DrawIndicator(SKCanvas canvas, int imageWidth, int imageHeight, ImageProcessingOptions options)
+ {
+ try
{
- double ratio = (double)options.Width / options.Height;
+ var currentImageSize = new ImageDimensions(imageWidth, imageHeight);
- if (ratio >= 1.4)
+ if (options.AddPlayedIndicator)
{
- new StripCollageBuilder(this).BuildThumbCollage(options.InputPaths, options.OutputPath, options.Width, options.Height, libraryName);
+ PlayedIndicatorDrawer.DrawPlayedIndicator(canvas, currentImageSize);
}
- else if (ratio >= .9)
+ else if (options.UnplayedCount.HasValue)
{
- new StripCollageBuilder(this).BuildSquareCollage(options.InputPaths, options.OutputPath, options.Width, options.Height);
+ UnplayedCountIndicator.DrawUnplayedCountIndicator(canvas, currentImageSize, options.UnplayedCount.Value);
}
- else
+
+ if (options.PercentPlayed > 0)
{
- // TODO: Create Poster collage capability
- new StripCollageBuilder(this).BuildSquareCollage(options.InputPaths, options.OutputPath, options.Width, options.Height);
+ PercentPlayedDrawer.Process(canvas, currentImageSize, options.PercentPlayed);
}
}
-
- ///
- public void CreateSplashscreen(IReadOnlyList posters, IReadOnlyList backdrops)
+ catch (Exception ex)
{
- var splashBuilder = new SplashscreenBuilder(this);
- var outputPath = Path.Combine(_appPaths.DataPath, "splashscreen.png");
- splashBuilder.GenerateSplash(posters, backdrops, outputPath);
- }
-
- private void DrawIndicator(SKCanvas canvas, int imageWidth, int imageHeight, ImageProcessingOptions options)
- {
- try
- {
- var currentImageSize = new ImageDimensions(imageWidth, imageHeight);
-
- if (options.AddPlayedIndicator)
- {
- PlayedIndicatorDrawer.DrawPlayedIndicator(canvas, currentImageSize);
- }
- else if (options.UnplayedCount.HasValue)
- {
- UnplayedCountIndicator.DrawUnplayedCountIndicator(canvas, currentImageSize, options.UnplayedCount.Value);
- }
-
- if (options.PercentPlayed > 0)
- {
- PercentPlayedDrawer.Process(canvas, currentImageSize, options.PercentPlayed);
- }
- }
- catch (Exception ex)
- {
- _logger.LogError(ex, "Error drawing indicator overlay");
- }
+ _logger.LogError(ex, "Error drawing indicator overlay");
}
}
}
diff --git a/src/Jellyfin.Drawing.Skia/SkiaException.cs b/src/Jellyfin.Drawing.Skia/SkiaException.cs
index 5b272eac57..d0e69d42c8 100644
--- a/src/Jellyfin.Drawing.Skia/SkiaException.cs
+++ b/src/Jellyfin.Drawing.Skia/SkiaException.cs
@@ -1,39 +1,38 @@
using System;
-namespace Jellyfin.Drawing.Skia
+namespace Jellyfin.Drawing.Skia;
+
+///
+/// Represents errors that occur during interaction with Skia.
+///
+public class SkiaException : Exception
{
///
- /// Represents errors that occur during interaction with Skia.
+ /// Initializes a new instance of the class.
///
- public class SkiaException : Exception
+ public SkiaException()
{
- ///
- /// Initializes a new instance of the class.
- ///
- public SkiaException()
- {
- }
+ }
- ///
- /// Initializes a new instance of the class with a specified error message.
- ///
- /// The message that describes the error.
- public SkiaException(string message) : base(message)
- {
- }
+ ///
+ /// Initializes a new instance of the class with a specified error message.
+ ///
+ /// The message that describes the error.
+ public SkiaException(string message) : base(message)
+ {
+ }
- ///
- /// Initializes a new instance of the class with a specified error message and a
- /// reference to the inner exception that is the cause of this exception.
- ///
- /// The error message that explains the reason for the exception.
- ///
- /// The exception that is the cause of the current exception, or a null reference (Nothing in Visual Basic) if
- /// no inner exception is specified.
- ///
- public SkiaException(string message, Exception innerException)
- : base(message, innerException)
- {
- }
+ ///
+ /// Initializes a new instance of the class with a specified error message and a
+ /// reference to the inner exception that is the cause of this exception.
+ ///
+ /// The error message that explains the reason for the exception.
+ ///
+ /// The exception that is the cause of the current exception, or a null reference (Nothing in Visual Basic) if
+ /// no inner exception is specified.
+ ///
+ public SkiaException(string message, Exception innerException)
+ : base(message, innerException)
+ {
}
}
diff --git a/src/Jellyfin.Drawing.Skia/SkiaHelper.cs b/src/Jellyfin.Drawing.Skia/SkiaHelper.cs
index 23e92dcb2d..00d224da94 100644
--- a/src/Jellyfin.Drawing.Skia/SkiaHelper.cs
+++ b/src/Jellyfin.Drawing.Skia/SkiaHelper.cs
@@ -1,47 +1,46 @@
using System.Collections.Generic;
using SkiaSharp;
-namespace Jellyfin.Drawing.Skia
+namespace Jellyfin.Drawing.Skia;
+
+///
+/// Class containing helper methods for working with SkiaSharp.
+///
+public static class SkiaHelper
{
///
- /// Class containing helper methods for working with SkiaSharp.
+ /// Gets the next valid image as a bitmap.
///
- public static class SkiaHelper
+ /// The current skia encoder.
+ /// The list of image paths.
+ /// The current checked index.
+ /// The new index.
+ /// A valid bitmap, or null if no bitmap exists after currentIndex.
+ public static SKBitmap? GetNextValidImage(SkiaEncoder skiaEncoder, IReadOnlyList paths, int currentIndex, out int newIndex)
{
- ///
- /// Gets the next valid image as a bitmap.
- ///
- /// The current skia encoder.
- /// The list of image paths.
- /// The current checked index.
- /// The new index.
- /// A valid bitmap, or null if no bitmap exists after currentIndex.
- public static SKBitmap? GetNextValidImage(SkiaEncoder skiaEncoder, IReadOnlyList paths, int currentIndex, out int newIndex)
- {
- var imagesTested = new Dictionary();
- SKBitmap? bitmap = null;
+ var imagesTested = new Dictionary();
+ SKBitmap? bitmap = null;
- while (imagesTested.Count < paths.Count)
+ while (imagesTested.Count < paths.Count)
+ {
+ if (currentIndex >= paths.Count)
{
- if (currentIndex >= paths.Count)
- {
- currentIndex = 0;
- }
+ currentIndex = 0;
+ }
- bitmap = skiaEncoder.Decode(paths[currentIndex], false, null, out _);
+ bitmap = skiaEncoder.Decode(paths[currentIndex], false, null, out _);
- imagesTested[currentIndex] = 0;
+ imagesTested[currentIndex] = 0;
- currentIndex++;
+ currentIndex++;
- if (bitmap is not null)
- {
- break;
- }
+ if (bitmap is not null)
+ {
+ break;
}
-
- newIndex = currentIndex;
- return bitmap;
}
+
+ newIndex = currentIndex;
+ return bitmap;
}
}
diff --git a/src/Jellyfin.Drawing.Skia/SplashscreenBuilder.cs b/src/Jellyfin.Drawing.Skia/SplashscreenBuilder.cs
index 7fbae33495..9905566230 100644
--- a/src/Jellyfin.Drawing.Skia/SplashscreenBuilder.cs
+++ b/src/Jellyfin.Drawing.Skia/SplashscreenBuilder.cs
@@ -2,147 +2,146 @@ using System;
using System.Collections.Generic;
using SkiaSharp;
-namespace Jellyfin.Drawing.Skia
+namespace Jellyfin.Drawing.Skia;
+
+///
+/// Used to build the splashscreen.
+///
+public class SplashscreenBuilder
{
+ private const int FinalWidth = 1920;
+ private const int FinalHeight = 1080;
+ // generated collage resolution should be higher than the final resolution
+ private const int WallWidth = FinalWidth * 3;
+ private const int WallHeight = FinalHeight * 2;
+ private const int Rows = 6;
+ private const int Spacing = 20;
+
+ private readonly SkiaEncoder _skiaEncoder;
+
///
- /// Used to build the splashscreen.
+ /// Initializes a new instance of the class.
///
- public class SplashscreenBuilder
+ /// The SkiaEncoder.
+ public SplashscreenBuilder(SkiaEncoder skiaEncoder)
{
- private const int FinalWidth = 1920;
- private const int FinalHeight = 1080;
- // generated collage resolution should be higher than the final resolution
- private const int WallWidth = FinalWidth * 3;
- private const int WallHeight = FinalHeight * 2;
- private const int Rows = 6;
- private const int Spacing = 20;
-
- private readonly SkiaEncoder _skiaEncoder;
-
- ///
- /// Initializes a new instance of the class.
- ///
- /// The SkiaEncoder.
- public SplashscreenBuilder(SkiaEncoder skiaEncoder)
- {
- _skiaEncoder = skiaEncoder;
- }
+ _skiaEncoder = skiaEncoder;
+ }
- ///
- /// Generate a splashscreen.
- ///
- /// The poster paths.
- /// The landscape paths.
- /// The output path.
- public void GenerateSplash(IReadOnlyList posters, IReadOnlyList backdrops, string outputPath)
- {
- using var wall = GenerateCollage(posters, backdrops);
- using var transformed = Transform3D(wall);
+ ///
+ /// Generate a splashscreen.
+ ///
+ /// The poster paths.
+ /// The landscape paths.
+ /// The output path.
+ public void GenerateSplash(IReadOnlyList posters, IReadOnlyList backdrops, string outputPath)
+ {
+ using var wall = GenerateCollage(posters, backdrops);
+ using var transformed = Transform3D(wall);
- using var outputStream = new SKFileWStream(outputPath);
- using var pixmap = new SKPixmap(new SKImageInfo(FinalWidth, FinalHeight), transformed.GetPixels());
- pixmap.Encode(outputStream, StripCollageBuilder.GetEncodedFormat(outputPath), 90);
- }
+ using var outputStream = new SKFileWStream(outputPath);
+ using var pixmap = new SKPixmap(new SKImageInfo(FinalWidth, FinalHeight), transformed.GetPixels());
+ pixmap.Encode(outputStream, StripCollageBuilder.GetEncodedFormat(outputPath), 90);
+ }
- ///
- /// Generates a collage of posters and landscape pictures.
- ///
- /// The poster paths.
- /// The landscape paths.
- /// The created collage as a bitmap.
- private SKBitmap GenerateCollage(IReadOnlyList posters, IReadOnlyList backdrops)
- {
- var posterIndex = 0;
- var backdropIndex = 0;
+ ///
+ /// Generates a collage of posters and landscape pictures.
+ ///
+ /// The poster paths.
+ /// The landscape paths.
+ /// The created collage as a bitmap.
+ private SKBitmap GenerateCollage(IReadOnlyList posters, IReadOnlyList backdrops)
+ {
+ var posterIndex = 0;
+ var backdropIndex = 0;
+
+ var bitmap = new SKBitmap(WallWidth, WallHeight);
+ using var canvas = new SKCanvas(bitmap);
+ canvas.Clear(SKColors.Black);
- var bitmap = new SKBitmap(WallWidth, WallHeight);
- using var canvas = new SKCanvas(bitmap);
- canvas.Clear(SKColors.Black);
+ int posterHeight = WallHeight / 6;
- int posterHeight = WallHeight / 6;
+ for (int i = 0; i < Rows; i++)
+ {
+ int imageCounter = Random.Shared.Next(0, 5);
+ int currentWidthPos = i * 75;
+ int currentHeight = i * (posterHeight + Spacing);
- for (int i = 0; i < Rows; i++)
+ while (currentWidthPos < WallWidth)
{
- int imageCounter = Random.Shared.Next(0, 5);
- int currentWidthPos = i * 75;
- int currentHeight = i * (posterHeight + Spacing);
+ SKBitmap? currentImage;
- while (currentWidthPos < WallWidth)
+ switch (imageCounter)
{
- SKBitmap? currentImage;
-
- switch (imageCounter)
- {
- case 0:
- case 2:
- case 3:
- currentImage = SkiaHelper.GetNextValidImage(_skiaEncoder, posters, posterIndex, out int newPosterIndex);
- posterIndex = newPosterIndex;
- break;
- default:
- currentImage = SkiaHelper.GetNextValidImage(_skiaEncoder, backdrops, backdropIndex, out int newBackdropIndex);
- backdropIndex = newBackdropIndex;
- break;
- }
-
- if (currentImage is null)
- {
- throw new ArgumentException("Not enough valid pictures provided to create a splashscreen!");
- }
-
- // resize to the same aspect as the original
- var imageWidth = Math.Abs(posterHeight * currentImage.Width / currentImage.Height);
- using var resizedBitmap = new SKBitmap(imageWidth, posterHeight);
- currentImage.ScalePixels(resizedBitmap, SKFilterQuality.High);
-
- // draw on canvas
- canvas.DrawBitmap(resizedBitmap, currentWidthPos, currentHeight);
-
- currentWidthPos += imageWidth + Spacing;
-
- currentImage.Dispose();
-
- if (imageCounter >= 4)
- {
- imageCounter = 0;
- }
- else
- {
- imageCounter++;
- }
+ case 0:
+ case 2:
+ case 3:
+ currentImage = SkiaHelper.GetNextValidImage(_skiaEncoder, posters, posterIndex, out int newPosterIndex);
+ posterIndex = newPosterIndex;
+ break;
+ default:
+ currentImage = SkiaHelper.GetNextValidImage(_skiaEncoder, backdrops, backdropIndex, out int newBackdropIndex);
+ backdropIndex = newBackdropIndex;
+ break;
}
- }
- return bitmap;
+ if (currentImage is null)
+ {
+ throw new ArgumentException("Not enough valid pictures provided to create a splashscreen!");
+ }
+
+ // resize to the same aspect as the original
+ var imageWidth = Math.Abs(posterHeight * currentImage.Width / currentImage.Height);
+ using var resizedBitmap = new SKBitmap(imageWidth, posterHeight);
+ currentImage.ScalePixels(resizedBitmap, SKFilterQuality.High);
+
+ // draw on canvas
+ canvas.DrawBitmap(resizedBitmap, currentWidthPos, currentHeight);
+
+ currentWidthPos += imageWidth + Spacing;
+
+ currentImage.Dispose();
+
+ if (imageCounter >= 4)
+ {
+ imageCounter = 0;
+ }
+ else
+ {
+ imageCounter++;
+ }
+ }
}
- ///
- /// Transform the collage in 3D space.
- ///
- /// The bitmap to transform.
- /// The transformed image.
- private SKBitmap Transform3D(SKBitmap input)
+ return bitmap;
+ }
+
+ ///
+ /// Transform the collage in 3D space.
+ ///
+ /// The bitmap to transform.
+ /// The transformed image.
+ private SKBitmap Transform3D(SKBitmap input)
+ {
+ var bitmap = new SKBitmap(FinalWidth, FinalHeight);
+ using var canvas = new SKCanvas(bitmap);
+ canvas.Clear(SKColors.Black);
+ var matrix = new SKMatrix
{
- var bitmap = new SKBitmap(FinalWidth, FinalHeight);
- using var canvas = new SKCanvas(bitmap);
- canvas.Clear(SKColors.Black);
- var matrix = new SKMatrix
- {
- ScaleX = 0.324108899f,
- ScaleY = 0.563934922f,
- SkewX = -0.244337708f,
- SkewY = 0.0377609022f,
- TransX = 42.0407715f,
- TransY = -198.104706f,
- Persp0 = -9.08959337E-05f,
- Persp1 = 6.85242048E-05f,
- Persp2 = 0.988209724f
- };
-
- canvas.SetMatrix(matrix);
- canvas.DrawBitmap(input, 0, 0);
-
- return bitmap;
- }
+ ScaleX = 0.324108899f,
+ ScaleY = 0.563934922f,
+ SkewX = -0.244337708f,
+ SkewY = 0.0377609022f,
+ TransX = 42.0407715f,
+ TransY = -198.104706f,
+ Persp0 = -9.08959337E-05f,
+ Persp1 = 6.85242048E-05f,
+ Persp2 = 0.988209724f
+ };
+
+ canvas.SetMatrix(matrix);
+ canvas.DrawBitmap(input, 0, 0);
+
+ return bitmap;
}
}
diff --git a/src/Jellyfin.Drawing.Skia/StripCollageBuilder.cs b/src/Jellyfin.Drawing.Skia/StripCollageBuilder.cs
index c8b8f3ace4..eee24c4236 100644
--- a/src/Jellyfin.Drawing.Skia/StripCollageBuilder.cs
+++ b/src/Jellyfin.Drawing.Skia/StripCollageBuilder.cs
@@ -4,183 +4,182 @@ using System.IO;
using System.Text.RegularExpressions;
using SkiaSharp;
-namespace Jellyfin.Drawing.Skia
+namespace Jellyfin.Drawing.Skia;
+
+///
+/// Used to build collages of multiple images arranged in vertical strips.
+///
+public class StripCollageBuilder
{
+ private readonly SkiaEncoder _skiaEncoder;
+
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ /// The encoder to use for building collages.
+ public StripCollageBuilder(SkiaEncoder skiaEncoder)
+ {
+ _skiaEncoder = skiaEncoder;
+ }
+
///
- /// Used to build collages of multiple images arranged in vertical strips.
+ /// Check which format an image has been encoded with using its filename extension.
///
- public class StripCollageBuilder
+ /// The path to the image to get the format for.
+ /// The image format.
+ public static SKEncodedImageFormat GetEncodedFormat(string outputPath)
{
- private readonly SkiaEncoder _skiaEncoder;
+ ArgumentNullException.ThrowIfNull(outputPath);
+
+ var ext = Path.GetExtension(outputPath);
- ///
- /// Initializes a new instance of the class.
- ///
- /// The encoder to use for building collages.
- public StripCollageBuilder(SkiaEncoder skiaEncoder)
+ if (string.Equals(ext, ".jpg", StringComparison.OrdinalIgnoreCase)
+ || string.Equals(ext, ".jpeg", StringComparison.OrdinalIgnoreCase))
{
- _skiaEncoder = skiaEncoder;
+ return SKEncodedImageFormat.Jpeg;
}
- ///
- /// Check which format an image has been encoded with using its filename extension.
- ///
- /// The path to the image to get the format for.
- /// The image format.
- public static SKEncodedImageFormat GetEncodedFormat(string outputPath)
+ if (string.Equals(ext, ".webp", StringComparison.OrdinalIgnoreCase))
{
- ArgumentNullException.ThrowIfNull(outputPath);
-
- var ext = Path.GetExtension(outputPath);
-
- if (string.Equals(ext, ".jpg", StringComparison.OrdinalIgnoreCase)
- || string.Equals(ext, ".jpeg", StringComparison.OrdinalIgnoreCase))
- {
- return SKEncodedImageFormat.Jpeg;
- }
-
- if (string.Equals(ext, ".webp", StringComparison.OrdinalIgnoreCase))
- {
- return SKEncodedImageFormat.Webp;
- }
-
- if (string.Equals(ext, ".gif", StringComparison.OrdinalIgnoreCase))
- {
- return SKEncodedImageFormat.Gif;
- }
-
- if (string.Equals(ext, ".bmp", StringComparison.OrdinalIgnoreCase))
- {
- return SKEncodedImageFormat.Bmp;
- }
-
- // default to png
- return SKEncodedImageFormat.Png;
+ return SKEncodedImageFormat.Webp;
}
- ///
- /// Create a square collage.
- ///
- /// The paths of the images to use in the collage.
- /// The path at which to place the resulting collage image.
- /// The desired width of the collage.
- /// The desired height of the collage.
- public void BuildSquareCollage(IReadOnlyList paths, string outputPath, int width, int height)
+ if (string.Equals(ext, ".gif", StringComparison.OrdinalIgnoreCase))
{
- using var bitmap = BuildSquareCollageBitmap(paths, width, height);
- using var outputStream = new SKFileWStream(outputPath);
- using var pixmap = new SKPixmap(new SKImageInfo(width, height), bitmap.GetPixels());
- pixmap.Encode(outputStream, GetEncodedFormat(outputPath), 90);
+ return SKEncodedImageFormat.Gif;
}
- ///
- /// Create a thumb collage.
- ///
- /// The paths of the images to use in the collage.
- /// The path at which to place the resulting image.
- /// The desired width of the collage.
- /// The desired height of the collage.
- /// The name of the library to draw on the collage.
- public void BuildThumbCollage(IReadOnlyList paths, string outputPath, int width, int height, string? libraryName)
+ if (string.Equals(ext, ".bmp", StringComparison.OrdinalIgnoreCase))
{
- using var bitmap = BuildThumbCollageBitmap(paths, width, height, libraryName);
- using var outputStream = new SKFileWStream(outputPath);
- using var pixmap = new SKPixmap(new SKImageInfo(width, height), bitmap.GetPixels());
- pixmap.Encode(outputStream, GetEncodedFormat(outputPath), 90);
+ return SKEncodedImageFormat.Bmp;
}
- private SKBitmap BuildThumbCollageBitmap(IReadOnlyList paths, int width, int height, string? libraryName)
- {
- var bitmap = new SKBitmap(width, height);
+ // default to png
+ return SKEncodedImageFormat.Png;
+ }
- using var canvas = new SKCanvas(bitmap);
- canvas.Clear(SKColors.Black);
+ ///
+ /// Create a square collage.
+ ///
+ /// The paths of the images to use in the collage.
+ /// The path at which to place the resulting collage image.
+ /// The desired width of the collage.
+ /// The desired height of the collage.
+ public void BuildSquareCollage(IReadOnlyList paths, string outputPath, int width, int height)
+ {
+ using var bitmap = BuildSquareCollageBitmap(paths, width, height);
+ using var outputStream = new SKFileWStream(outputPath);
+ using var pixmap = new SKPixmap(new SKImageInfo(width, height), bitmap.GetPixels());
+ pixmap.Encode(outputStream, GetEncodedFormat(outputPath), 90);
+ }
- using var backdrop = SkiaHelper.GetNextValidImage(_skiaEncoder, paths, 0, out _);
- if (backdrop is null)
- {
- return bitmap;
- }
+ ///
+ /// Create a thumb collage.
+ ///
+ /// The paths of the images to use in the collage.
+ /// The path at which to place the resulting image.
+ /// The desired width of the collage.
+ /// The desired height of the collage.
+ /// The name of the library to draw on the collage.
+ public void BuildThumbCollage(IReadOnlyList paths, string outputPath, int width, int height, string? libraryName)
+ {
+ using var bitmap = BuildThumbCollageBitmap(paths, width, height, libraryName);
+ using var outputStream = new SKFileWStream(outputPath);
+ using var pixmap = new SKPixmap(new SKImageInfo(width, height), bitmap.GetPixels());
+ pixmap.Encode(outputStream, GetEncodedFormat(outputPath), 90);
+ }
- // resize to the same aspect as the original
- var backdropHeight = Math.Abs(width * backdrop.Height / backdrop.Width);
- using var residedBackdrop = SkiaEncoder.ResizeImage(backdrop, new SKImageInfo(width, backdropHeight, backdrop.ColorType, backdrop.AlphaType, backdrop.ColorSpace));
- // draw the backdrop
- canvas.DrawImage(residedBackdrop, 0, 0);
+ private SKBitmap BuildThumbCollageBitmap(IReadOnlyList paths, int width, int height, string? libraryName)
+ {
+ var bitmap = new SKBitmap(width, height);
- // draw shadow rectangle
- using var paintColor = new SKPaint
- {
- Color = SKColors.Black.WithAlpha(0x78),
- Style = SKPaintStyle.Fill
- };
- canvas.DrawRect(0, 0, width, height, paintColor);
+ using var canvas = new SKCanvas(bitmap);
+ canvas.Clear(SKColors.Black);
- var typeFace = SKTypeface.FromFamilyName("sans-serif", SKFontStyleWeight.Bold, SKFontStyleWidth.Normal, SKFontStyleSlant.Upright);
+ using var backdrop = SkiaHelper.GetNextValidImage(_skiaEncoder, paths, 0, out _);
+ if (backdrop is null)
+ {
+ return bitmap;
+ }
- // use the system fallback to find a typeface for the given CJK character
- var nonCjkPattern = @"[^\p{IsCJKUnifiedIdeographs}\p{IsCJKUnifiedIdeographsExtensionA}\p{IsKatakana}\p{IsHiragana}\p{IsHangulSyllables}\p{IsHangulJamo}]";
- var filteredName = Regex.Replace(libraryName ?? string.Empty, nonCjkPattern, string.Empty);
- if (!string.IsNullOrEmpty(filteredName))
- {
- typeFace = SKFontManager.Default.MatchCharacter(null, SKFontStyleWeight.Bold, SKFontStyleWidth.Normal, SKFontStyleSlant.Upright, null, filteredName[0]);
- }
+ // resize to the same aspect as the original
+ var backdropHeight = Math.Abs(width * backdrop.Height / backdrop.Width);
+ using var residedBackdrop = SkiaEncoder.ResizeImage(backdrop, new SKImageInfo(width, backdropHeight, backdrop.ColorType, backdrop.AlphaType, backdrop.ColorSpace));
+ // draw the backdrop
+ canvas.DrawImage(residedBackdrop, 0, 0);
- // draw library name
- using var textPaint = new SKPaint
- {
- Color = SKColors.White,
- Style = SKPaintStyle.Fill,
- TextSize = 112,
- TextAlign = SKTextAlign.Center,
- Typeface = typeFace,
- IsAntialias = true
- };
-
- // scale down text to 90% of the width if text is larger than 95% of the width
- var textWidth = textPaint.MeasureText(libraryName);
- if (textWidth > width * 0.95)
- {
- textPaint.TextSize = 0.9f * width * textPaint.TextSize / textWidth;
- }
+ // draw shadow rectangle
+ using var paintColor = new SKPaint
+ {
+ Color = SKColors.Black.WithAlpha(0x78),
+ Style = SKPaintStyle.Fill
+ };
+ canvas.DrawRect(0, 0, width, height, paintColor);
- canvas.DrawText(libraryName, width / 2f, (height / 2f) + (textPaint.FontMetrics.XHeight / 2), textPaint);
+ var typeFace = SKTypeface.FromFamilyName("sans-serif", SKFontStyleWeight.Bold, SKFontStyleWidth.Normal, SKFontStyleSlant.Upright);
- return bitmap;
+ // use the system fallback to find a typeface for the given CJK character
+ var nonCjkPattern = @"[^\p{IsCJKUnifiedIdeographs}\p{IsCJKUnifiedIdeographsExtensionA}\p{IsKatakana}\p{IsHiragana}\p{IsHangulSyllables}\p{IsHangulJamo}]";
+ var filteredName = Regex.Replace(libraryName ?? string.Empty, nonCjkPattern, string.Empty);
+ if (!string.IsNullOrEmpty(filteredName))
+ {
+ typeFace = SKFontManager.Default.MatchCharacter(null, SKFontStyleWeight.Bold, SKFontStyleWidth.Normal, SKFontStyleSlant.Upright, null, filteredName[0]);
}
- private SKBitmap BuildSquareCollageBitmap(IReadOnlyList paths, int width, int height)
+ // draw library name
+ using var textPaint = new SKPaint
+ {
+ Color = SKColors.White,
+ Style = SKPaintStyle.Fill,
+ TextSize = 112,
+ TextAlign = SKTextAlign.Center,
+ Typeface = typeFace,
+ IsAntialias = true
+ };
+
+ // scale down text to 90% of the width if text is larger than 95% of the width
+ var textWidth = textPaint.MeasureText(libraryName);
+ if (textWidth > width * 0.95)
{
- var bitmap = new SKBitmap(width, height);
- var imageIndex = 0;
- var cellWidth = width / 2;
- var cellHeight = height / 2;
+ textPaint.TextSize = 0.9f * width * textPaint.TextSize / textWidth;
+ }
+
+ canvas.DrawText(libraryName, width / 2f, (height / 2f) + (textPaint.FontMetrics.XHeight / 2), textPaint);
+
+ return bitmap;
+ }
+
+ private SKBitmap BuildSquareCollageBitmap(IReadOnlyList paths, int width, int height)
+ {
+ var bitmap = new SKBitmap(width, height);
+ var imageIndex = 0;
+ var cellWidth = width / 2;
+ var cellHeight = height / 2;
- using var canvas = new SKCanvas(bitmap);
- for (var x = 0; x < 2; x++)
+ using var canvas = new SKCanvas(bitmap);
+ for (var x = 0; x < 2; x++)
+ {
+ for (var y = 0; y < 2; y++)
{
- for (var y = 0; y < 2; y++)
+ using var currentBitmap = SkiaHelper.GetNextValidImage(_skiaEncoder, paths, imageIndex, out int newIndex);
+ imageIndex = newIndex;
+
+ if (currentBitmap is null)
{
- using var currentBitmap = SkiaHelper.GetNextValidImage(_skiaEncoder, paths, imageIndex, out int newIndex);
- imageIndex = newIndex;
-
- if (currentBitmap is null)
- {
- continue;
- }
-
- // Scale image. The FromBitmap creates a copy
- var imageInfo = new SKImageInfo(cellWidth, cellHeight, currentBitmap.ColorType, currentBitmap.AlphaType, currentBitmap.ColorSpace);
- using var resizedBitmap = SKBitmap.FromImage(SkiaEncoder.ResizeImage(currentBitmap, imageInfo));
-
- // draw this image into the strip at the next position
- var xPos = x * cellWidth;
- var yPos = y * cellHeight;
- canvas.DrawBitmap(resizedBitmap, xPos, yPos);
+ continue;
}
- }
- return bitmap;
+ // Scale image. The FromBitmap creates a copy
+ var imageInfo = new SKImageInfo(cellWidth, cellHeight, currentBitmap.ColorType, currentBitmap.AlphaType, currentBitmap.ColorSpace);
+ using var resizedBitmap = SKBitmap.FromImage(SkiaEncoder.ResizeImage(currentBitmap, imageInfo));
+
+ // draw this image into the strip at the next position
+ var xPos = x * cellWidth;
+ var yPos = y * cellHeight;
+ canvas.DrawBitmap(resizedBitmap, xPos, yPos);
+ }
}
+
+ return bitmap;
}
}
diff --git a/src/Jellyfin.Drawing.Skia/UnplayedCountIndicator.cs b/src/Jellyfin.Drawing.Skia/UnplayedCountIndicator.cs
index 58f887c960..456b84b8c8 100644
--- a/src/Jellyfin.Drawing.Skia/UnplayedCountIndicator.cs
+++ b/src/Jellyfin.Drawing.Skia/UnplayedCountIndicator.cs
@@ -2,63 +2,62 @@ using System.Globalization;
using MediaBrowser.Model.Drawing;
using SkiaSharp;
-namespace Jellyfin.Drawing.Skia
+namespace Jellyfin.Drawing.Skia;
+
+///
+/// Static helper class for drawing unplayed count indicators.
+///
+public static class UnplayedCountIndicator
{
///
- /// Static helper class for drawing unplayed count indicators.
+ /// The x-offset used when drawing an unplayed count indicator.
+ ///
+ private const int OffsetFromTopRightCorner = 38;
+
+ ///
+ /// Draw an unplayed count indicator in the top right corner of a canvas.
///
- public static class UnplayedCountIndicator
+ /// The canvas to draw the indicator on.
+ ///
+ /// The dimensions of the image to draw the indicator on. The width is used to determine the x-position of the
+ /// indicator.
+ ///
+ /// The number to draw in the indicator.
+ public static void DrawUnplayedCountIndicator(SKCanvas canvas, ImageDimensions imageSize, int count)
{
- ///
- /// The x-offset used when drawing an unplayed count indicator.
- ///
- private const int OffsetFromTopRightCorner = 38;
+ var x = imageSize.Width - OffsetFromTopRightCorner;
+ var text = count.ToString(CultureInfo.InvariantCulture);
- ///
- /// Draw an unplayed count indicator in the top right corner of a canvas.
- ///
- /// The canvas to draw the indicator on.
- ///
- /// The dimensions of the image to draw the indicator on. The width is used to determine the x-position of the
- /// indicator.
- ///
- /// The number to draw in the indicator.
- public static void DrawUnplayedCountIndicator(SKCanvas canvas, ImageDimensions imageSize, int count)
+ using var paint = new SKPaint
{
- var x = imageSize.Width - OffsetFromTopRightCorner;
- var text = count.ToString(CultureInfo.InvariantCulture);
-
- using var paint = new SKPaint
- {
- Color = SKColor.Parse("#CC00A4DC"),
- Style = SKPaintStyle.Fill
- };
-
- canvas.DrawCircle(x, OffsetFromTopRightCorner, 20, paint);
+ Color = SKColor.Parse("#CC00A4DC"),
+ Style = SKPaintStyle.Fill
+ };
- paint.Color = new SKColor(255, 255, 255, 255);
- paint.TextSize = 24;
- paint.IsAntialias = true;
+ canvas.DrawCircle(x, OffsetFromTopRightCorner, 20, paint);
- var y = OffsetFromTopRightCorner + 9;
+ paint.Color = new SKColor(255, 255, 255, 255);
+ paint.TextSize = 24;
+ paint.IsAntialias = true;
- if (text.Length == 1)
- {
- x -= 7;
- }
+ var y = OffsetFromTopRightCorner + 9;
- if (text.Length == 2)
- {
- x -= 13;
- }
- else if (text.Length >= 3)
- {
- x -= 15;
- y -= 2;
- paint.TextSize = 18;
- }
+ if (text.Length == 1)
+ {
+ x -= 7;
+ }
- canvas.DrawText(text, x, y, paint);
+ if (text.Length == 2)
+ {
+ x -= 13;
}
+ else if (text.Length >= 3)
+ {
+ x -= 15;
+ y -= 2;
+ paint.TextSize = 18;
+ }
+
+ canvas.DrawText(text, x, y, paint);
}
}