aboutsummaryrefslogtreecommitdiff
path: root/Emby.Drawing.Skia
diff options
context:
space:
mode:
Diffstat (limited to 'Emby.Drawing.Skia')
-rw-r--r--Emby.Drawing.Skia/Emby.Drawing.Skia.csproj2
-rw-r--r--Emby.Drawing.Skia/PercentPlayedDrawer.cs4
-rw-r--r--Emby.Drawing.Skia/PlayedIndicatorDrawer.cs4
-rw-r--r--Emby.Drawing.Skia/SkiaEncoder.cs96
-rw-r--r--Emby.Drawing.Skia/StripCollageBuilder.cs10
-rw-r--r--Emby.Drawing.Skia/UnplayedCountIndicator.cs7
6 files changed, 49 insertions, 74 deletions
diff --git a/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj b/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj
index 1bbb0b1c15..c36d42194f 100644
--- a/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj
+++ b/Emby.Drawing.Skia/Emby.Drawing.Skia.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
diff --git a/Emby.Drawing.Skia/PercentPlayedDrawer.cs b/Emby.Drawing.Skia/PercentPlayedDrawer.cs
index e291a462b9..a204999fe3 100644
--- a/Emby.Drawing.Skia/PercentPlayedDrawer.cs
+++ b/Emby.Drawing.Skia/PercentPlayedDrawer.cs
@@ -1,6 +1,6 @@
-using SkiaSharp;
-using MediaBrowser.Model.Drawing;
using System;
+using MediaBrowser.Model.Drawing;
+using SkiaSharp;
namespace Emby.Drawing.Skia
{
diff --git a/Emby.Drawing.Skia/PlayedIndicatorDrawer.cs b/Emby.Drawing.Skia/PlayedIndicatorDrawer.cs
index a4d8a29383..7e9cb8c5cb 100644
--- a/Emby.Drawing.Skia/PlayedIndicatorDrawer.cs
+++ b/Emby.Drawing.Skia/PlayedIndicatorDrawer.cs
@@ -1,8 +1,8 @@
-using SkiaSharp;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Net;
using MediaBrowser.Model.Drawing;
using MediaBrowser.Model.IO;
+using SkiaSharp;
namespace Emby.Drawing.Skia
{
@@ -51,7 +51,7 @@ namespace Emby.Drawing.Skia
paint.Typeface = emojiTypeface;
- canvas.DrawText(text, (float)x-20, OffsetFromTopRightCorner + 12, paint);
+ canvas.DrawText(text, (float)x - 20, OffsetFromTopRightCorner + 12, paint);
}
}
}
diff --git a/Emby.Drawing.Skia/SkiaEncoder.cs b/Emby.Drawing.Skia/SkiaEncoder.cs
index dc5ae77ccc..8f517681e8 100644
--- a/Emby.Drawing.Skia/SkiaEncoder.cs
+++ b/Emby.Drawing.Skia/SkiaEncoder.cs
@@ -1,18 +1,17 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller.Drawing;
-using MediaBrowser.Model.Drawing;
-using MediaBrowser.Model.IO;
-using Microsoft.Extensions.Logging;
-using SkiaSharp;
using System;
+using System.Globalization;
using System.IO;
using System.Linq;
using System.Reflection;
-using System.Threading.Tasks;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Drawing;
using MediaBrowser.Controller.Extensions;
-using System.Globalization;
+using MediaBrowser.Model.Drawing;
using MediaBrowser.Model.Globalization;
+using MediaBrowser.Model.IO;
+using Microsoft.Extensions.Logging;
+using SkiaSharp;
namespace Emby.Drawing.Skia
{
@@ -35,46 +34,34 @@ namespace Emby.Drawing.Skia
LogVersion();
}
- public string[] SupportedInputFormats
- {
- get
+ public string[] SupportedInputFormats =>
+ new[]
{
- // Some common file name extensions for RAW picture files include: .cr2, .crw, .dng, .nef, .orf, .rw2, .pef, .arw, .sr2, .srf, and .tif.
- return new[]
- {
- "jpeg",
- "jpg",
- "png",
-
- "dng",
-
- "webp",
- "gif",
- "bmp",
- "ico",
- "astc",
- "ktx",
- "pkm",
- "wbmp",
-
- // TODO
- // Are all of these supported? https://github.com/google/skia/blob/master/infra/bots/recipes/test.py#L454
-
- // working on windows at least
- "cr2",
- "nef",
- "arw"
- };
- }
- }
+ "jpeg",
+ "jpg",
+ "png",
- public ImageFormat[] SupportedOutputFormats
- {
- get
- {
- return new[] { ImageFormat.Webp, ImageFormat.Jpg, ImageFormat.Png };
- }
- }
+ "dng",
+
+ "webp",
+ "gif",
+ "bmp",
+ "ico",
+ "astc",
+ "ktx",
+ "pkm",
+ "wbmp",
+
+ // TODO
+ // Are all of these supported? https://github.com/google/skia/blob/master/infra/bots/recipes/test.py#L454
+
+ // working on windows at least
+ "cr2",
+ "nef",
+ "arw"
+ };
+
+ public ImageFormat[] SupportedOutputFormats => new[] { ImageFormat.Webp, ImageFormat.Jpg, ImageFormat.Png };
private void LogVersion()
{
@@ -667,19 +654,10 @@ namespace Emby.Drawing.Skia
}
}
- public string Name
- {
- get { return "Skia"; }
- }
+ public string Name => "Skia";
- public bool SupportsImageCollageCreation
- {
- get { return true; }
- }
+ public bool SupportsImageCollageCreation => true;
- public bool SupportsImageEncoding
- {
- get { return true; }
- }
+ public bool SupportsImageEncoding => true;
}
}
diff --git a/Emby.Drawing.Skia/StripCollageBuilder.cs b/Emby.Drawing.Skia/StripCollageBuilder.cs
index b3e7dbb5fa..8d984de116 100644
--- a/Emby.Drawing.Skia/StripCollageBuilder.cs
+++ b/Emby.Drawing.Skia/StripCollageBuilder.cs
@@ -1,9 +1,9 @@
-using SkiaSharp;
-using MediaBrowser.Common.Configuration;
using System;
+using System.Collections.Generic;
using System.IO;
+using MediaBrowser.Common.Configuration;
using MediaBrowser.Model.IO;
-using System.Collections.Generic;
+using SkiaSharp;
namespace Emby.Drawing.Skia
{
@@ -164,7 +164,7 @@ namespace Emby.Drawing.Skia
private SKBitmap GetNextValidImage(string[] paths, int currentIndex, out int newIndex)
{
- Dictionary<int, int> imagesTested = new Dictionary<int, int>();
+ var imagesTested = new Dictionary<int, int>();
SKBitmap bitmap = null;
while (imagesTested.Count < paths.Length)
@@ -174,7 +174,7 @@ namespace Emby.Drawing.Skia
currentIndex = 0;
}
- bitmap = SkiaEncoder.Decode(paths[currentIndex], false, _fileSystem, null, out SKEncodedOrigin origin);
+ bitmap = SkiaEncoder.Decode(paths[currentIndex], false, _fileSystem, null, out var origin);
imagesTested[currentIndex] = 0;
diff --git a/Emby.Drawing.Skia/UnplayedCountIndicator.cs b/Emby.Drawing.Skia/UnplayedCountIndicator.cs
index b59bc1026a..e1d1ecff83 100644
--- a/Emby.Drawing.Skia/UnplayedCountIndicator.cs
+++ b/Emby.Drawing.Skia/UnplayedCountIndicator.cs
@@ -1,12 +1,9 @@
-using SkiaSharp;
+using System.Globalization;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Net;
using MediaBrowser.Model.Drawing;
-using System.Globalization;
-using System.Threading.Tasks;
-
-using MediaBrowser.Controller.IO;
using MediaBrowser.Model.IO;
+using SkiaSharp;
namespace Emby.Drawing.Skia
{
generated by cgit v1.2.3 (git 2.46.0) at 2026-05-02 07:19:44 +0000