update default image extraction timeouts

8 years ago · 064ea27994
parent e4357a17f7
commit 064ea27994
2 changed files with 3 additions and 2 deletions
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@ -931,8 +931,9 @@ namespace MediaBrowser.MediaEncoding.Encoder
                    var timeoutMs = ConfigurationManager.Configuration.ImageExtractionTimeoutMs;
                    if (timeoutMs <= 0)
                    {
-                        timeoutMs = 10000;
+                        timeoutMs = Environment.Is64BitOperatingSystem ? (Environment.ProcessorCount > 2 ? 14000 : 20000) : 40000;
                    }
+
                    ranToCompletion = process.WaitForExit(timeoutMs);

                    if (!ranToCompletion)
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@ -217,7 +217,7 @@ namespace MediaBrowser.Model.Configuration
            Migrations = new string[] { };
            CodecsUsed = new string[] { };
            SqliteCacheSize = 0;
-            ImageExtractionTimeoutMs = 14000;
+            ImageExtractionTimeoutMs = 0;

            EnableLocalizedGuids = true;
            DisplaySpecialsWithinSeasons = true;