1 files changed, 29 insertions, 11 deletions

diff --git a/src/Jellyfin.Drawing/ImageProcessor.cs b/src/Jellyfin.Drawing/ImageProcessor.cs
index b381c9ae7..533baba4f 100644
--- a/src/Jellyfin.Drawing/ImageProcessor.cs
+++ b/src/Jellyfin.Drawing/ImageProcessor.cs
@@ -5,10 +5,12 @@ using System.IO;
 using System.Linq;
 using System.Net.Mime;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Jellyfin.Data.Entities;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Controller;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Drawing;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.MediaEncoding;
@@ -36,7 +38,8 @@ public sealed class ImageProcessor : IImageProcessor, IDisposable
     private readonly IFileSystem _fileSystem;
     private readonly IServerApplicationPaths _appPaths;
     private readonly IImageEncoder _imageEncoder;
-    private readonly IMediaEncoder _mediaEncoder;
+
+    private readonly SemaphoreSlim _parallelEncodingLimit;
 
     private bool _disposed;
 
@@ -48,18 +51,27 @@ public sealed class ImageProcessor : IImageProcessor, IDisposable
     /// <param name="fileSystem">The filesystem.</param>
     /// <param name="imageEncoder">The image encoder.</param>
     /// <param name="mediaEncoder">The media encoder.</param>
+    /// <param name="config">The configuration.</param>
     public ImageProcessor(
         ILogger<ImageProcessor> logger,
         IServerApplicationPaths appPaths,
         IFileSystem fileSystem,
         IImageEncoder imageEncoder,
-        IMediaEncoder mediaEncoder)
+        IMediaEncoder mediaEncoder,
+        IServerConfigurationManager config)
     {
         _logger = logger;
         _fileSystem = fileSystem;
         _imageEncoder = imageEncoder;
-        _mediaEncoder = mediaEncoder;
         _appPaths = appPaths;
+
+        var semaphoreCount = config.Configuration.ParallelImageEncodingLimit;
+        if (semaphoreCount < 1)
+        {
+            semaphoreCount = 2 * Environment.ProcessorCount;
+        }
+
+        _parallelEncodingLimit = new(semaphoreCount, semaphoreCount);
     }
 
     private string ResizedImageCachePath => Path.Combine(_appPaths.ImageCachePath, "resized-images");
@@ -188,7 +200,6 @@ public sealed class ImageProcessor : IImageProcessor, IDisposable
             quality,
             dateModified,
             outputFormat,
-            options.AddPlayedIndicator,
             options.PercentPlayed,
             options.UnplayedCount,
             options.Blur,
@@ -199,7 +210,18 @@ public sealed class ImageProcessor : IImageProcessor, IDisposable
         {
             if (!File.Exists(cacheFilePath))
             {
-                string resultPath = _imageEncoder.EncodeImage(originalImagePath, dateModified, cacheFilePath, autoOrient, orientation, quality, options, outputFormat);
+                // Limit number of parallel (more precisely: concurrent) image encodings to prevent a high memory usage
+                await _parallelEncodingLimit.WaitAsync().ConfigureAwait(false);
+
+                string resultPath;
+                try
+                {
+                    resultPath = _imageEncoder.EncodeImage(originalImagePath, dateModified, cacheFilePath, autoOrient, orientation, quality, options, outputFormat);
+                }
+                finally
+                {
+                    _parallelEncodingLimit.Release();
+                }
 
                 if (string.Equals(resultPath, originalImagePath, StringComparison.OrdinalIgnoreCase))
                 {
@@ -270,7 +292,6 @@ public sealed class ImageProcessor : IImageProcessor, IDisposable
         int quality,
         DateTime dateModified,
         ImageFormat format,
-        bool addPlayedIndicator,
         double percentPlayed,
         int? unwatchedCount,
         int? blur,
@@ -325,11 +346,6 @@ public sealed class ImageProcessor : IImageProcessor, IDisposable
             filename.Append(fillHeight.Value);
         }
 
-        if (addPlayedIndicator)
-        {
-            filename.Append(",pl=true");
-        }
-
         if (percentPlayed > 0)
         {
             filename.Append(",p=");
@@ -563,6 +579,8 @@ public sealed class ImageProcessor : IImageProcessor, IDisposable
             disposable.Dispose();
         }
 
+        _parallelEncodingLimit?.Dispose();
+
         _disposed = true;
     }
 }