Forráskód Böngészése

Merge pull request #582 from nvllsvm/image

Replace custom image parser with Skia
Andrew Rabert 6 éve
szülő
commit
6561021926

+ 0 - 24
Emby.Drawing.Skia/Emby.Drawing.Skia.csproj

@@ -1,24 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="SkiaSharp" Version="1.68.0" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="1.68.0" />
-    <PackageReference Include="Jellyfin.SkiaSharp.NativeAssets.LinuxArm" Version="1.68.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
-    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="..\SharedVersion.cs" />
-  </ItemGroup>
-
-</Project>

+ 0 - 21
Emby.Drawing.Skia/Properties/AssemblyInfo.cs

@@ -1,21 +0,0 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("Emby.Drawing.Skia")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Jellyfin Project")]
-[assembly: AssemblyProduct("Jellyfin: The Free Software Media System")]
-[assembly: AssemblyCopyright("Copyright ©  2019 Jellyfin Contributors. Code released under the GNU General Public License Version 2")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-[assembly: NeutralResourcesLanguage("en")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]

+ 0 - 242
Emby.Drawing/Common/ImageHeader.cs

@@ -1,242 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using MediaBrowser.Model.Drawing;
-using MediaBrowser.Model.IO;
-using Microsoft.Extensions.Logging;
-
-namespace Emby.Drawing.Common
-{
-    /// <summary>
-    /// Taken from http://stackoverflow.com/questions/111345/getting-image-dimensions-without-reading-the-entire-file/111349
-    /// http://www.codeproject.com/Articles/35978/Reading-Image-Headers-to-Get-Width-and-Height
-    /// Minor improvements including supporting unsigned 16-bit integers when decoding Jfif and added logic
-    /// to load the image using new Bitmap if reading the headers fails
-    /// </summary>
-    public static class ImageHeader
-    {
-        /// <summary>
-        /// The error message
-        /// </summary>
-        const string ErrorMessage = "Could not recognize image format.";
-
-        /// <summary>
-        /// The image format decoders
-        /// </summary>
-        private static readonly KeyValuePair<byte[], Func<BinaryReader, ImageSize>>[] ImageFormatDecoders = new Dictionary<byte[], Func<BinaryReader, ImageSize>>
-        {
-            { new byte[] { 0x42, 0x4D }, DecodeBitmap },
-            { new byte[] { 0x47, 0x49, 0x46, 0x38, 0x37, 0x61 }, DecodeGif },
-            { new byte[] { 0x47, 0x49, 0x46, 0x38, 0x39, 0x61 }, DecodeGif },
-            { new byte[] { 0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A }, DecodePng },
-            { new byte[] { 0xff, 0xd8 }, DecodeJfif }
-
-        }.ToArray();
-
-        private static readonly int MaxMagicBytesLength = ImageFormatDecoders.Select(i => i.Key.Length).OrderByDescending(i => i).First();
-
-        private static string[] SupportedExtensions = new string[] { ".jpg", ".jpeg", ".png", ".gif" };
-
-        /// <summary>
-        /// Gets the dimensions of an image.
-        /// </summary>
-        /// <param name="path">The path of the image to get the dimensions of.</param>
-        /// <param name="logger">The logger.</param>
-        /// <param name="fileSystem">The file system.</param>
-        /// <returns>The dimensions of the specified image.</returns>
-        /// <exception cref="ArgumentException">The image was of an unrecognised format.</exception>
-        public static ImageSize GetDimensions(string path, ILogger logger, IFileSystem fileSystem)
-        {
-            if (string.IsNullOrEmpty(path))
-            {
-                throw new ArgumentNullException(nameof(path));
-            }
-
-            string extension = Path.GetExtension(path).ToLower();
-
-            if (!SupportedExtensions.Contains(extension))
-            {
-                throw new ArgumentException("ImageHeader doesn't support " + extension);
-            }
-
-            using (var fs = fileSystem.OpenRead(path))
-            {
-                using (var binaryReader = new BinaryReader(fs))
-                {
-                    return GetDimensions(binaryReader);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Gets the dimensions of an image.
-        /// </summary>
-        /// <param name="binaryReader">The binary reader.</param>
-        /// <returns>Size.</returns>
-        /// <exception cref="ArgumentException">binaryReader</exception>
-        /// <exception cref="ArgumentException">The image was of an unrecognized format.</exception>
-        private static ImageSize GetDimensions(BinaryReader binaryReader)
-        {
-            var magicBytes = new byte[MaxMagicBytesLength];
-
-            for (var i = 0; i < MaxMagicBytesLength; i += 1)
-            {
-                magicBytes[i] = binaryReader.ReadByte();
-
-                foreach (var kvPair in ImageFormatDecoders)
-                {
-                    if (StartsWith(magicBytes, kvPair.Key))
-                    {
-                        return kvPair.Value(binaryReader);
-                    }
-                }
-            }
-
-            throw new ArgumentException(ErrorMessage, nameof(binaryReader));
-        }
-
-        /// <summary>
-        /// Startses the with.
-        /// </summary>
-        /// <param name="thisBytes">The this bytes.</param>
-        /// <param name="thatBytes">The that bytes.</param>
-        /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
-        private static bool StartsWith(byte[] thisBytes, byte[] thatBytes)
-        {
-            for (int i = 0; i < thatBytes.Length; i += 1)
-            {
-                if (thisBytes[i] != thatBytes[i])
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// Reads the little endian int16.
-        /// </summary>
-        /// <param name="binaryReader">The binary reader.</param>
-        /// <returns>System.Int16.</returns>
-        private static short ReadLittleEndianInt16(this BinaryReader binaryReader)
-        {
-            var bytes = new byte[sizeof(short)];
-
-            for (int i = 0; i < sizeof(short); i += 1)
-            {
-                bytes[sizeof(short) - 1 - i] = binaryReader.ReadByte();
-            }
-            return BitConverter.ToInt16(bytes, 0);
-        }
-
-        /// <summary>
-        /// Reads the little endian int32.
-        /// </summary>
-        /// <param name="binaryReader">The binary reader.</param>
-        /// <returns>System.Int32.</returns>
-        private static int ReadLittleEndianInt32(this BinaryReader binaryReader)
-        {
-            var bytes = new byte[sizeof(int)];
-            for (int i = 0; i < sizeof(int); i += 1)
-            {
-                bytes[sizeof(int) - 1 - i] = binaryReader.ReadByte();
-            }
-            return BitConverter.ToInt32(bytes, 0);
-        }
-
-        /// <summary>
-        /// Decodes the bitmap.
-        /// </summary>
-        /// <param name="binaryReader">The binary reader.</param>
-        /// <returns>Size.</returns>
-        private static ImageSize DecodeBitmap(BinaryReader binaryReader)
-        {
-            binaryReader.ReadBytes(16);
-            int width = binaryReader.ReadInt32();
-            int height = binaryReader.ReadInt32();
-            return new ImageSize
-            {
-                Width = width,
-                Height = height
-            };
-        }
-
-        /// <summary>
-        /// Decodes the GIF.
-        /// </summary>
-        /// <param name="binaryReader">The binary reader.</param>
-        /// <returns>Size.</returns>
-        private static ImageSize DecodeGif(BinaryReader binaryReader)
-        {
-            int width = binaryReader.ReadInt16();
-            int height = binaryReader.ReadInt16();
-            return new ImageSize
-            {
-                Width = width,
-                Height = height
-            };
-        }
-
-        /// <summary>
-        /// Decodes the PNG.
-        /// </summary>
-        /// <param name="binaryReader">The binary reader.</param>
-        /// <returns>Size.</returns>
-        private static ImageSize DecodePng(BinaryReader binaryReader)
-        {
-            binaryReader.ReadBytes(8);
-            int width = ReadLittleEndianInt32(binaryReader);
-            int height = ReadLittleEndianInt32(binaryReader);
-            return new ImageSize
-            {
-                Width = width,
-                Height = height
-            };
-        }
-
-        /// <summary>
-        /// Decodes the jfif.
-        /// </summary>
-        /// <param name="binaryReader">The binary reader.</param>
-        /// <returns>Size.</returns>
-        /// <exception cref="ArgumentException"></exception>
-        private static ImageSize DecodeJfif(BinaryReader binaryReader)
-        {
-            // A JPEG image consists of a sequence of segments,
-            // each beginning with a marker, each of which begins with a 0xFF byte
-            // followed by a byte indicating what kind of marker it is.
-            // Source: https://en.wikipedia.org/wiki/JPEG#Syntax_and_structure
-            while (binaryReader.ReadByte() == 0xff)
-            {
-                byte marker = binaryReader.ReadByte();
-                short chunkLength = binaryReader.ReadLittleEndianInt16();
-                // SOF0: Indicates that this is a baseline DCT-based JPEG,
-                // and specifies the width, height, number of components, and component subsampling
-                // SOF2: Indicates that this is a progressive DCT-based JPEG,
-                // and specifies the width, height, number of components, and component subsampling
-                if (marker == 0xc0 || marker == 0xc2)
-                {
-                    // https://help.accusoft.com/ImageGear/v18.2/Windows/ActiveX/IGAX-10-12.html
-                    binaryReader.ReadByte(); // We don't care about the first byte
-                    int height = binaryReader.ReadLittleEndianInt16();
-                    int width = binaryReader.ReadLittleEndianInt16();
-                    return new ImageSize(width, height);
-                }
-
-                if (chunkLength < 0)
-                {
-                    ushort uchunkLength = (ushort)chunkLength;
-                    binaryReader.ReadBytes(uchunkLength - 2);
-                }
-                else
-                {
-                    binaryReader.ReadBytes(chunkLength - 2);
-                }
-            }
-
-            throw new ArgumentException(ErrorMessage);
-        }
-    }
-}

+ 12 - 5
Emby.Drawing/Emby.Drawing.csproj

@@ -1,17 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="SkiaSharp" Version="1.68.0" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="1.68.0" />
+    <PackageReference Include="Jellyfin.SkiaSharp.NativeAssets.LinuxArm" Version="1.68.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
     <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
+    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <Compile Include="..\SharedVersion.cs" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-  </PropertyGroup>
-
 </Project>

+ 13 - 21
Emby.Drawing/ImageProcessor.cs

@@ -1,3 +1,4 @@
+using SkiaSharp;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -5,7 +6,6 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Emby.Drawing.Common;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Drawing;
@@ -422,10 +422,10 @@ namespace Emby.Drawing
 
         public ImageSize GetImageSize(BaseItem item, ItemImageInfo info)
         {
-            return GetImageSize(item, info, false, true);
+            return GetImageSize(item, info, true);
         }
 
-        public ImageSize GetImageSize(BaseItem item, ItemImageInfo info, bool allowSlowMethods, bool updateItem)
+        public ImageSize GetImageSize(BaseItem item, ItemImageInfo info, bool updateItem)
         {
             var width = info.Width;
             var height = info.Height;
@@ -442,7 +442,7 @@ namespace Emby.Drawing
             var path = info.Path;
             _logger.LogInformation("Getting image size for item {0} {1}", item.GetType().Name, path);
 
-            var size = GetImageSize(path, allowSlowMethods);
+            var size = GetImageSize(path);
 
             info.Height = Convert.ToInt32(size.Height);
             info.Width = Convert.ToInt32(size.Width);
@@ -455,34 +455,26 @@ namespace Emby.Drawing
             return size;
         }
 
-        public ImageSize GetImageSize(string path)
-        {
-            return GetImageSize(path, true);
-        }
-
         /// <summary>
         /// Gets the size of the image.
         /// </summary>
-        private ImageSize GetImageSize(string path, bool allowSlowMethod)
+        public ImageSize GetImageSize(string path)
         {
             if (string.IsNullOrEmpty(path))
             {
                 throw new ArgumentNullException(nameof(path));
             }
 
-            try
-            {
-                return ImageHeader.GetDimensions(path, _logger, _fileSystem);
-            }
-            catch
-            {
-                if (!allowSlowMethod)
+            using (var s = new SKFileStream(path))
+                using (var codec = SKCodec.Create(s))
                 {
-                    throw;
+                    var info = codec.Info;
+                    return new ImageSize
+                    {
+                        Height = info.Height,
+                        Width = info.Width
+                    };
                 }
-            }
-
-            return _imageEncoder.GetImageSize(path);
         }
 
         /// <summary>

+ 1 - 1
Emby.Drawing.Skia/PercentPlayedDrawer.cs → Emby.Drawing/PercentPlayedDrawer.cs

@@ -2,7 +2,7 @@ using System;
 using MediaBrowser.Model.Drawing;
 using SkiaSharp;
 
-namespace Emby.Drawing.Skia
+namespace Emby.Drawing
 {
     public class PercentPlayedDrawer
     {

+ 1 - 1
Emby.Drawing.Skia/PlayedIndicatorDrawer.cs → Emby.Drawing/PlayedIndicatorDrawer.cs

@@ -4,7 +4,7 @@ using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.IO;
 using SkiaSharp;
 
-namespace Emby.Drawing.Skia
+namespace Emby.Drawing
 {
     public class PlayedIndicatorDrawer
     {

+ 1 - 1
Emby.Drawing.Skia/SkiaEncoder.cs → Emby.Drawing/SkiaEncoder.cs

@@ -13,7 +13,7 @@ using MediaBrowser.Model.IO;
 using Microsoft.Extensions.Logging;
 using SkiaSharp;
 
-namespace Emby.Drawing.Skia
+namespace Emby.Drawing
 {
     public class SkiaEncoder : IImageEncoder
     {

+ 1 - 1
Emby.Drawing.Skia/StripCollageBuilder.cs → Emby.Drawing/StripCollageBuilder.cs

@@ -5,7 +5,7 @@ using MediaBrowser.Common.Configuration;
 using MediaBrowser.Model.IO;
 using SkiaSharp;
 
-namespace Emby.Drawing.Skia
+namespace Emby.Drawing
 {
     public class StripCollageBuilder
     {

+ 1 - 1
Emby.Drawing.Skia/UnplayedCountIndicator.cs → Emby.Drawing/UnplayedCountIndicator.cs

@@ -5,7 +5,7 @@ using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.IO;
 using SkiaSharp;
 
-namespace Emby.Drawing.Skia
+namespace Emby.Drawing
 {
     public class UnplayedCountIndicator
     {

+ 1 - 1
Emby.Photos/PhotoProvider.cs

@@ -181,7 +181,7 @@ namespace Emby.Photos
 
                 try
                 {
-                    var size = _imageProcessor.GetImageSize(item, img, false, false);
+                    var size = _imageProcessor.GetImageSize(item, img, false);
 
                     if (size.Width > 0 && size.Height > 0)
                     {

+ 0 - 1
Jellyfin.Server/Jellyfin.Server.csproj

@@ -43,7 +43,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Emby.Drawing\Emby.Drawing.csproj" />
-    <ProjectReference Include="..\Emby.Drawing.Skia\Emby.Drawing.Skia.csproj" />
     <ProjectReference Include="..\Emby.IsoMounting\IsoMounter\IsoMounter.csproj" />
     <ProjectReference Include="..\Emby.Server.Implementations\Emby.Server.Implementations.csproj" />
   </ItemGroup>

+ 0 - 1
Jellyfin.Server/Program.cs

@@ -9,7 +9,6 @@ using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Emby.Drawing;
-using Emby.Drawing.Skia;
 using Emby.Server.Implementations;
 using Emby.Server.Implementations.EnvironmentInfo;
 using Emby.Server.Implementations.IO;

+ 1 - 1
MediaBrowser.Api/Images/ImageService.cs

@@ -328,7 +328,7 @@ namespace MediaBrowser.Api.Images
                         var fileInfo = _fileSystem.GetFileInfo(info.Path);
                         length = fileInfo.Length;
 
-                        var size = _imageProcessor.GetImageSize(item, info, true, true);
+                        var size = _imageProcessor.GetImageSize(item, info, true);
 
                         width = Convert.ToInt32(size.Width);
                         height = Convert.ToInt32(size.Height);

+ 1 - 1
MediaBrowser.Controller/Drawing/IImageProcessor.cs

@@ -35,7 +35,7 @@ namespace MediaBrowser.Controller.Drawing
         /// <returns>ImageSize.</returns>
         ImageSize GetImageSize(BaseItem item, ItemImageInfo info);
 
-        ImageSize GetImageSize(BaseItem item, ItemImageInfo info, bool allowSlowMethods, bool updateItem);
+        ImageSize GetImageSize(BaseItem item, ItemImageInfo info, bool updateItem);
 
         /// <summary>
         /// Adds the parts.

+ 0 - 6
MediaBrowser.sln

@@ -34,8 +34,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RSSDP", "RSSDP\RSSDP.csproj
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emby.Dlna", "Emby.Dlna\Emby.Dlna.csproj", "{805844AB-E92F-45E6-9D99-4F6D48D129A5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emby.Drawing.Skia", "Emby.Drawing.Skia\Emby.Drawing.Skia.csproj", "{2312DA6D-FF86-4597-9777-BCEEC32D96DD}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mono.Nat", "Mono.Nat\Mono.Nat.csproj", "{CB7F2326-6497-4A3D-BA03-48513B17A7BE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SocketHttpListener", "SocketHttpListener\SocketHttpListener.csproj", "{1D74413B-E7CF-455B-B021-F52BDF881542}"
@@ -130,10 +128,6 @@ Global
 		{805844AB-E92F-45E6-9D99-4F6D48D129A5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{805844AB-E92F-45E6-9D99-4F6D48D129A5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{805844AB-E92F-45E6-9D99-4F6D48D129A5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2312DA6D-FF86-4597-9777-BCEEC32D96DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2312DA6D-FF86-4597-9777-BCEEC32D96DD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2312DA6D-FF86-4597-9777-BCEEC32D96DD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2312DA6D-FF86-4597-9777-BCEEC32D96DD}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CB7F2326-6497-4A3D-BA03-48513B17A7BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CB7F2326-6497-4A3D-BA03-48513B17A7BE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CB7F2326-6497-4A3D-BA03-48513B17A7BE}.Release|Any CPU.ActiveCfg = Release|Any CPU