alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-01-15 23:58:57 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' into sort-nfo-data

Browse Source
This commit is contained in:
Marc Brooks
2025-03-12 10:33:27 -05:00
committed by GitHub
parent 114591c1aa 237e7bd44b
commit a5f3d942f6
119 changed files with 4476 additions and 920 deletions
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.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);
}