aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-01-08 23:27:58 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-01-09 12:58:27 -0500
commit3790eff69eea645ada6afadd56213281aa8d3f2e (patch)
tree6f02dbc80ec2f2919a827c62802cfd890e1a6d90
parent7ffaa79c7aa3e3d7501076ca791a10ad5f3d10a1 (diff)
update transcoding throttle
-rw-r--r--MediaBrowser.Api/Playback/TranscodingThrottler.cs2
-rw-r--r--MediaBrowser.Model/Configuration/EncodingOptions.cs4
2 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.Api/Playback/TranscodingThrottler.cs b/MediaBrowser.Api/Playback/TranscodingThrottler.cs
index ece455009..a7d53cd44 100644
--- a/MediaBrowser.Api/Playback/TranscodingThrottler.cs
+++ b/MediaBrowser.Api/Playback/TranscodingThrottler.cs
@@ -42,7 +42,7 @@ namespace MediaBrowser.Api.Playback
var options = GetOptions();
- if (options.EnableThrottling && IsThrottleAllowed(_job, options.ThrottleThresholdSeconds))
+ if (options.EnableThrottling && IsThrottleAllowed(_job, options.ThrottleDelaySeconds))
{
PauseTranscoding();
}
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs
index b41ad7eb0..516d00ee6 100644
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -8,14 +8,14 @@ namespace MediaBrowser.Model.Configuration
public double DownMixAudioBoost { get; set; }
public bool EnableDebugLogging { get; set; }
public bool EnableThrottling { get; set; }
- public int ThrottleThresholdSeconds { get; set; }
+ public int ThrottleDelaySeconds { get; set; }
public string HardwareAccelerationType { get; set; }
public EncodingOptions()
{
DownMixAudioBoost = 2;
EnableThrottling = true;
- ThrottleThresholdSeconds = 110;
+ ThrottleDelaySeconds = 180;
EncodingThreadCount = -1;
}
}