Browse Source

chore: update skia sharp

pull/2943/head
Jason Dove 3 weeks ago
parent
commit
6a8cdf17b9
No known key found for this signature in database
  1. 4
      ErsatzTV.Core/ErsatzTV.Core.csproj
  2. 2
      ErsatzTV.Core/Images/ChannelLogoGenerator.cs
  3. 2
      ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj
  4. 12
      ErsatzTV.Infrastructure/Streaming/Graphics/GraphicsEngine.cs

4
ErsatzTV.Core/ErsatzTV.Core.csproj

@ -25,8 +25,8 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="Serilog" Version="4.3.1" /> <PackageReference Include="Serilog" Version="4.3.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" /> <PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
<PackageReference Include="SkiaSharp" Version="3.119.4" /> <PackageReference Include="SkiaSharp" Version="4.150.0" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="3.119.4" /> <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="4.150.0" />
<PackageReference Include="System.CommandLine" Version="2.0.9" /> <PackageReference Include="System.CommandLine" Version="2.0.9" />
<PackageReference Include="Testably.Abstractions" Version="10.2.0" /> <PackageReference Include="Testably.Abstractions" Version="10.2.0" />
<PackageReference Include="TimeSpanParserUtil" Version="1.2.0" /> <PackageReference Include="TimeSpanParserUtil" Version="1.2.0" />

2
ErsatzTV.Core/Images/ChannelLogoGenerator.cs

@ -31,7 +31,7 @@ public class ChannelLogoGenerator : IChannelLogoGenerator
//etv logo //etv logo
string overlayImagePath = Path.Combine("wwwroot", "images", "ersatztv-500.png"); string overlayImagePath = Path.Combine("wwwroot", "images", "ersatztv-500.png");
using var overlayImage = SKBitmap.Decode(overlayImagePath); using var overlayImage = SKBitmap.Decode(overlayImagePath);
canvas.DrawBitmap(overlayImage, new SKRect(155, 60, 205, 110)); canvas.DrawBitmap(overlayImage, new SKRect(155, 60, 205, 110), SKSamplingOptions.Default);
//Custom Font //Custom Font
string fontPath = Path.Combine(FileSystemLayout.ResourcesCacheFolder, "Sen.ttf"); string fontPath = Path.Combine(FileSystemLayout.ResourcesCacheFolder, "Sen.ttf");

2
ErsatzTV.Infrastructure/ErsatzTV.Infrastructure.csproj

@ -36,7 +36,7 @@
<PackageReference Include="RichTextKit.Stbear" Version="0.4.167.3" /> <PackageReference Include="RichTextKit.Stbear" Version="0.4.167.3" />
<PackageReference Include="Scriban.Signed" Version="7.2.5" /> <PackageReference Include="Scriban.Signed" Version="7.2.5" />
<PackageReference Include="SixLabors.ImageSharp" Version="[3.1.12,4)" /> <PackageReference Include="SixLabors.ImageSharp" Version="[3.1.12,4)" />
<PackageReference Include="SkiaSharp" Version="3.119.4" /> <PackageReference Include="SkiaSharp" Version="4.150.0" />
<PackageReference Include="TagLibSharp" Version="2.3.0" /> <PackageReference Include="TagLibSharp" Version="2.3.0" />
<PackageReference Include="TimeZoneConverter" Version="7.2.0" /> <PackageReference Include="TimeZoneConverter" Version="7.2.0" />
</ItemGroup> </ItemGroup>

12
ErsatzTV.Infrastructure/Streaming/Graphics/GraphicsEngine.cs

@ -190,12 +190,20 @@ public class GraphicsEngine(
SKColors.White.WithAlpha((byte)(preparedImage.Opacity * 255)), SKColors.White.WithAlpha((byte)(preparedImage.Opacity * 255)),
SKBlendMode.Modulate); SKBlendMode.Modulate);
paint.ColorFilter = colorFilter; paint.ColorFilter = colorFilter;
canvas.DrawBitmap(preparedImage.Image, preparedImage.Point, paint); canvas.DrawBitmap(
preparedImage.Image,
preparedImage.Point,
SKSamplingOptions.Default,
paint);
} }
else else
{ {
paint.ColorFilter = null; paint.ColorFilter = null;
canvas.DrawBitmap(preparedImage.Image, preparedImage.Point, paint); canvas.DrawBitmap(
preparedImage.Image,
preparedImage.Point,
SKSamplingOptions.Default,
paint);
} }
if (preparedImage.Dispose) if (preparedImage.Dispose)

Loading…
Cancel
Save