michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

update default image extraction timeouts

Browse Source
This commit is contained in:
Luke Pulverenti 2016-09-09 14:26:05 -04:00
parent e4357a17f7
commit 064ea27994
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -931,8 +931,9 @@ namespace MediaBrowser.MediaEncoding.Encoder
var timeoutMs = ConfigurationManager.Configuration.ImageExtractionTimeoutMs; var timeoutMs = ConfigurationManager.Configuration.ImageExtractionTimeoutMs;
if (timeoutMs <= 0) if (timeoutMs <= 0)
{ {
timeoutMs = 10000; timeoutMs = Environment.Is64BitOperatingSystem ? (Environment.ProcessorCount > 2 ? 14000 : 20000) : 40000;
} }
ranToCompletion = process.WaitForExit(timeoutMs); ranToCompletion = process.WaitForExit(timeoutMs);
if (!ranToCompletion) if (!ranToCompletion)

2
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View File

@ -217,7 +217,7 @@ namespace MediaBrowser.Model.Configuration
Migrations = new string[] { }; Migrations = new string[] { };
CodecsUsed = new string[] { }; CodecsUsed = new string[] { };
SqliteCacheSize = 0; SqliteCacheSize = 0;
ImageExtractionTimeoutMs = 14000; ImageExtractionTimeoutMs = 0;
EnableLocalizedGuids = true; EnableLocalizedGuids = true;
DisplaySpecialsWithinSeasons = true; DisplaySpecialsWithinSeasons = true;