From efe3ebaab8fbb064652ac4923297f315e4a798e7 Mon Sep 17 00:00:00 2001
From: Mark Monteiro <marknr.monteiro@protonmail.com>
Date: Sat, 4 Apr 2020 16:01:10 -0400
Subject: Eliminate circular dependency between LibraryManager and
 ImageProcessor

---
 MediaBrowser.Controller/Drawing/IImageProcessor.cs | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'MediaBrowser.Controller/Drawing')

diff --git a/MediaBrowser.Controller/Drawing/IImageProcessor.cs b/MediaBrowser.Controller/Drawing/IImageProcessor.cs
index 79399807f..36c746624 100644
--- a/MediaBrowser.Controller/Drawing/IImageProcessor.cs
+++ b/MediaBrowser.Controller/Drawing/IImageProcessor.cs
@@ -40,15 +40,6 @@ namespace MediaBrowser.Controller.Drawing
         /// <returns>ImageDimensions</returns>
         ImageDimensions GetImageDimensions(BaseItem item, ItemImageInfo info);
 
-        /// <summary>
-        /// Gets the dimensions of the image.
-        /// </summary>
-        /// <param name="item">The base item.</param>
-        /// <param name="info">The information.</param>
-        /// <param name="updateItem">Whether or not the item info should be updated.</param>
-        /// <returns>ImageDimensions</returns>
-        ImageDimensions GetImageDimensions(BaseItem item, ItemImageInfo info, bool updateItem);
-
         /// <summary>
         /// Gets the image cache tag.
         /// </summary>
-- 
cgit v1.2.3


From b9fc0d26287e46017515e4ac3e569ca2c60f622f Mon Sep 17 00:00:00 2001
From: Jesús Higueras <jesus@dabbleam.com>
Date: Mon, 23 Mar 2020 20:05:49 +0100
Subject: Add BlurHash support to backend

---
 Emby.Drawing/ImageProcessor.cs                     |  4 ++
 Emby.Drawing/NullImageEncoder.cs                   |  6 +++
 .../Data/SqliteItemRepository.cs                   | 17 +++++++-
 Emby.Server.Implementations/Dto/DtoService.cs      |  7 ++++
 .../Library/LibraryManager.cs                      | 30 +++++++++++++-
 Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj |  2 +
 Jellyfin.Drawing.Skia/SkiaEncoder.cs               | 48 +++++++++++++++++++++-
 MediaBrowser.Api/Images/ImageService.cs            |  7 +++-
 MediaBrowser.Controller/Drawing/IImageEncoder.cs   |  7 ++++
 MediaBrowser.Controller/Drawing/IImageProcessor.cs |  7 ++++
 MediaBrowser.Controller/Entities/BaseItem.cs       |  1 +
 MediaBrowser.Controller/Entities/ItemImageInfo.cs  |  6 +++
 MediaBrowser.Model/Dto/BaseItemDto.cs              |  6 +++
 MediaBrowser.Model/Dto/ImageInfo.cs                |  6 +++
 14 files changed, 149 insertions(+), 5 deletions(-)

(limited to 'MediaBrowser.Controller/Drawing')

diff --git a/Emby.Drawing/ImageProcessor.cs b/Emby.Drawing/ImageProcessor.cs
index 0b3bbe29e..1237b603b 100644
--- a/Emby.Drawing/ImageProcessor.cs
+++ b/Emby.Drawing/ImageProcessor.cs
@@ -313,6 +313,10 @@ namespace Emby.Drawing
         public ImageDimensions GetImageDimensions(string path)
             => _imageEncoder.GetImageSize(path);
 
+        /// <inheritdoc />
+        public string GetImageHash(string path)
+            => _imageEncoder.GetImageHash(path);
+
         /// <inheritdoc />
         public string GetImageCacheTag(BaseItem item, ItemImageInfo image)
             => (item.Path + image.DateModified.Ticks).GetMD5().ToString("N", CultureInfo.InvariantCulture);
diff --git a/Emby.Drawing/NullImageEncoder.cs b/Emby.Drawing/NullImageEncoder.cs
index 5af7f1622..fa89b4c63 100644
--- a/Emby.Drawing/NullImageEncoder.cs
+++ b/Emby.Drawing/NullImageEncoder.cs
@@ -42,5 +42,11 @@ namespace Emby.Drawing
         {
             throw new NotImplementedException();
         }
+
+        /// <inheritdoc />
+        public string GetImageHash(string inputPath)
+        {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index ca5cd6fdd..5a43a138b 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -1144,12 +1144,18 @@ namespace Emby.Server.Implementations.Data
             var delimeter = "*";
 
             var path = image.Path;
+            var hash = image.Hash;
 
             if (path == null)
             {
                 path = string.Empty;
             }
 
+            if (hash == null)
+            {
+                hash = string.Empty;
+            }
+
             return GetPathToSave(path) +
                    delimeter +
                    image.DateModified.Ticks.ToString(CultureInfo.InvariantCulture) +
@@ -1158,7 +1164,11 @@ namespace Emby.Server.Implementations.Data
                    delimeter +
                    image.Width.ToString(CultureInfo.InvariantCulture) +
                    delimeter +
-                   image.Height.ToString(CultureInfo.InvariantCulture);
+                   image.Height.ToString(CultureInfo.InvariantCulture) +
+                   delimeter +
+                   // Replace delimiters with other characters.
+                   // This can be removed when we migrate to a proper DB.
+                   hash.Replace('*', '/').Replace('|', '\\');
         }
 
         public ItemImageInfo ItemImageInfoFromValueString(string value)
@@ -1192,6 +1202,11 @@ namespace Emby.Server.Implementations.Data
                     image.Width = width;
                     image.Height = height;
                 }
+
+                if (parts.Length >= 6)
+                {
+                    image.Hash = parts[5].Replace('/', '*').Replace('\\', '|');
+                }
             }
 
             return image;
diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
index c4b65d265..a34a3a192 100644
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -718,6 +718,7 @@ namespace Emby.Server.Implementations.Dto
             if (options.EnableImages)
             {
                 dto.ImageTags = new Dictionary<ImageType, string>();
+                dto.ImageHashes = new Dictionary<string, string>();
 
                 // Prevent implicitly captured closure
                 var currentItem = item;
@@ -732,6 +733,12 @@ namespace Emby.Server.Implementations.Dto
                         {
                             dto.ImageTags[image.Type] = tag;
                         }
+
+                        var hash = image.Hash;
+                        if (hash != null && hash.Length > 0)
+                        {
+                            dto.ImageHashes[tag] = image.Hash;
+                        }
                     }
                 }
             }
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 0b86b2db7..bc35b0410 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -21,6 +21,7 @@ using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Progress;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Configuration;
+using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Dto;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Audio;
@@ -35,6 +36,7 @@ using MediaBrowser.Controller.Resolvers;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Dlna;
+using MediaBrowser.Model.Drawing;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
@@ -109,6 +111,18 @@ namespace Emby.Server.Implementations.Library
         /// <value>The comparers.</value>
         private IBaseItemComparer[] Comparers { get; set; }
 
+        /// <summary>
+        /// Gets or sets the active item repository
+        /// </summary>
+        /// <value>The item repository.</value>
+        public IItemRepository ItemRepository { get; set; }
+
+        /// <summary>
+        /// Gets or sets the active image processor
+        /// </summary>
+        /// <value>The image processor.</value>
+        public IImageProcessor ImageProcessor { get; set; }
+
         /// <summary>
         /// Occurs when [item added].
         /// </summary>
@@ -1817,7 +1831,19 @@ namespace Emby.Server.Implementations.Library
 
         public void UpdateImages(BaseItem item)
         {
-            _itemRepository.SaveImages(item);
+            item.ImageInfos
+                .Where(i => (i.Width == 0 || i.Height == 0))
+                .ToList()
+                .ForEach(x =>
+                {
+                    string blurhash = ImageProcessor.GetImageHash(x.Path);
+                    ImageDimensions size = ImageProcessor.GetImageDimensions(item, x, true);
+                    x.Width = size.Width;
+                    x.Height = size.Height;
+                    x.Hash = blurhash;
+                });
+
+            ItemRepository.SaveImages(item);
 
             RegisterItem(item);
         }
@@ -1839,7 +1865,7 @@ namespace Emby.Server.Implementations.Library
 
                 item.DateLastSaved = DateTime.UtcNow;
 
-                RegisterItem(item);
+                UpdateImages(item);
             }
 
             _itemRepository.SaveItems(itemsList, cancellationToken);
diff --git a/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj b/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
index a6e1f490a..9f0e3a004 100644
--- a/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
+++ b/Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj
@@ -21,6 +21,8 @@
     <PackageReference Include="SkiaSharp" Version="1.68.1" />
     <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="1.68.1" />
     <PackageReference Include="Jellyfin.SkiaSharp.NativeAssets.LinuxArm" Version="1.68.1" />
+
+    <PackageReference Include="Blurhash.Core" Version="*" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Jellyfin.Drawing.Skia/SkiaEncoder.cs b/Jellyfin.Drawing.Skia/SkiaEncoder.cs
index 5c7462ee2..1d7307863 100644
--- a/Jellyfin.Drawing.Skia/SkiaEncoder.cs
+++ b/Jellyfin.Drawing.Skia/SkiaEncoder.cs
@@ -1,7 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Blurhash.Core;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Extensions;
@@ -15,7 +19,7 @@ namespace Jellyfin.Drawing.Skia
     /// <summary>
     /// Image encoder that uses <see cref="SkiaSharp"/> to manipulate images.
     /// </summary>
-    public class SkiaEncoder : IImageEncoder
+    public class SkiaEncoder : CoreEncoder, IImageEncoder
     {
         private static readonly HashSet<string> _transparentImageTypes
             = new HashSet<string>(StringComparer.OrdinalIgnoreCase) { ".png", ".gif", ".webp" };
@@ -229,6 +233,48 @@ namespace Jellyfin.Drawing.Skia
             }
         }
 
+        /// <inheritdoc />
+        /// <exception cref="ArgumentNullException">The path is null.</exception>
+        /// <exception cref="FileNotFoundException">The path is not valid.</exception>
+        /// <exception cref="SkiaCodecException">The file at the specified path could not be used to generate a codec.</exception>
+        [SuppressMessage("Microsoft.Performance", "CA1814:PreferJaggedArraysOverMultidimensional")]
+        public string GetImageHash(string path)
+        {
+            if (path == null)
+            {
+                throw new ArgumentNullException(nameof(path));
+            }
+
+            if (!File.Exists(path))
+            {
+                throw new FileNotFoundException("File not found", path);
+            }
+
+            using (var bitmap = GetBitmap(path, false, false, null))
+            {
+                if (bitmap == null)
+                {
+                    throw new ArgumentOutOfRangeException($"Skia unable to read image {path}");
+                }
+
+                var width = bitmap.Width;
+                var height = bitmap.Height;
+                var pixels = new Pixel[width, height];
+                Parallel.ForEach(Enumerable.Range(0, height), y =>
+                {
+                    for (var x = 0; x < width; x++)
+                    {
+                        var color = bitmap.GetPixel(x, y);
+                        pixels[x, y].Red = MathUtils.SRgbToLinear(color.Red);
+                        pixels[x, y].Green = MathUtils.SRgbToLinear(color.Green);
+                        pixels[x, y].Blue = MathUtils.SRgbToLinear(color.Blue);
+                    }
+                });
+
+                return CoreEncode(pixels, 4, 4);
+            }
+        }
+
         private static bool HasDiacritics(string text)
             => !string.Equals(text, text.RemoveDiacritics(), StringComparison.Ordinal);
 
diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs
index 2e9b3e6cb..ecfe2ed76 100644
--- a/MediaBrowser.Api/Images/ImageService.cs
+++ b/MediaBrowser.Api/Images/ImageService.cs
@@ -323,6 +323,7 @@ namespace MediaBrowser.Api.Images
         {
             int? width = null;
             int? height = null;
+            string? blurhash = null;
             long length = 0;
 
             try
@@ -332,7 +333,10 @@ namespace MediaBrowser.Api.Images
                     var fileInfo = _fileSystem.GetFileInfo(info.Path);
                     length = fileInfo.Length;
 
-                    ImageDimensions size = _imageProcessor.GetImageDimensions(item, info);
+                    blurhash = _imageProcessor.GetImageHash(info.Path);
+                    info.Hash = blurhash; // TODO: this doesn't seem like the right thing to do
+
+                    ImageDimensions size = _imageProcessor.GetImageDimensions(item, info, true);
                     _libraryManager.UpdateImages(item);
                     width = size.Width;
                     height = size.Height;
@@ -358,6 +362,7 @@ namespace MediaBrowser.Api.Images
                     ImageType = info.Type,
                     ImageTag = _imageProcessor.GetImageCacheTag(item, info),
                     Size = length,
+                    Hash = blurhash,
                     Width = width,
                     Height = height
                 };
diff --git a/MediaBrowser.Controller/Drawing/IImageEncoder.cs b/MediaBrowser.Controller/Drawing/IImageEncoder.cs
index 88e67b648..1d3f0d3b4 100644
--- a/MediaBrowser.Controller/Drawing/IImageEncoder.cs
+++ b/MediaBrowser.Controller/Drawing/IImageEncoder.cs
@@ -43,6 +43,13 @@ namespace MediaBrowser.Controller.Drawing
         /// <returns>The image dimensions.</returns>
         ImageDimensions GetImageSize(string path);
 
+        /// <summary>
+        /// Get the blurhash of an image.
+        /// </summary>
+        /// <param name="path">The filepath of the image.</param>
+        /// <returns>The blurhash.</returns>
+        string GetImageHash(string path);
+
         /// <summary>
         /// Encode an image.
         /// </summary>
diff --git a/MediaBrowser.Controller/Drawing/IImageProcessor.cs b/MediaBrowser.Controller/Drawing/IImageProcessor.cs
index 36c746624..be5906cbc 100644
--- a/MediaBrowser.Controller/Drawing/IImageProcessor.cs
+++ b/MediaBrowser.Controller/Drawing/IImageProcessor.cs
@@ -32,6 +32,13 @@ namespace MediaBrowser.Controller.Drawing
         /// <returns>ImageDimensions</returns>
         ImageDimensions GetImageDimensions(string path);
 
+        /// <summary>
+        /// Gets the blurhash of the image.
+        /// </summary>
+        /// <param name="path">Path to the image file.</param>
+        /// <returns>BlurHash</returns>
+        String GetImageHash(string path);
+
         /// <summary>
         /// Gets the dimensions of the image.
         /// </summary>
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 7ed8fa767..e5f6ea09d 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -2222,6 +2222,7 @@ namespace MediaBrowser.Controller.Entities
                 existingImage.DateModified = image.DateModified;
                 existingImage.Width = image.Width;
                 existingImage.Height = image.Height;
+                existingImage.Hash = image.Hash;
             }
             else
             {
diff --git a/MediaBrowser.Controller/Entities/ItemImageInfo.cs b/MediaBrowser.Controller/Entities/ItemImageInfo.cs
index fc46dec2e..ba0297107 100644
--- a/MediaBrowser.Controller/Entities/ItemImageInfo.cs
+++ b/MediaBrowser.Controller/Entities/ItemImageInfo.cs
@@ -28,6 +28,12 @@ namespace MediaBrowser.Controller.Entities
 
         public int Height { get; set; }
 
+        /// <summary>
+        /// Gets or sets the blurhash.
+        /// </summary>
+        /// <value>The blurhash.</value>
+        public string Hash { get; set; }
+
         [JsonIgnore]
         public bool IsLocalFile => Path == null || !Path.StartsWith("http", StringComparison.OrdinalIgnoreCase);
     }
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index 607355d8d..8c6c9683a 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -510,6 +510,12 @@ namespace MediaBrowser.Model.Dto
         /// <value>The series thumb image tag.</value>
         public string SeriesThumbImageTag { get; set; }
 
+        /// <summary>
+        /// Gets or sets the blurhash for the image tags.
+        /// </summary>
+        /// <value>The blurhashes.</value>
+        public Dictionary<string, string> ImageHashes { get; set; }
+
         /// <summary>
         /// Gets or sets the series studio.
         /// </summary>
diff --git a/MediaBrowser.Model/Dto/ImageInfo.cs b/MediaBrowser.Model/Dto/ImageInfo.cs
index 57942ac23..39bdc09ed 100644
--- a/MediaBrowser.Model/Dto/ImageInfo.cs
+++ b/MediaBrowser.Model/Dto/ImageInfo.cs
@@ -30,6 +30,12 @@ namespace MediaBrowser.Model.Dto
         /// <value>The path.</value>
         public string Path { get; set; }
 
+        /// <summary>
+        /// Gets or sets the blurhash.
+        /// </summary>
+        /// <value>The blurhash.</value>
+        public string Hash { get; set; }
+
         /// <summary>
         /// Gets or sets the height.
         /// </summary>
-- 
cgit v1.2.3


From 2b1ae7ac5834054866aa485b18f85f1793f7b8b4 Mon Sep 17 00:00:00 2001
From: Vasily <just.one.man@yandex.ru>
Date: Tue, 19 May 2020 15:42:50 +0300
Subject: Fix code smells

---
 Emby.Drawing/NullImageEncoder.cs                   |  2 +-
 MediaBrowser.Controller/Drawing/IImageProcessor.cs | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'MediaBrowser.Controller/Drawing')

diff --git a/Emby.Drawing/NullImageEncoder.cs b/Emby.Drawing/NullImageEncoder.cs
index fa89b4c63..54de7212a 100644
--- a/Emby.Drawing/NullImageEncoder.cs
+++ b/Emby.Drawing/NullImageEncoder.cs
@@ -44,7 +44,7 @@ namespace Emby.Drawing
         }
 
         /// <inheritdoc />
-        public string GetImageHash(string inputPath)
+        public string GetImageHash(string path)
         {
             throw new NotImplementedException();
         }
diff --git a/MediaBrowser.Controller/Drawing/IImageProcessor.cs b/MediaBrowser.Controller/Drawing/IImageProcessor.cs
index be5906cbc..e38eaf760 100644
--- a/MediaBrowser.Controller/Drawing/IImageProcessor.cs
+++ b/MediaBrowser.Controller/Drawing/IImageProcessor.cs
@@ -32,13 +32,6 @@ namespace MediaBrowser.Controller.Drawing
         /// <returns>ImageDimensions</returns>
         ImageDimensions GetImageDimensions(string path);
 
-        /// <summary>
-        /// Gets the blurhash of the image.
-        /// </summary>
-        /// <param name="path">Path to the image file.</param>
-        /// <returns>BlurHash</returns>
-        String GetImageHash(string path);
-
         /// <summary>
         /// Gets the dimensions of the image.
         /// </summary>
@@ -47,6 +40,13 @@ namespace MediaBrowser.Controller.Drawing
         /// <returns>ImageDimensions</returns>
         ImageDimensions GetImageDimensions(BaseItem item, ItemImageInfo info);
 
+        /// <summary>
+        /// Gets the blurhash of the image.
+        /// </summary>
+        /// <param name="path">Path to the image file.</param>
+        /// <returns>BlurHash</returns>
+        String GetImageHash(string path);
+
         /// <summary>
         /// Gets the image cache tag.
         /// </summary>
@@ -54,6 +54,7 @@ namespace MediaBrowser.Controller.Drawing
         /// <param name="image">The image.</param>
         /// <returns>Guid.</returns>
         string GetImageCacheTag(BaseItem item, ItemImageInfo image);
+
         string GetImageCacheTag(BaseItem item, ChapterInfo info);
 
         /// <summary>
-- 
cgit v1.2.3


From 1f83a212886bae879c47b4b4f5b1eb25a28e2ad3 Mon Sep 17 00:00:00 2001
From: Vasily <just.one.man@yandex.ru>
Date: Thu, 21 May 2020 01:43:19 +0300
Subject: Rename Hash to BlurHash in all properties and methods for clarity

---
 Emby.Drawing/ImageProcessor.cs                           | 2 +-
 Emby.Server.Implementations/Data/SqliteItemRepository.cs | 4 ++--
 Emby.Server.Implementations/Dto/DtoService.cs            | 6 +++---
 Emby.Server.Implementations/Library/LibraryManager.cs    | 4 ++--
 MediaBrowser.Api/Images/ImageService.cs                  | 2 +-
 MediaBrowser.Controller/Drawing/IImageProcessor.cs       | 2 +-
 MediaBrowser.Controller/Entities/BaseItem.cs             | 2 +-
 MediaBrowser.Controller/Entities/ItemImageInfo.cs        | 2 +-
 MediaBrowser.Model/Dto/BaseItemDto.cs                    | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'MediaBrowser.Controller/Drawing')

diff --git a/Emby.Drawing/ImageProcessor.cs b/Emby.Drawing/ImageProcessor.cs
index 1237b603b..35da6f635 100644
--- a/Emby.Drawing/ImageProcessor.cs
+++ b/Emby.Drawing/ImageProcessor.cs
@@ -314,7 +314,7 @@ namespace Emby.Drawing
             => _imageEncoder.GetImageSize(path);
 
         /// <inheritdoc />
-        public string GetImageHash(string path)
+        public string GetImageBlurHash(string path)
             => _imageEncoder.GetImageHash(path);
 
         /// <inheritdoc />
diff --git a/Emby.Server.Implementations/Data/SqliteItemRepository.cs b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
index 10eb96b10..dd60dd222 100644
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -1144,7 +1144,7 @@ namespace Emby.Server.Implementations.Data
             const string delimeter = "*";
 
             var path = image.Path ?? string.Empty;
-            var hash = image.Hash ?? string.Empty;
+            var hash = image.BlurHash ?? string.Empty;
 
             return GetPathToSave(path) +
                    delimeter +
@@ -1195,7 +1195,7 @@ namespace Emby.Server.Implementations.Data
 
                 if (parts.Length >= 6)
                 {
-                    image.Hash = parts[5].Replace('/', '*').Replace('\\', '|');
+                    image.BlurHash = parts[5].Replace('/', '*').Replace('\\', '|');
                 }
             }
 
diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs
index 07105786b..593e7be7d 100644
--- a/Emby.Server.Implementations/Dto/DtoService.cs
+++ b/Emby.Server.Implementations/Dto/DtoService.cs
@@ -718,7 +718,7 @@ namespace Emby.Server.Implementations.Dto
             if (options.EnableImages)
             {
                 dto.ImageTags = new Dictionary<ImageType, string>();
-                dto.ImageHashes = new Dictionary<string, string>();
+                dto.ImageBlurHashes = new Dictionary<string, string>();
 
                 // Prevent implicitly captured closure
                 var currentItem = item;
@@ -733,10 +733,10 @@ namespace Emby.Server.Implementations.Dto
                             dto.ImageTags[image.Type] = tag;
                         }
 
-                        var hash = image.Hash;
+                        var hash = image.BlurHash;
                         if (!string.IsNullOrEmpty(hash))
                         {
-                            dto.ImageHashes[tag] = image.Hash;
+                            dto.ImageBlurHashes[tag] = image.BlurHash;
                         }
                     }
                 }
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 75350ac2a..579fb7edd 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -1829,7 +1829,7 @@ namespace Emby.Server.Implementations.Library
             }
 
             var outdated = item.ImageInfos
-                .Where(i => (i.IsLocalFile && (i.Width == 0 || i.Height == 0 || string.IsNullOrEmpty(i.Hash))))
+                .Where(i => (i.IsLocalFile && (i.Width == 0 || i.Height == 0 || string.IsNullOrEmpty(i.BlurHash))))
                 .ToList();
             if (outdated.Count == 0)
             {
@@ -1842,7 +1842,7 @@ namespace Emby.Server.Implementations.Library
                 ImageDimensions size = _imageProcessor.GetImageDimensions(item, img);
                 img.Width = size.Width;
                 img.Height = size.Height;
-                img.Hash = _imageProcessor.GetImageHash(img.Path);
+                img.BlurHash = _imageProcessor.GetImageBlurHash(img.Path);
             });
 
             _itemRepository.SaveImages(item);
diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs
index 559db550b..d0846bfc3 100644
--- a/MediaBrowser.Api/Images/ImageService.cs
+++ b/MediaBrowser.Api/Images/ImageService.cs
@@ -341,7 +341,7 @@ namespace MediaBrowser.Api.Images
                     var fileInfo = _fileSystem.GetFileInfo(info.Path);
                     length = fileInfo.Length;
 
-                    blurhash = info.Hash;
+                    blurhash = info.BlurHash;
                     width = info.Width;
                     height = info.Height;
 
diff --git a/MediaBrowser.Controller/Drawing/IImageProcessor.cs b/MediaBrowser.Controller/Drawing/IImageProcessor.cs
index e38eaf760..8800fdf99 100644
--- a/MediaBrowser.Controller/Drawing/IImageProcessor.cs
+++ b/MediaBrowser.Controller/Drawing/IImageProcessor.cs
@@ -45,7 +45,7 @@ namespace MediaBrowser.Controller.Drawing
         /// </summary>
         /// <param name="path">Path to the image file.</param>
         /// <returns>BlurHash</returns>
-        String GetImageHash(string path);
+        string GetImageBlurHash(string path);
 
         /// <summary>
         /// Gets the image cache tag.
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 035ab1dd9..07aeb69db 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -2223,7 +2223,7 @@ namespace MediaBrowser.Controller.Entities
                 existingImage.DateModified = image.DateModified;
                 existingImage.Width = image.Width;
                 existingImage.Height = image.Height;
-                existingImage.Hash = image.Hash;
+                existingImage.BlurHash = image.BlurHash;
             }
             else
             {
diff --git a/MediaBrowser.Controller/Entities/ItemImageInfo.cs b/MediaBrowser.Controller/Entities/ItemImageInfo.cs
index ba0297107..12f5db2e0 100644
--- a/MediaBrowser.Controller/Entities/ItemImageInfo.cs
+++ b/MediaBrowser.Controller/Entities/ItemImageInfo.cs
@@ -32,7 +32,7 @@ namespace MediaBrowser.Controller.Entities
         /// Gets or sets the blurhash.
         /// </summary>
         /// <value>The blurhash.</value>
-        public string Hash { get; set; }
+        public string BlurHash { get; set; }
 
         [JsonIgnore]
         public bool IsLocalFile => Path == null || !Path.StartsWith("http", StringComparison.OrdinalIgnoreCase);
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index 8c6c9683a..df84dcf12 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -514,7 +514,7 @@ namespace MediaBrowser.Model.Dto
         /// Gets or sets the blurhash for the image tags.
         /// </summary>
         /// <value>The blurhashes.</value>
-        public Dictionary<string, string> ImageHashes { get; set; }
+        public Dictionary<string, string> ImageBlurHashes { get; set; }
 
         /// <summary>
         /// Gets or sets the series studio.
-- 
cgit v1.2.3


From 29443e36817e4866cc58e8397c1233b05624284a Mon Sep 17 00:00:00 2001
From: Vasily <JustAMan@users.noreply.github.com>
Date: Tue, 26 May 2020 00:50:29 +0300
Subject: Apply suggestions from code review

Co-authored-by: dkanada <dkanada@users.noreply.github.com>
---
 .vscode/tasks.json                                    | 1 -
 Emby.Server.Implementations/Library/LibraryManager.cs | 1 -
 MediaBrowser.Controller/Drawing/IImageEncoder.cs      | 2 +-
 MediaBrowser.Model/Dto/BaseItemDto.cs                 | 2 +-
 4 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'MediaBrowser.Controller/Drawing')

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 7475617c9..2289fd991 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -21,6 +21,5 @@
             ],
             "problemMatcher": "$msCompile"
         }
-
     ]
 }
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 579fb7edd..e63776bff 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -71,7 +71,6 @@ namespace Emby.Server.Implementations.Library
         private readonly ConcurrentDictionary<Guid, BaseItem> _libraryItemsCache;
         private readonly IImageProcessor _imageProcessor;
 
-
         private NamingOptions _namingOptions;
         private string[] _videoFileExtensions;
 
diff --git a/MediaBrowser.Controller/Drawing/IImageEncoder.cs b/MediaBrowser.Controller/Drawing/IImageEncoder.cs
index 1d3f0d3b4..4baec6204 100644
--- a/MediaBrowser.Controller/Drawing/IImageEncoder.cs
+++ b/MediaBrowser.Controller/Drawing/IImageEncoder.cs
@@ -44,7 +44,7 @@ namespace MediaBrowser.Controller.Drawing
         ImageDimensions GetImageSize(string path);
 
         /// <summary>
-        /// Get the blurhash of an image.
+        /// Gets the blurhash of an image.
         /// </summary>
         /// <param name="path">The filepath of the image.</param>
         /// <returns>The blurhash.</returns>
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index df84dcf12..6213206ff 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -511,7 +511,7 @@ namespace MediaBrowser.Model.Dto
         public string SeriesThumbImageTag { get; set; }
 
         /// <summary>
-        /// Gets or sets the blurhash for the image tags.
+        /// Gets or sets the blurhashes for the image tags.
         /// </summary>
         /// <value>The blurhashes.</value>
         public Dictionary<string, string> ImageBlurHashes { get; set; }
-- 
cgit v1.2.3


From 26eef1bbf823e6f9fc22b11d95a17b1370b21842 Mon Sep 17 00:00:00 2001
From: Vasily <just.one.man@yandex.ru>
Date: Mon, 1 Jun 2020 18:12:49 +0300
Subject: Move logic of computing Blurhash components to ImageProcessor

Also rename last few instances of GetImageHash to GetImageBlurHash for clarity
---
 Emby.Drawing/ImageProcessor.cs                        | 19 ++++++++++++++++++-
 Emby.Drawing/NullImageEncoder.cs                      |  2 +-
 Emby.Server.Implementations/Library/LibraryManager.cs |  1 +
 Jellyfin.Drawing.Skia/SkiaEncoder.cs                  | 18 +-----------------
 MediaBrowser.Controller/Drawing/IImageEncoder.cs      |  4 +++-
 5 files changed, 24 insertions(+), 20 deletions(-)

(limited to 'MediaBrowser.Controller/Drawing')

diff --git a/Emby.Drawing/ImageProcessor.cs b/Emby.Drawing/ImageProcessor.cs
index 35da6f635..89bb3068b 100644
--- a/Emby.Drawing/ImageProcessor.cs
+++ b/Emby.Drawing/ImageProcessor.cs
@@ -315,7 +315,24 @@ namespace Emby.Drawing
 
         /// <inheritdoc />
         public string GetImageBlurHash(string path)
-            => _imageEncoder.GetImageHash(path);
+        {
+            var size = GetImageDimensions(path);
+            if (size.Width <= 0 || size.Height <= 0)
+            {
+                return string.Empty;
+            }
+
+            // We want tiles to be as close to square as possible, and to *mostly* keep under 16 tiles for performance.
+            // One tile is (width / xComp) x (height / yComp) pixels, which means that ideally yComp = xComp * height / width.
+            // See more at https://github.com/woltapp/blurhash/#how-do-i-pick-the-number-of-x-and-y-components
+            float xCompF = MathF.Sqrt(16.0f * size.Width / size.Height);
+            float yCompF = xCompF * size.Height / size.Width;
+
+            int xComp = Math.Min((int)xCompF + 1, 9);
+            int yComp = Math.Min((int)yCompF + 1, 9);
+
+            return _imageEncoder.GetImageBlurHash(xComp, yComp, path);
+        }
 
         /// <inheritdoc />
         public string GetImageCacheTag(BaseItem item, ItemImageInfo image)
diff --git a/Emby.Drawing/NullImageEncoder.cs b/Emby.Drawing/NullImageEncoder.cs
index 54de7212a..bbb5c1716 100644
--- a/Emby.Drawing/NullImageEncoder.cs
+++ b/Emby.Drawing/NullImageEncoder.cs
@@ -44,7 +44,7 @@ namespace Emby.Drawing
         }
 
         /// <inheritdoc />
-        public string GetImageHash(string path)
+        public string GetImageBlurHash(int xComp, int yComp, string path)
         {
             throw new NotImplementedException();
         }
diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index bb3e3dd11..15362182c 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -1882,6 +1882,7 @@ namespace Emby.Server.Implementations.Library
                 ImageDimensions size = _imageProcessor.GetImageDimensions(item, image);
                 image.Width = size.Width;
                 image.Height = size.Height;
+
                 try
                 {
                     image.BlurHash = _imageProcessor.GetImageBlurHash(image.Path);
diff --git a/Jellyfin.Drawing.Skia/SkiaEncoder.cs b/Jellyfin.Drawing.Skia/SkiaEncoder.cs
index 7f0da2c9e..dae0e94d4 100644
--- a/Jellyfin.Drawing.Skia/SkiaEncoder.cs
+++ b/Jellyfin.Drawing.Skia/SkiaEncoder.cs
@@ -234,29 +234,13 @@ namespace Jellyfin.Drawing.Skia
         /// <exception cref="ArgumentNullException">The path is null.</exception>
         /// <exception cref="FileNotFoundException">The path is not valid.</exception>
         /// <exception cref="SkiaCodecException">The file at the specified path could not be used to generate a codec.</exception>
-        public string GetImageHash(string path)
+        public string GetImageBlurHash(int xComp, int yComp, string path)
         {
             if (path == null)
             {
                 throw new ArgumentNullException(nameof(path));
             }
 
-            var dims = GetImageSize(path);
-            if (dims.Width <= 0 || dims.Height <= 0)
-            {
-                // empty image does not have any blurhash
-                return string.Empty;
-            }
-
-            // We want tiles to be as close to square as possible, and to *mostly* keep under 16 tiles for performance.
-            // One tile is (width / xComp) x (height / yComp) pixels, which means that ideally yComp = xComp * height / width.
-            // See more at https://github.com/woltapp/blurhash/#how-do-i-pick-the-number-of-x-and-y-components
-            float xCompF = MathF.Sqrt(16.0f * dims.Width / dims.Height);
-            float yCompF = xCompF * dims.Height / dims.Width;
-
-            int xComp = Math.Min((int)xCompF + 1, 9);
-            int yComp = Math.Min((int)yCompF + 1, 9);
-
             return BlurHashEncoder.Encode(xComp, yComp, path);
         }
 
diff --git a/MediaBrowser.Controller/Drawing/IImageEncoder.cs b/MediaBrowser.Controller/Drawing/IImageEncoder.cs
index 4baec6204..e09ccd204 100644
--- a/MediaBrowser.Controller/Drawing/IImageEncoder.cs
+++ b/MediaBrowser.Controller/Drawing/IImageEncoder.cs
@@ -46,9 +46,11 @@ namespace MediaBrowser.Controller.Drawing
         /// <summary>
         /// Gets the blurhash of an image.
         /// </summary>
+        /// <param name="xComp">Amount of X components of DCT to take.</param>
+        /// <param name="yComp">Amount of Y components of DCT to take.</param>
         /// <param name="path">The filepath of the image.</param>
         /// <returns>The blurhash.</returns>
-        string GetImageHash(string path);
+        string GetImageBlurHash(int xComp, int yComp, string path);
 
         /// <summary>
         /// Encode an image.
-- 
cgit v1.2.3