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

Cleanup

Browse Source
This commit is contained in:
Bond_009 2019-01-26 21:10:19 +01:00
parent ce11869a1a
commit bb056f4b59
1 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,16 +72,11 @@ namespace Jellyfin.Drawing.Skia
_logger.LogInformation("SkiaSharp version: " + GetVersion()); _logger.LogInformation("SkiaSharp version: " + GetVersion());
} }
public static string GetVersion() public static Version GetVersion()
{ => typeof(SKBitmap).GetTypeInfo().Assembly.GetName().Version;
return typeof(SKBitmap).GetTypeInfo().Assembly.GetName().Version.ToString();
}
private static bool IsTransparent(SKColor color) private static bool IsTransparent(SKColor color)
{ => (color.Red == 255 && color.Green == 255 && color.Blue == 255) || color.Alpha == 0;
return (color.Red == 255 && color.Green == 255 && color.Blue == 255) || color.Alpha == 0;
}
public static SKEncodedImageFormat GetImageFormat(ImageFormat selectedFormat) public static SKEncodedImageFormat GetImageFormat(ImageFormat selectedFormat)
{ {
@ -130,33 +125,51 @@ namespace Jellyfin.Drawing.Skia
for (int row = 0; row < bitmap.Height; ++row) for (int row = 0; row < bitmap.Height; ++row)
{ {
if (IsTransparentRow(bitmap, row)) if (IsTransparentRow(bitmap, row))
{
topmost = row + 1; topmost = row + 1;
else break; }
else
{
break;
}
} }
int bottommost = bitmap.Height; int bottommost = bitmap.Height;
for (int row = bitmap.Height - 1; row >= 0; --row) for (int row = bitmap.Height - 1; row >= 0; --row)
{ {
if (IsTransparentRow(bitmap, row)) if (IsTransparentRow(bitmap, row))
{
bottommost = row; bottommost = row;
else break; }
else
{
break;
}
} }
int leftmost = 0, rightmost = bitmap.Width; int leftmost = 0, rightmost = bitmap.Width;
for (int col = 0; col < bitmap.Width; ++col) for (int col = 0; col < bitmap.Width; ++col)
{ {
if (IsTransparentColumn(bitmap, col)) if (IsTransparentColumn(bitmap, col))
{
leftmost = col + 1; leftmost = col + 1;
}
else else
{
break; break;
}
} }
for (int col = bitmap.Width - 1; col >= 0; --col) for (int col = bitmap.Width - 1; col >= 0; --col)
{ {
if (IsTransparentColumn(bitmap, col)) if (IsTransparentColumn(bitmap, col))
{
rightmost = col; rightmost = col;
}
else else
{
break; break;
}
} }
var newRect = SKRectI.Create(leftmost, topmost, rightmost - leftmost, bottommost - topmost); var newRect = SKRectI.Create(leftmost, topmost, rightmost - leftmost, bottommost - topmost);
@ -180,9 +193,7 @@ namespace Jellyfin.Drawing.Skia
} }
private static bool HasDiacritics(string text) private static bool HasDiacritics(string text)
{ => !string.Equals(text, text.RemoveDiacritics(), StringComparison.Ordinal);
return !string.Equals(text, text.RemoveDiacritics(), StringComparison.Ordinal);
}
private static bool RequiresSpecialCharacterHack(string path) private static bool RequiresSpecialCharacterHack(string path)
{ {
@ -243,6 +254,7 @@ namespace Jellyfin.Drawing.Skia
} }
private static string[] TransparentImageTypes = new string[] { ".png", ".gif", ".webp" }; private static string[] TransparentImageTypes = new string[] { ".png", ".gif", ".webp" };
internal static SKBitmap Decode(string path, bool forceCleanBitmap, IFileSystem fileSystem, ImageOrientation? orientation, out SKEncodedOrigin origin) internal static SKBitmap Decode(string path, bool forceCleanBitmap, IFileSystem fileSystem, ImageOrientation? orientation, out SKEncodedOrigin origin)
{ {
if (!fileSystem.FileExists(path)) if (!fileSystem.FileExists(path))
@ -267,7 +279,7 @@ namespace Jellyfin.Drawing.Skia
var bitmap = new SKBitmap(codec.Info.Width, codec.Info.Height, !requiresTransparencyHack); var bitmap = new SKBitmap(codec.Info.Width, codec.Info.Height, !requiresTransparencyHack);
// decode // decode
codec.GetPixels(bitmap.Info, bitmap.GetPixels()); var _ = codec.GetPixels(bitmap.Info, bitmap.GetPixels());
origin = codec.EncodedOrigin; origin = codec.EncodedOrigin;
@ -316,14 +328,11 @@ namespace Jellyfin.Drawing.Skia
{ {
var bitmap = GetBitmap(path, cropWhitespace, true, orientation, out origin); var bitmap = GetBitmap(path, cropWhitespace, true, orientation, out origin);
if (bitmap != null) if (bitmap != null && origin != SKEncodedOrigin.TopLeft)
{ {
if (origin != SKEncodedOrigin.TopLeft) using (bitmap)
{ {
using (bitmap) return OrientImage(bitmap, origin);
{
return OrientImage(bitmap, origin);
}
} }
} }
@ -347,7 +356,6 @@ namespace Jellyfin.Drawing.Skia
switch (origin) switch (origin)
{ {
case SKEncodedOrigin.TopRight: case SKEncodedOrigin.TopRight:
{ {
var rotated = new SKBitmap(bitmap.Width, bitmap.Height); var rotated = new SKBitmap(bitmap.Width, bitmap.Height);
@ -366,11 +374,8 @@ namespace Jellyfin.Drawing.Skia
var rotated = new SKBitmap(bitmap.Width, bitmap.Height); var rotated = new SKBitmap(bitmap.Width, bitmap.Height);
using (var surface = new SKCanvas(rotated)) using (var surface = new SKCanvas(rotated))
{ {
float px = bitmap.Width; float px = (float)bitmap.Width / 2;
px /= 2; float py = (float)bitmap.Height / 2;
float py = bitmap.Height;
py /= 2;
surface.RotateDegrees(180, px, py); surface.RotateDegrees(180, px, py);
surface.DrawBitmap(bitmap, 0, 0); surface.DrawBitmap(bitmap, 0, 0);
@ -384,11 +389,9 @@ namespace Jellyfin.Drawing.Skia
var rotated = new SKBitmap(bitmap.Width, bitmap.Height); var rotated = new SKBitmap(bitmap.Width, bitmap.Height);
using (var surface = new SKCanvas(rotated)) using (var surface = new SKCanvas(rotated))
{ {
float px = bitmap.Width; float px = (float)bitmap.Width / 2;
px /= 2;
float py = bitmap.Height; float py = (float)bitmap.Height / 2;
py /= 2;
surface.Translate(rotated.Width, 0); surface.Translate(rotated.Width, 0);
surface.Scale(-1, 1); surface.Scale(-1, 1);
@ -412,7 +415,6 @@ namespace Jellyfin.Drawing.Skia
surface.RotateDegrees(90); surface.RotateDegrees(90);
surface.DrawBitmap(bitmap, 0, 0); surface.DrawBitmap(bitmap, 0, 0);
} }
var flippedBitmap = new SKBitmap(rotated.Width, rotated.Height); var flippedBitmap = new SKBitmap(rotated.Width, rotated.Height);
@ -477,8 +479,7 @@ namespace Jellyfin.Drawing.Skia
return rotated; return rotated;
} }
default: default: return bitmap;
return bitmap;
} }
} }
@ -488,6 +489,7 @@ namespace Jellyfin.Drawing.Skia
{ {
throw new ArgumentNullException(nameof(inputPath)); throw new ArgumentNullException(nameof(inputPath));
} }
if (string.IsNullOrWhiteSpace(inputPath)) if (string.IsNullOrWhiteSpace(inputPath))
{ {
throw new ArgumentNullException(nameof(outputPath)); throw new ArgumentNullException(nameof(outputPath));
@ -507,11 +509,11 @@ namespace Jellyfin.Drawing.Skia
throw new ArgumentOutOfRangeException(string.Format("Skia unable to read image {0}", inputPath)); throw new ArgumentOutOfRangeException(string.Format("Skia unable to read image {0}", inputPath));
} }
//_logger.LogInformation("Color type {0}", bitmap.Info.ColorType);
var originalImageSize = new ImageDimensions(bitmap.Width, bitmap.Height); var originalImageSize = new ImageDimensions(bitmap.Width, bitmap.Height);
if (!options.CropWhiteSpace && options.HasDefaultOptions(inputPath, originalImageSize) && !autoOrient) if (!options.CropWhiteSpace
&& options.HasDefaultOptions(inputPath, originalImageSize)
&& !autoOrient)
{ {
// Just spit out the original file if all the options are default // Just spit out the original file if all the options are default
return inputPath; return inputPath;
@ -522,7 +524,7 @@ namespace Jellyfin.Drawing.Skia
var width = newImageSize.Width; var width = newImageSize.Width;
var height = newImageSize.Height; var height = newImageSize.Height;
using (var resizedBitmap = new SKBitmap(width, height))//, bitmap.ColorType, bitmap.AlphaType)) using (var resizedBitmap = new SKBitmap(width, height, bitmap.ColorType, bitmap.AlphaType))
{ {
// scale image // scale image
bitmap.ScalePixels(resizedBitmap, SKFilterQuality.High); bitmap.ScalePixels(resizedBitmap, SKFilterQuality.High);
@ -532,12 +534,10 @@ namespace Jellyfin.Drawing.Skia
{ {
_fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(outputPath)); _fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(outputPath));
using (var outputStream = new SKFileWStream(outputPath)) using (var outputStream = new SKFileWStream(outputPath))
using (var pixmap = new SKPixmap(new SKImageInfo(width, height), resizedBitmap.GetPixels()))
{ {
using (var pixmap = new SKPixmap(new SKImageInfo(width, height), resizedBitmap.GetPixels())) pixmap.Encode(outputStream, skiaOutputFormat, quality);
{ return outputPath;
pixmap.Encode(outputStream, skiaOutputFormat, quality);
return outputPath;
}
} }
} }
@ -600,8 +600,7 @@ namespace Jellyfin.Drawing.Skia
public void CreateImageCollage(ImageCollageOptions options) public void CreateImageCollage(ImageCollageOptions options)
{ {
double ratio = options.Width; double ratio = (double)options.Width / options.Height;
ratio /= options.Height;
if (ratio >= 1.4) if (ratio >= 1.4)
{ {
@ -613,7 +612,7 @@ namespace Jellyfin.Drawing.Skia
} }
else else
{ {
// @todo create Poster collage capability // TODO: Create Poster collage capability
new StripCollageBuilder(_appPaths, _fileSystem).BuildSquareCollage(options.InputPaths, options.OutputPath, options.Width, options.Height); new StripCollageBuilder(_appPaths, _fileSystem).BuildSquareCollage(options.InputPaths, options.OutputPath, options.Width, options.Height);
} }
} }