Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-03 05:34:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Backport pull request #13532 from jellyfin/release-10.10.z

Browse Source 
Fix image encoding concurrency limit

Original-merge: 3f539472f3a7c216a6c7d34fb947a144e249f154

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Bond_009 <bond.009@outlook.com>
This commit is contained in:
gnattu 2025-02-13 09:49:58 -05:00 committed by Bond_009
parent 17e78c0d40
commit 1ebef57508
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@ -122,7 +122,13 @@ namespace MediaBrowser.MediaEncoding.Encoder
_jsonSerializerOptions = new JsonSerializerOptions(JsonDefaults.Options); _jsonSerializerOptions = new JsonSerializerOptions(JsonDefaults.Options);
_jsonSerializerOptions.Converters.Add(new JsonBoolStringConverter()); _jsonSerializerOptions.Converters.Add(new JsonBoolStringConverter());
var semaphoreCount = 2 * Environment.ProcessorCount; // Although the type is not nullable, this might still be null during unit tests
var semaphoreCount = serverConfig.Configuration?.ParallelImageEncodingLimit ?? 0;
if (semaphoreCount < 1)
{
semaphoreCount = Environment.ProcessorCount;
}
_thumbnailResourcePool = new(semaphoreCount); _thumbnailResourcePool = new(semaphoreCount);
} }

2
src/Jellyfin.Drawing/ImageProcessor.cs
View File

@ -68,7 +68,7 @@ public sealed class ImageProcessor : IImageProcessor, IDisposable
var semaphoreCount = config.Configuration.ParallelImageEncodingLimit; var semaphoreCount = config.Configuration.ParallelImageEncodingLimit;
if (semaphoreCount < 1) if (semaphoreCount < 1)
{ {
semaphoreCount = 2 * Environment.ProcessorCount; semaphoreCount = Environment.ProcessorCount;
} }
_parallelEncodingLimit = new(semaphoreCount); _parallelEncodingLimit = new(semaphoreCount);