diff options
| author | gnattu <gnattu@users.noreply.github.com> | 2025-02-13 09:49:58 -0500 |
|---|---|---|
| committer | Bond_009 <bond.009@outlook.com> | 2025-02-13 09:49:58 -0500 |
| commit | 1ebef57508dbc1628048b878b580a51ceb593ffd (patch) | |
| tree | 1ca8d574a7b359570f629ba33e58d93e528c9828 /MediaBrowser.MediaEncoding | |
| parent | 17e78c0d40d496630e86deed3e6ce210bc5f631b (diff) | |
Backport pull request #13532 from jellyfin/release-10.10.z
Fix image encoding concurrency limit
Original-merge: 3f539472f3a7c216a6c7d34fb947a144e249f154
Merged-by: crobibero <cody@robibe.ro>
Backported-by: Bond_009 <bond.009@outlook.com>
Diffstat (limited to 'MediaBrowser.MediaEncoding')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index 1eef181cb..14cf869f9 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -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); } |