add configurable encoding params

2 files changed, 6 insertions, 0 deletions

diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs
index 3c03dc12a..d49816803 100644
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -11,6 +11,8 @@ namespace MediaBrowser.Model.Configuration
         public string HardwareAccelerationType { get; set; }
         public string EncoderAppPath { get; set; }
         public string VaapiDevice { get; set; }
+        public int H264Crf { get; set; }
+        public string H264Preset { get; set; }
 
         public EncodingOptions()
         {
@@ -19,6 +21,8 @@ namespace MediaBrowser.Model.Configuration
             ThrottleDelaySeconds = 180;
             EncodingThreadCount = -1;
             VaapiDevice = "/dev/dri/card0";
+            H264Crf = 23;
+            H264Preset = "superfast";
         }
     }
 }
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index b0595b558..44a2ae954 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -207,6 +207,7 @@ namespace MediaBrowser.Model.Configuration
         public bool EnableChannelView { get; set; }
         public bool EnableExternalContentInSuggestions { get; set; }
 
+        public int ImageExtractionTimeoutMs { get; set; }
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
         /// </summary>
@@ -216,6 +217,7 @@ namespace MediaBrowser.Model.Configuration
             Migrations = new string[] { };
             CodecsUsed = new string[] { };
             SqliteCacheSize = 0;
+            ImageExtractionTimeoutMs = 10000;
 
             EnableLocalizedGuids = true;
             DisplaySpecialsWithinSeasons = true;