From 9c7eef891b808c60181704046a48dd9cdbe96bae Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 4 Sep 2016 11:01:31 -0400
Subject: add configurable encoding params

---
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')

diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index ad84ffee8..75d85cd32 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -928,7 +928,12 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 {
                     StartProcess(processWrapper);
 
-                    ranToCompletion = process.WaitForExit(10000);
+                    var timeoutMs = ConfigurationManager.Configuration.ImageExtractionTimeoutMs;
+                    if (timeoutMs <= 0)
+                    {
+                        timeoutMs = 10000;
+                    }
+                    ranToCompletion = process.WaitForExit(timeoutMs);
 
                     if (!ranToCompletion)
                     {
-- 
cgit v1.2.3


From 064ea2799464c7db5e6dbebd6228721840568690 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Fri, 9 Sep 2016 14:26:05 -0400
Subject: update default image extraction timeouts

---
 MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs      | 3 ++-
 MediaBrowser.Model/Configuration/ServerConfiguration.cs | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')

diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 75d85cd32..a2707aace 100644
--- 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)
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index a444afb07..40ac4be8a 100644
--- 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;
-- 
cgit v1.2.3